Merge pull request #6732 from AvaloniaUI/fixes/6729-itemsrepeater-rea…

…ssign-items ItemsRepeater: unsubscribe from ItemsSourceView before disposing it.
AvaloniaUI · Oct 15, 2021 · b2e8305 · b2e8305
2 parents 5a924fa + e2a8b56
commit b2e8305
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/src/Avalonia.Controls/Repeater/ItemsRepeater.cs b/src/Avalonia.Controls/Repeater/ItemsRepeater.cs
@@ -588,14 +588,14 @@ private void OnDataSourcePropertyChanged(ItemsSourceView oldValue, ItemsSourceVi
                 throw new AvaloniaInternalException("Cannot set ItemsSourceView during layout.");
             }
 
-            ItemsSourceView?.Dispose();
-            ItemsSourceView = newValue;
-
             if (oldValue != null)
             {
                 oldValue.CollectionChanged -= OnItemsSourceViewChanged;
             }
 
+            ItemsSourceView?.Dispose();
+            ItemsSourceView = newValue;
+
             if (newValue != null)
             {
                 newValue.CollectionChanged += OnItemsSourceViewChanged;

diff --git a/tests/Avalonia.Controls.UnitTests/ItemsRepeaterTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsRepeaterTests.cs
@@ -0,0 +1,24 @@
+using System.Collections.ObjectModel;
+using Xunit;
+
+namespace Avalonia.Controls.UnitTests
+{
+    public class ItemsRepeaterTests
+    {
+        [Fact]
+        public void Can_Reassign_Items()
+        {
+            var target = new ItemsRepeater();
+            target.Items = new ObservableCollection<string>();
+            target.Items = new ObservableCollection<string>();
+        }
+
+        [Fact]
+        public void Can_Reassign_Items_To_Null()
+        {
+            var target = new ItemsRepeater();
+            target.Items = new ObservableCollection<string>();
+            target.Items = null;
+        }
+    }
+}