From 9dc9f9debae7cd082acaaf95276f2b49691754bc Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 26 May 2020 13:17:02 +0200
Subject: [PATCH] Ensure selection is reported correctly during batch update.

---
 src/Avalonia.Controls/SelectionModel.cs       | 13 ++++++
 .../SelectionModelTests.cs                    | 41 +++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/src/Avalonia.Controls/SelectionModel.cs b/src/Avalonia.Controls/SelectionModel.cs
index 0a74306e84..a40e0a62f4 100644
--- a/src/Avalonia.Controls/SelectionModel.cs
+++ b/src/Avalonia.Controls/SelectionModel.cs
@@ -629,6 +629,8 @@ namespace Avalonia.Controls
             {
                 AnchorIndex = default;
             }
+
+            OnSelectionChanged();
         }
 
         private void OnSelectionChanged(SelectionModelSelectionChangedEventArgs? e = null)
@@ -664,6 +666,8 @@ namespace Avalonia.Controls
             {
                 AnchorIndex = new IndexPath(index);
             }
+
+            OnSelectionChanged();
         }
 
         private void SelectWithGroupImpl(int groupIndex, int itemIndex, bool select)
@@ -680,6 +684,8 @@ namespace Avalonia.Controls
             {
                 AnchorIndex = new IndexPath(groupIndex, itemIndex);
             }
+
+            OnSelectionChanged();
         }
 
         private void SelectWithPathImpl(IndexPath index, bool select)
@@ -708,6 +714,8 @@ namespace Avalonia.Controls
             {
                 AnchorIndex = index;
             }
+
+            OnSelectionChanged();
         }
 
         private void SelectRangeFromAnchorImpl(int index, bool select)
@@ -721,6 +729,7 @@ namespace Avalonia.Controls
             }
 
             _rootNode.SelectRange(new IndexRange(anchorIndex, index), select);
+            OnSelectionChanged();
         }
 
         private void SelectRangeFromAnchorWithGroupImpl(int endGroupIndex, int endItemIndex, bool select)
@@ -754,6 +763,8 @@ namespace Avalonia.Controls
                 int endIndex = groupIdx == endGroupIndex ? endItemIndex : groupNode.DataCount - 1;
                 groupNode.SelectRange(new IndexRange(startIndex, endIndex), select);
             }
+
+            OnSelectionChanged();
         }
 
         private void SelectRangeImpl(IndexPath start, IndexPath end, bool select)
@@ -781,6 +792,8 @@ namespace Avalonia.Controls
                         info.ParentNode!.Select(info.Path.GetAt(info.Path.GetSize() - 1), select);
                     }
                 });
+
+            OnSelectionChanged();
         }
 
         private void BeginOperation()
diff --git a/tests/Avalonia.Controls.UnitTests/SelectionModelTests.cs b/tests/Avalonia.Controls.UnitTests/SelectionModelTests.cs
index b9f93090b4..59552e7f93 100644
--- a/tests/Avalonia.Controls.UnitTests/SelectionModelTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/SelectionModelTests.cs
@@ -1512,6 +1512,47 @@ namespace Avalonia.Controls.UnitTests
             Assert.Equal(0, raised);
         }
 
+        [Fact]
+        public void Batch_Update_Selection_Is_Correct_Throughout()
+        {
+            var data = new[] { "foo", "bar", "baz", "qux" };
+            var target = new SelectionModel { Source = data };
+            var raised = 0;
+
+            using (target.Update())
+            {
+                target.Select(1);
+
+                Assert.Equal(new IndexPath(1), target.SelectedIndex);
+                Assert.Equal(new[] { new IndexPath(1) }, target.SelectedIndices);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+
+                target.Deselect(1);
+
+                Assert.Equal(new IndexPath(), target.SelectedIndex);
+                Assert.Empty(target.SelectedIndices);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+
+                target.SelectRange(new IndexPath(1), new IndexPath(1));
+
+                Assert.Equal(new IndexPath(1), target.SelectedIndex);
+                Assert.Equal(new[] { new IndexPath(1) }, target.SelectedIndices);
+                Assert.Equal("bar", target.SelectedItem);
+                Assert.Equal(new[] { "bar" }, target.SelectedItems);
+
+                target.ClearSelection();
+
+                Assert.Equal(new IndexPath(), target.SelectedIndex);
+                Assert.Empty(target.SelectedIndices);
+                Assert.Null(target.SelectedItem);
+                Assert.Empty(target.SelectedItems);
+            }
+
+            Assert.Equal(0, raised);
+        }
+
         [Fact]
         public void AutoSelect_Selects_When_Enabled()
         {