Merge pull request #103 from w-ahmad/FilterHandler

w-ahmad · web-flow · commit 68c8d42984d6 · 2025-02-08T03:20:50.000+05:00
simplified ColumnFilterHandler
diff --git a/src/WinUI.TableView/ColumnFilterHandler.cs b/src/WinUI.TableView/ColumnFilterHandler.cs
@@ -20,7 +20,7 @@ public ColumnFilterHandler(TableView tableView)
         _tableView = tableView;
     }
 
-    public virtual void PrepareFilterItems(TableViewColumn column, string? searchText = default)
+    public virtual IList<TableViewFilterItem> GetFilterItems(TableViewColumn column, string? searchText = default)
     {
         if (column is { TableView.ItemsSource: { } })
         {
@@ -37,11 +37,11 @@ public virtual void PrepareFilterItems(TableViewColumn column, string? searchTex
                 filterValues.Add(value);
             }
 
-            FilterItems = filterValues.Select(value =>
+            return filterValues.Select(value =>
             {
                 value = string.IsNullOrWhiteSpace(value?.ToString()) ? "(Blank)" : value;
                 var isSelected = !column.IsFiltered || !string.IsNullOrEmpty(searchText) ||
-                  (column.IsFiltered && SelectedValues.Contains(value));
+                  (column.IsFiltered && SelectedValues[column].Contains(value));
 
                 return string.IsNullOrEmpty(searchText)
                       || value?.ToString()?.Contains(searchText, StringComparison.OrdinalIgnoreCase) == true
@@ -51,11 +51,8 @@ public virtual void PrepareFilterItems(TableViewColumn column, string? searchTex
             }).OfType<TableViewFilterItem>()
               .ToList();
         }
-    }
 
-    public virtual void SearchTextChanged(TableViewColumn column, string? searchText)
-    {
-        PrepareFilterItems(column, searchText);
+        return [];
     }
 
     public virtual void ApplyFilter(TableViewColumn column)
@@ -89,22 +86,30 @@ public virtual void ClearFilter(TableViewColumn? column)
         {
             column.IsFiltered = false;
             column.TableView.FilterDescriptions.RemoveWhere(x => x is ColumnFilterDescription columnFilter && columnFilter.Column == column);
+            SelectedValues.RemoveWhere(x => x.Key == column);
             column.TableView.RefreshFilter();
         }
         else
         {
-            _tableView.ClearAllFilters();
+            SelectedValues.Clear();
+            _tableView.FilterDescriptions.Clear();
+
+            foreach (var col in _tableView.Columns)
+            {
+                if (col is not null)
+                {
+                    col.IsFiltered = false;
+                }
+            }
         }
     }
 
     public virtual bool Filter(TableViewColumn column, object? item)
     {
-        var value = column?.GetCellContent(item);
+        var value = column.GetCellContent(item);
         value = string.IsNullOrWhiteSpace(value?.ToString()) ? "(Blank)" : value;
-        return SelectedValues.Contains(value);
+        return SelectedValues[column].Contains(value);
     }
 
-    public IList<TableViewFilterItem> FilterItems { get; set; } = [];
-
-    public IList<object> SelectedValues { get; set; } = [];
+    public IDictionary<TableViewColumn, IList<object>> SelectedValues { get; } = new Dictionary<TableViewColumn, IList<object>>();
 }
diff --git a/src/WinUI.TableView/IColumnFilterHandler.cs b/src/WinUI.TableView/IColumnFilterHandler.cs
@@ -8,28 +8,16 @@ namespace WinUI.TableView;
 public interface IColumnFilterHandler
 {
     /// <summary>
-    /// Gets or sets the filter items.
+    /// Gets or sets the selected values for the filter per column.
     /// </summary>
-    IList<TableViewFilterItem> FilterItems { get; set; }
+    IDictionary<TableViewColumn, IList<object>> SelectedValues { get; }
 
     /// <summary>
-    /// Gets or sets the selected values for the filter.
-    /// </summary>
-    IList<object> SelectedValues { get; set; }
-
-    /// <summary>
-    /// Prepares the filter items for the specified column.
+    /// Get the filter items for the specified column.
     /// </summary>
     /// <param name="column">The column for which to prepare filter items.</param>
     /// <param name="searchText">The search text to filter the items.</param>
-    void PrepareFilterItems(TableViewColumn column, string? searchText = default);
-
-    /// <summary>
-    /// Handles the search text changed event for the specified column.
-    /// </summary>
-    /// <param name="column">The column for which the search text has changed.</param>
-    /// <param name="searchText">The new search text.</param>
-    void SearchTextChanged(TableViewColumn column, string? searchText);
+    IList<TableViewFilterItem> GetFilterItems(TableViewColumn column, string? searchText);
 
     /// <summary>
     /// Applies the filter to the specified column.
diff --git a/src/WinUI.TableView/TableView.cs b/src/WinUI.TableView/TableView.cs
@@ -742,16 +742,7 @@ internal void ClearAllSortingWithEvent()
     /// </summary>
     public void ClearAllFilters()
     {
-        DeselectAll();
-        FilterDescriptions.Clear();
-
-        foreach (var column in Columns)
-        {
-            if (column is not null)
-            {
-                column.IsFiltered = false;
-            }
-        }
+        FilterHandler.ClearFilter(null);
     }
 
     /// <summary>
diff --git a/src/WinUI.TableView/TableViewColumnHeader.OptionsFlyoutViewModel.cs b/src/WinUI.TableView/TableViewColumnHeader.OptionsFlyoutViewModel.cs
@@ -144,8 +144,7 @@ private void OnFilterItemsSearchTextChanged()
         {
             if (!_canFilter) return;
 
-            TableView.FilterHandler.SearchTextChanged(ColumnHeader.Column!,FilterText);
-            FilterItems = TableView.FilterHandler.FilterItems;
+            FilterItems = TableView.FilterHandler.GetFilterItems(ColumnHeader.Column!, FilterText);
         }
 
         /// <summary>
diff --git a/src/WinUI.TableView/TableViewColumnHeader.cs b/src/WinUI.TableView/TableViewColumnHeader.cs
@@ -126,7 +126,7 @@ private void ApplyFilter()
     {
         if (_tableView is not null)
         {
-            _tableView.FilterHandler.SelectedValues = _optionsFlyoutViewModel.SelectedValues;
+            _tableView.FilterHandler.SelectedValues[Column!] = _optionsFlyoutViewModel.SelectedValues;
             _tableView.FilterHandler?.ApplyFilter(Column!);
         }
     }
@@ -244,8 +244,10 @@ private void OnSelectAllCheckBoxUnchecked(object sender, RoutedEventArgs e)
     /// </summary>
     private void OnOptionsFlyoutOpening(object? sender, object e)
     {
-        _tableView?.FilterHandler?.PrepareFilterItems(Column!);
-        _optionsFlyoutViewModel.FilterItems = _tableView?.FilterHandler?.FilterItems!;
+        if (_tableView?.FilterHandler is not null)
+        {
+            _optionsFlyoutViewModel.FilterItems = _tableView.FilterHandler.GetFilterItems(Column!, null);
+        }
     }
 
     /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public ColumnFilterHandler(TableView tableView)`
`20`	`20`	`_tableView = tableView;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public virtual void PrepareFilterItems(TableViewColumn column, string? searchText = default)`
	`23`	`+ public virtual IList<TableViewFilterItem> GetFilterItems(TableViewColumn column, string? searchText = default)`
`24`	`24`	`{`
`25`	`25`	`if (column is { TableView.ItemsSource: { } })`
`26`	`26`	`{`
`@@ -37,11 +37,11 @@ public virtual void PrepareFilterItems(TableViewColumn column, string? searchTex`
`37`	`37`	`filterValues.Add(value);`
`38`	`38`	`}`
`39`	`39`
`40`		`- FilterItems = filterValues.Select(value =>`
	`40`	`+ return filterValues.Select(value =>`
`41`	`41`	`{`
`42`	`42`	`value = string.IsNullOrWhiteSpace(value?.ToString()) ? "(Blank)" : value;`
`43`	`43`	`var isSelected = !column.IsFiltered \|\| !string.IsNullOrEmpty(searchText) \|\|`
`44`		`- (column.IsFiltered && SelectedValues.Contains(value));`
	`44`	`+ (column.IsFiltered && SelectedValues[column].Contains(value));`
`45`	`45`
`46`	`46`	`return string.IsNullOrEmpty(searchText)`
`47`	`47`	`\|\| value?.ToString()?.Contains(searchText, StringComparison.OrdinalIgnoreCase) == true`
`@@ -51,11 +51,8 @@ public virtual void PrepareFilterItems(TableViewColumn column, string? searchTex`
`51`	`51`	`}).OfType<TableViewFilterItem>()`
`52`	`52`	`.ToList();`
`53`	`53`	`}`
`54`		`- }`
`55`	`54`
`56`		`- public virtual void SearchTextChanged(TableViewColumn column, string? searchText)`
`57`		`- {`
`58`		`- PrepareFilterItems(column, searchText);`
	`55`	`+ return [];`
`59`	`56`	`}`
`60`	`57`
`61`	`58`	`public virtual void ApplyFilter(TableViewColumn column)`
`@@ -89,22 +86,30 @@ public virtual void ClearFilter(TableViewColumn? column)`
`89`	`86`	`{`
`90`	`87`	`column.IsFiltered = false;`
`91`	`88`	`column.TableView.FilterDescriptions.RemoveWhere(x => x is ColumnFilterDescription columnFilter && columnFilter.Column == column);`
	`89`	`+ SelectedValues.RemoveWhere(x => x.Key == column);`
`92`	`90`	`column.TableView.RefreshFilter();`
`93`	`91`	`}`
`94`	`92`	`else`
`95`	`93`	`{`
`96`		`- _tableView.ClearAllFilters();`
	`94`	`+ SelectedValues.Clear();`
	`95`	`+ _tableView.FilterDescriptions.Clear();`
	`96`	`+`
	`97`	`+ foreach (var col in _tableView.Columns)`
	`98`	`+ {`
	`99`	`+ if (col is not null)`
	`100`	`+ {`
	`101`	`+ col.IsFiltered = false;`
	`102`	`+ }`
	`103`	`+ }`
`97`	`104`	`}`
`98`	`105`	`}`
`99`	`106`
`100`	`107`	`public virtual bool Filter(TableViewColumn column, object? item)`
`101`	`108`	`{`
`102`		`- var value = column?.GetCellContent(item);`
	`109`	`+ var value = column.GetCellContent(item);`
`103`	`110`	`value = string.IsNullOrWhiteSpace(value?.ToString()) ? "(Blank)" : value;`
`104`		`- return SelectedValues.Contains(value);`
	`111`	`+ return SelectedValues[column].Contains(value);`
`105`	`112`	`}`
`106`	`113`
`107`		`- public IList<TableViewFilterItem> FilterItems { get; set; } = [];`
`108`		`-`
`109`		`- public IList<object> SelectedValues { get; set; } = [];`
	`114`	`+ public IDictionary<TableViewColumn, IList<object>> SelectedValues { get; } = new Dictionary<TableViewColumn, IList<object>>();`
`110`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,8 +144,7 @@ private void OnFilterItemsSearchTextChanged()`
`144`	`144`	`{`
`145`	`145`	`if (!_canFilter) return;`
`146`	`146`
`147`		`- TableView.FilterHandler.SearchTextChanged(ColumnHeader.Column!,FilterText);`
`148`		`- FilterItems = TableView.FilterHandler.FilterItems;`
	`147`	`+ FilterItems = TableView.FilterHandler.GetFilterItems(ColumnHeader.Column!, FilterText);`
`149`	`148`	`}`
`150`	`149`
`151`	`150`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private void ApplyFilter()`
`126`	`126`	`{`
`127`	`127`	`if (_tableView is not null)`
`128`	`128`	`{`
`129`		`- _tableView.FilterHandler.SelectedValues = _optionsFlyoutViewModel.SelectedValues;`
	`129`	`+ _tableView.FilterHandler.SelectedValues[Column!] = _optionsFlyoutViewModel.SelectedValues;`
`130`	`130`	`_tableView.FilterHandler?.ApplyFilter(Column!);`
`131`	`131`	`}`
`132`	`132`	`}`
`@@ -244,8 +244,10 @@ private void OnSelectAllCheckBoxUnchecked(object sender, RoutedEventArgs e)`
`244`	`244`	`/// </summary>`
`245`	`245`	`private void OnOptionsFlyoutOpening(object? sender, object e)`
`246`	`246`	`{`
`247`		`- _tableView?.FilterHandler?.PrepareFilterItems(Column!);`
`248`		`- _optionsFlyoutViewModel.FilterItems = _tableView?.FilterHandler?.FilterItems!;`
	`247`	`+ if (_tableView?.FilterHandler is not null)`
	`248`	`+ {`
	`249`	`+ _optionsFlyoutViewModel.FilterItems = _tableView.FilterHandler.GetFilterItems(Column!, null);`
	`250`	`+ }`
`249`	`251`	`}`
`250`	`252`
`251`	`253`	`/// <summary>`