Merge pull request #49 from ahmedalejo/patch-1

Refactored ObservableRangeCollection change notifications
jamesmontemagno · Sep 26, 2019 · 6862d6b · 6862d6b
2 parents 5dcb87d + 2cf2ef6
commit 6862d6b
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/MvvmHelpers/ObservableRangeCollection.cs b/MvvmHelpers/ObservableRangeCollection.cs
@@ -54,11 +54,7 @@ public void AddRange(IEnumerable<T> collection, NotifyCollectionChangedAction no
 				}
 
 				if (raiseEvents)
-				{
-					OnPropertyChanged(new PropertyChangedEventArgs("Count"));
-					OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
-					OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-				}
+					RaiseChangeNotificationEvents(action: NotifyCollectionChangedAction.Reset);
 
 				return;
 			}
@@ -70,10 +66,11 @@ public void AddRange(IEnumerable<T> collection, NotifyCollectionChangedAction no
 
 			if (changedItems.Count == 0)
 				return;
-
-			OnPropertyChanged(new PropertyChangedEventArgs("Count"));
-			OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
-			OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, changedItems, startIndex));
+
+            RaiseChangeNotificationEvents(
+                action: NotifyCollectionChangedAction.Add,
+                changedItems: changedItems,
+                startingIndex: startIndex);
 		}
 
 		/// <summary> 
@@ -98,7 +95,7 @@ public void RemoveRange(IEnumerable<T> collection, NotifyCollectionChangedAction
 				}
 
 				if (raiseEvents)
-					OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+					RaiseChangeNotificationEvents(action: NotifyCollectionChangedAction.Reset);
 
 				return;
 			}
@@ -116,9 +113,9 @@ public void RemoveRange(IEnumerable<T> collection, NotifyCollectionChangedAction
 			if (changedItems.Count == 0)
 				return;
 
-			OnPropertyChanged(new PropertyChangedEventArgs("Count"));
-			OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
-			OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, changedItems, -1));
+            RaiseChangeNotificationEvents(
+                action: NotifyCollectionChangedAction.Remove,
+                changedItems: changedItems);
 		}
 
 		/// <summary> 
@@ -138,6 +135,15 @@ public void ReplaceRange(IEnumerable<T> collection)
 			AddRange(collection, NotifyCollectionChangedAction.Reset);
 		}
 
+        private void RaiseChangeNotificationEvents(NotifyCollectionChangedAction action, List<T> changedItems = null, int startingIndex = -1)
+        {
+            OnPropertyChanged(new PropertyChangedEventArgs(nameof(Count)));
+            OnPropertyChanged(new PropertyChangedEventArgs("Item[]"));
+
+            if (changedItems is null)
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(action));
+            else
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(action, changedItems: changedItems, startingIndex: startingIndex));
+        }
 	}
 }
-