clear selection on sort or filter changed

w-ahmad · Jun 13, 2024 · 56d470b · 56d470b
1 parent c2d8d94
commit 56d470b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/WinUI.TableView/TableView.cs b/src/WinUI.TableView/TableView.cs
@@ -519,6 +519,7 @@ private void UpdateVerticalScrollBarMargin()
 
     internal void ClearSorting()
     {
+        DeselectAll();
         CollectionView.SortDescriptions.Clear();
 
         foreach (var header in Columns.Select(x => x.HeaderControl))
@@ -532,6 +533,7 @@ internal void ClearSorting()
 
     internal void ClearFilters()
     {
+        DeselectAll();
         ActiveFilters.Clear();
         CollectionView.RefreshFilter();
 
@@ -626,6 +628,7 @@ private void DeselectAllCells()
     {
         SelectedCellRanges.Clear();
         OnCellSelectionChanged();
+        SetCurrentCell(null);
     }
 
     internal async void SelectCells(TableViewCellSlot slot, bool shiftKey, bool ctrlKey = false)

diff --git a/src/WinUI.TableView/TableViewColumnHeader.cs b/src/WinUI.TableView/TableViewColumnHeader.cs
@@ -74,6 +74,8 @@ private void DoSort(SD direction, bool singleSorting = true)
                 }
             }
 
+            _tableView.DeselectAll();
+
             if (_tableView.CollectionView.SortDescriptions.FirstOrDefault(x => x.PropertyName == _propertyPath) is { } description)
             {
                 _tableView.CollectionView.SortDescriptions.Remove(description);
@@ -88,6 +90,7 @@ private void ClearSorting()
     {
         if (CanSort && _tableView is not null && SortDirection is not null)
         {
+            _tableView.DeselectAll();
             SortDirection = null;
 
             if (_tableView.CollectionView.SortDescriptions.FirstOrDefault(x => x.PropertyName == _propertyPath) is { } description)
@@ -102,6 +105,7 @@ private void ClearFilter()
         if (_tableView?.ActiveFilters.ContainsKey(_propertyPath) == true)
         {
             _tableView.ActiveFilters.Remove(_propertyPath);
+            _tableView.DeselectAll();
         }
 
         IsFiltered = false;
@@ -116,6 +120,7 @@ private void ApplyFilter()
             return;
         }
 
+        _tableView.DeselectAll();
         _tableView.ActiveFilters[_propertyPath] = Filter;
         _tableView.CollectionView.RefreshFilter();
         IsFiltered = true;