fix: Refactor collection change notifications and sorting

Refactor `OnCollectionChanged` in `ExtendedObservableCollection.cs` to use `NotifyCollectionChangedAction.Reset` for simplification. Update `SortableObservableCollection.cs` to avoid sorting on `NotifyCollectionChangedAction.Reset` and add a check to sort only if the collection has at least two items.
sandre58 · Oct 9, 2024 · 5ef22ff · 5ef22ff
1 parent 286ee21
commit 5ef22ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/MyNet.Utilities/Collections/ExtendedObservableCollection.cs b/src/MyNet.Utilities/Collections/ExtendedObservableCollection.cs
@@ -141,7 +141,7 @@ public IDisposable SuspendNotifications()
                 _suspendCount = false;
                 _suspendNotifications = false;
                 OnPropertyChanged(new PropertyChangedEventArgs("Count"));
-                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, Array.Empty<T>()));
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
             }).Defer();
     }
 

diff --git a/src/MyNet.Utilities/Collections/SortableObservableCollection.cs b/src/MyNet.Utilities/Collections/SortableObservableCollection.cs
@@ -27,17 +27,15 @@ protected override void InvokeNotifyCollectionChanged(NotifyCollectionChangedEve
         {
             base.InvokeNotifyCollectionChanged(notifyEventHandler, e);
 
-            if (SortSelector is null
-                || e.Action == NotifyCollectionChangedAction.Remove
-                || e.Action == NotifyCollectionChangedAction.Reset)
+            if (SortSelector is null || e.Action == NotifyCollectionChangedAction.Remove)
                 return;
 
             Sort();
         }
 
         public void Sort()
         {
-            if (SortSelector is null) return;
+            if (SortSelector is null || Count < 2) return;
 
             ExecuteThreadSafe(() =>
             {