Merge pull request #27 from Cysharp/hadashiA/fix-missing-property-cha…

…nged-ev Fix to emit INotifyCollectionChanged.OnPropertyChanged
Cysharp · Feb 16, 2024 · edbaf0b · edbaf0b
2 parents 97dafad + 600a300
commit edbaf0b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/sandbox/ConsoleApp/Program.cs b/sandbox/ConsoleApp/Program.cs
@@ -44,7 +44,7 @@
 class ViewModel
 {
     public int Id { get; set; }
-    public string Value { get; set; }
+    public string Value { get; set; } = default!;
 }
 
 class HogeFilter : ISynchronizedViewFilter<int, ViewModel>
@@ -65,8 +65,8 @@ public void WhenFalse(int value, ViewModel view)
     }
 
     public void OnCollectionChanged(
-        ChangedKind changedKind, 
-        int value, 
+        ChangedKind changedKind,
+        int value,
         ViewModel view,
         in NotifyCollectionChangedEventArgs<int> eventArgs)
     {

diff --git a/src/ObservableCollections/Internal/NotifyCollectionChangedSynchronizedView.cs b/src/ObservableCollections/Internal/NotifyCollectionChangedSynchronizedView.cs
@@ -66,9 +66,11 @@ public void OnCollectionChanged(ChangedKind changedKind, T value, TView view, in
             {
                 case ChangedKind.Add:
                     CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, view, eventArgs.NewStartingIndex));
+                    PropertyChanged?.Invoke(this, CountPropertyChangedEventArgs);
                     return;
                 case ChangedKind.Remove:
                     CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Remove, view, eventArgs.OldStartingIndex));
+                    PropertyChanged?.Invoke(this, CountPropertyChangedEventArgs);
                     break;
                 case ChangedKind.Move:
                     CollectionChanged?.Invoke(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move, view, eventArgs.NewStartingIndex, eventArgs.OldStartingIndex));