Fix updating count in IndexRange.

With failing-then-passing unit test.
AvaloniaUI · May 12, 2023 · 9f9ed62 · 9f9ed62
1 parent 1f033b4
commit 9f9ed62
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/Avalonia.Controls.TreeDataGrid/Selection/IndexRanges.cs b/src/Avalonia.Controls.TreeDataGrid/Selection/IndexRanges.cs
@@ -44,8 +44,7 @@ public void Add(in IndexPath index)
                 _ranges.Add(parent, ranges);
             }
 
-            IndexRange.Add(ranges, new IndexRange(index[^1]));
-            ++Count;
+            Count += IndexRange.Add(ranges, new IndexRange(index[^1]));
         }
 
         public void Add(in IndexPath parent, in IndexRange range)

diff --git a/tests/Avalonia.Controls.TreeDataGrid.Tests/Selection/TreeSelectionModelBaseTests_Single.cs b/tests/Avalonia.Controls.TreeDataGrid.Tests/Selection/TreeSelectionModelBaseTests_Single.cs
@@ -415,6 +415,20 @@ public void Selecting_Already_Selected_Item_Doesnt_Raise_SelectionChanged()
 
                 Assert.Equal(0, raised);
             }
+
+            [Fact]
+            public void Selecting_Item_Twice_Results_In_Correct_Count()
+            {
+                var target = CreateTarget();
+
+                using (target.BatchUpdate())
+                {
+                    target.SelectedIndex = new IndexPath(1);
+                    target.Select(new IndexPath(1));
+                }
+
+                Assert.Equal(1, target.Count);
+            }
         }
 
         public class Deselect