fixed an issue where cell selection wasnt working with active filter

w-ahmad · Jul 2, 2024 · 01a706b · 01a706b
1 parent d09f7ba
commit 01a706b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/WinUI.TableView/TableView.cs b/src/WinUI.TableView/TableView.cs
@@ -70,8 +70,6 @@ protected override void PrepareContainerForItemOverride(DependencyObject element
 
         if (element is TableViewRow row)
         {
-            var index = IndexFromContainer(element);
-            row.SetValue(TableViewRow.IndexProperty, index);
             row.ApplyCellsSelectionState();
 
             if (CurrentCellSlot.HasValue)

diff --git a/src/WinUI.TableView/TableViewRow.cs b/src/WinUI.TableView/TableViewRow.cs
@@ -148,11 +148,6 @@ private static void OnTableViewChanged(DependencyObject d, DependencyPropertyCha
         }
     }
 
-    private static void OnIndexChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-    {
-        (d as TableViewRow)?.ApplyCellsSelectionState();
-    }
-
     private void OnCellSelectionChanged(object? sender, TableViewCellSelectionChangedEvenArgs e)
     {
         if (e.OldSelection.Any(x => x.Row == Index) ||
@@ -194,15 +189,14 @@ internal void ApplyCellsSelectionState()
 
     internal IList<TableViewCell> Cells => _cellPresenter?.Cells ?? new List<TableViewCell>();
 
-    public int Index => (int)GetValue(IndexProperty);
+    public int Index => TableView.IndexFromContainer(this);
 
     public TableView TableView
     {
         get => (TableView)GetValue(TableViewProperty);
         set => SetValue(TableViewProperty, value);
     }
 
-    public static readonly DependencyProperty IndexProperty = DependencyProperty.Register(nameof(Index), typeof(int), typeof(TableViewRow), new PropertyMetadata(-1, OnIndexChanged));
     public static readonly DependencyProperty TableViewProperty = DependencyProperty.Register(nameof(TableView), typeof(TableView), typeof(TableViewRow), new PropertyMetadata(default, OnTableViewChanged));
 }