Refactor collections.

ChebanovDD · ChebanovDD · commit eddad927cc20 · 2023-04-27T13:17:50.000+08:00
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableListView.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableListView.cs
@@ -1,5 +1,7 @@
-﻿using System.Collections.ObjectModel;
+﻿using System;
+using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.Runtime.CompilerServices;
 using UnityEngine.UIElements;
 using UnityMvvmToolkit.Common.Extensions;
 using UnityMvvmToolkit.Common.Interfaces;
@@ -46,12 +48,13 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)
 
             _itemsSource.Value.CollectionChanged -= OnItemsCollectionChanged;
 
-            objectProvider.ReturnReadOnlyProperty(_itemsSource);
-
             makeItem -= MakeItem;
             bindItem -= BindItem;
             unbindItem -= UnbindItem;
-            Clear();
+
+            ClearItems();
+
+            objectProvider.ReturnReadOnlyProperty(_itemsSource);
 
             _itemsSource = null;
             _itemTemplate = null;
@@ -63,13 +66,14 @@ protected virtual VisualElement MakeItem(VisualTreeAsset itemTemplate)
             return itemTemplate.InstantiateBindableElement(); // TODO: Pool.
         }
 
-        protected virtual void BindItem(VisualElement item, TItemBindingContext bindingContext,
+        protected virtual void BindItem(VisualElement item, int index, TItemBindingContext bindingContext,
             IObjectProvider objectProvider)
         {
             item.SetBindingContext(bindingContext, objectProvider, true);
         }
 
-        protected virtual void UnbindItem(VisualElement item, IObjectProvider objectProvider)
+        protected virtual void UnbindItem(VisualElement item, int index, TItemBindingContext bindingContext,
+            IObjectProvider objectProvider)
         {
             item.ResetBindingContext(objectProvider, true);
         }
@@ -81,17 +85,23 @@ private VisualElement MakeItem()
 
         private void BindItem(VisualElement item, int index)
         {
-            BindItem(item, _itemsSource.Value[index], _objectProvider);
+            BindItem(item, index, _itemsSource.Value[index], _objectProvider);
         }
 
         private void UnbindItem(VisualElement item, int index)
         {
-            UnbindItem(item, _objectProvider);
+            UnbindItem(item, index, _itemsSource.Value[index], _objectProvider);
         }
 
         private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             RefreshItems(); // TODO: Do not refresh all items.
         }
+
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ClearItems()
+        {
+            itemsSource = Array.Empty<TItemBindingContext>();
+        }
     }
 }
diff --git a/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableScrollView.cs b/src/UnityMvvmToolkit.UnityPackage/Assets/Plugins/UnityMvvmToolkit/Runtime/UITK/BindableUIElements/BindableScrollView.cs
@@ -16,6 +16,8 @@ namespace UnityMvvmToolkit.UITK.BindableUIElements
     public abstract partial class BindableScrollView<TItemBindingContext> : ScrollView, IBindableElement,
         IInitializable, IDisposable where TItemBindingContext : ICollectionItem
     {
+        private int _itemsCount;
+
         private VisualTreeAsset _itemTemplate;
 
         private PropertyBindingData _itemsSourceBindingData;
@@ -35,7 +37,16 @@ public virtual void Initialize()
 
         public virtual void Dispose()
         {
-            ClearItems();
+            if (_itemsSource == null)
+            {
+                _itemsCount = 0;
+                _itemAssets.Clear();
+            }
+            else
+            {
+                ClearItems(_itemsSource.Value);
+            }
+
             _itemAssetsPool.Dispose();
         }
 
@@ -63,9 +74,9 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)
 
             _itemsSource.Value.CollectionChanged -= OnItemsCollectionChanged;
 
-            objectProvider.ReturnReadOnlyProperty(_itemsSource);
+            ClearItems(_itemsSource.Value);
 
-            ClearItems();
+            objectProvider.ReturnReadOnlyProperty(_itemsSource);
 
             _itemsSource = null;
             _itemTemplate = null;
@@ -77,13 +88,14 @@ protected virtual VisualElement MakeItem(VisualTreeAsset itemTemplate)
             return itemTemplate.InstantiateBindableElement();
         }
 
-        protected virtual void BindItem(VisualElement item, TItemBindingContext bindingContext,
+        protected virtual void BindItem(VisualElement item, int index, TItemBindingContext bindingContext,
             IObjectProvider objectProvider)
         {
             item.SetBindingContext(bindingContext, objectProvider, true);
         }
 
-        protected virtual void UnbindItem(VisualElement item, IObjectProvider objectProvider)
+        protected virtual void UnbindItem(VisualElement item, int index, TItemBindingContext bindingContext,
+            IObjectProvider objectProvider)
         {
             item.ResetBindingContext(objectProvider, true);
         }
@@ -122,33 +134,37 @@ private void AddItems(IEnumerable<TItemBindingContext> items)
         private void AddItem(TItemBindingContext itemBindingContext)
         {
             var item = _itemAssetsPool.Get();
-            BindItem(item, itemBindingContext, _objectProvider);
+            BindItem(item, _itemsCount, itemBindingContext, _objectProvider);
 
+            _itemsCount++;
             _itemAssets.Add(itemBindingContext.Id, item);
+
             contentContainer.Add(item);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         private void RemoveItem(TItemBindingContext itemBindingContext)
         {
-            _itemAssetsPool.Release(_itemAssets[itemBindingContext.Id]);
+            _itemsCount--;
+
+            var item = _itemAssets[itemBindingContext.Id];
+
+            if (_objectProvider != null)
+            {
+                UnbindItem(item, _itemsCount, itemBindingContext, _objectProvider);
+            }
+
             _itemAssets.Remove(itemBindingContext.Id);
+            _itemAssetsPool.Release(item);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void ClearItems()
+        private void ClearItems(IReadOnlyList<TItemBindingContext> items)
         {
-            if (_itemAssets.Count == 0)
+            for (var i = items.Count - 1; i >= 0; i--)
             {
-                return;
+                RemoveItem(items[i]);
             }
-
-            foreach (var asset in _itemAssets)
-            {
-                _itemAssetsPool.Release(asset.Value);
-            }
-
-            _itemAssets.Clear();
         }
 
         private VisualElement OnPoolInstantiateItem()
@@ -158,11 +174,6 @@ private VisualElement OnPoolInstantiateItem()
 
         private void OnPooReleaseItem(VisualElement item)
         {
-            if (_objectProvider != null)
-            {
-                UnbindItem(item, _objectProvider);
-            }
-
             item.RemoveFromHierarchy();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`		`-using System.Collections.ObjectModel;`
	`1`	`+using System;`
	`2`	`+using System.Collections.ObjectModel;`
`2`	`3`	`using System.Collections.Specialized;`
	`4`	`+using System.Runtime.CompilerServices;`
`3`	`5`	`using UnityEngine.UIElements;`
`4`	`6`	`using UnityMvvmToolkit.Common.Extensions;`
`5`	`7`	`using UnityMvvmToolkit.Common.Interfaces;`
`@@ -46,12 +48,13 @@ public virtual void ResetBindingContext(IObjectProvider objectProvider)`
`46`	`48`
`47`	`49`	`_itemsSource.Value.CollectionChanged -= OnItemsCollectionChanged;`
`48`	`50`
`49`		`- objectProvider.ReturnReadOnlyProperty(_itemsSource);`
`50`		`-`
`51`	`51`	`makeItem -= MakeItem;`
`52`	`52`	`bindItem -= BindItem;`
`53`	`53`	`unbindItem -= UnbindItem;`
`54`		`- Clear();`
	`54`	`+`
	`55`	`+ ClearItems();`
	`56`	`+`
	`57`	`+ objectProvider.ReturnReadOnlyProperty(_itemsSource);`
`55`	`58`
`56`	`59`	`_itemsSource = null;`
`57`	`60`	`_itemTemplate = null;`
`@@ -63,13 +66,14 @@ protected virtual VisualElement MakeItem(VisualTreeAsset itemTemplate)`
`63`	`66`	`return itemTemplate.InstantiateBindableElement(); // TODO: Pool.`
`64`	`67`	`}`
`65`	`68`
`66`		`- protected virtual void BindItem(VisualElement item, TItemBindingContext bindingContext,`
	`69`	`+ protected virtual void BindItem(VisualElement item, int index, TItemBindingContext bindingContext,`
`67`	`70`	`IObjectProvider objectProvider)`
`68`	`71`	`{`
`69`	`72`	`item.SetBindingContext(bindingContext, objectProvider, true);`
`70`	`73`	`}`
`71`	`74`
`72`		`- protected virtual void UnbindItem(VisualElement item, IObjectProvider objectProvider)`
	`75`	`+ protected virtual void UnbindItem(VisualElement item, int index, TItemBindingContext bindingContext,`
	`76`	`+ IObjectProvider objectProvider)`
`73`	`77`	`{`
`74`	`78`	`item.ResetBindingContext(objectProvider, true);`
`75`	`79`	`}`
`@@ -81,17 +85,23 @@ private VisualElement MakeItem()`
`81`	`85`
`82`	`86`	`private void BindItem(VisualElement item, int index)`
`83`	`87`	`{`
`84`		`- BindItem(item, _itemsSource.Value[index], _objectProvider);`
	`88`	`+ BindItem(item, index, _itemsSource.Value[index], _objectProvider);`
`85`	`89`	`}`
`86`	`90`
`87`	`91`	`private void UnbindItem(VisualElement item, int index)`
`88`	`92`	`{`
`89`		`- UnbindItem(item, _objectProvider);`
	`93`	`+ UnbindItem(item, index, _itemsSource.Value[index], _objectProvider);`
`90`	`94`	`}`
`91`	`95`
`92`	`96`	`private void OnItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)`
`93`	`97`	`{`
`94`	`98`	`RefreshItems(); // TODO: Do not refresh all items.`
`95`	`99`	`}`
	`100`	`+`
	`101`	`+ [MethodImpl(MethodImplOptions.AggressiveInlining)]`
	`102`	`+ private void ClearItems()`
	`103`	`+ {`
	`104`	`+ itemsSource = Array.Empty<TItemBindingContext>();`
	`105`	`+ }`
`96`	`106`	`}`
`97`	`107`	`}`