Merge branch 'master' of https://github.com/radzenhq/radzen-blazor

radzenhq · Aug 28, 2023 · a04cbeb · a04cbeb
2 parents 82610e2 + e9b3213
commit a04cbeb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/Radzen.Blazor/RadzenDataGrid.razor.cs b/Radzen.Blazor/RadzenDataGrid.razor.cs
@@ -854,6 +854,12 @@ internal IReadOnlyDictionary<string, object> FooterCellAttributes(RadzenDataGrid
         [Parameter]
         public DataGridEditMode EditMode { get; set; } = DataGridEditMode.Multiple;
 
+        /// <summary>
+        /// Gets or set the filter icon to use.
+        /// </summary>
+        [Parameter]
+        public string FilterIcon { get; set; } = "filter_alt";
+
         /// <summary>
         /// Gets or sets the filter text.
         /// </summary>

diff --git a/Radzen.Blazor/RadzenDataGridFilterMenu.razor b/Radzen.Blazor/RadzenDataGridFilterMenu.razor
@@ -3,7 +3,7 @@
 @using Microsoft.JSInterop
 @inject IJSRuntime JSRuntime
  <button title=@Column.GetFilterOperatorText(Column.GetFilterOperator()) class="@FilterIconStyle()" onclick="@($"Radzen.togglePopup(this.parentNode, '{Grid.PopupID}{Column.GetFilterProperty()}')")">
-     <i class="rzi">filter_alt</i>
+     <i class="rzi">@Grid.FilterIcon</i>
     @if (Column.GetFilterOperator() == FilterOperator.DoesNotContain)
     {
         <s>@Column.GetFilterOperatorSymbol(Column.GetFilterOperator())</s>

diff --git a/Radzen.Blazor/RadzenDataGridHeaderCell.razor b/Radzen.Blazor/RadzenDataGridHeaderCell.razor
@@ -55,7 +55,9 @@
         @if (Grid.AllowFiltering && Column.Filterable && Grid.FilterMode == FilterMode.Advanced)
         {
                 <i @ref=@filterButton @onclick:stopPropagation="true" @onmousedown=@ToggleFilter
-                   class="@getFilterIconCss(Column)" onclick=@getFilterOpen() />
+                   class="@getFilterIconCss(Column)" onclick=@getFilterOpen() >
+                   @Grid.FilterIcon
+                </i>
 
                 <Popup Lazy=@(Grid.FilterPopupRenderMode == PopupRenderMode.OnDemand) @ref=popup id="@($"{getColumnPopupID()}")" class="rz-overlaypanel"
                     style="display:none;min-width:250px;" tabindex="0">

diff --git a/Radzen.Blazor/themes/components/blazor/_grid.scss b/Radzen.Blazor/themes/components/blazor/_grid.scss
@@ -1018,10 +1018,6 @@ $column-draggable-shadow: 0 8px 10px 0 rgba(0, 0, 0, 0.1) !default;
     cursor: pointer;
     color: var(--rz-grid-header-filter-icon-hover-color);
   }
-
-  &:after {
-    content: 'filter_alt';
-  }
 }
 
 .rz-grid-filter-active {