Merge pull request #45 from DamianReeves/master

Fix for issue #44
reactiveui · Jan 30, 2012 · 0cc9d01 · 0cc9d01
2 parents c9499dc + 670e02e
commit 0cc9d01
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/ReactiveUI.Tests/ObservableCollectionViewTests.cs b/ReactiveUI.Tests/ObservableCollectionViewTests.cs
@@ -154,6 +154,26 @@ public void Sort_when_item_property_changes_in_reactive_collection()
             subject.Select(x => x.Name).AssertAreEqual(new[] { "d", "b", "c", "z" });
         }
 
+        [Fact]
+        public void Remove_when_item_property_changes_donot_meet_filter_criteria_in_reactive_collection() {
+            var source = new ReactiveCollection<Mock>(
+                new List<Mock>
+                {
+                    new Mock{Name = "b"},
+                    new Mock{Name = "a", Enabled = true},
+                    new Mock{Name = "c", Enabled = true}
+                }) {
+                    ChangeTrackingEnabled = true
+                };
+            var subject = new ObservableCollectionView<Mock>(
+                source,
+                x => x.Enabled,
+                null);
+
+            source.ForEach(x => x.Enabled = false);
+            subject.Select(x => x.Name).AssertAreEqual(new string[]{});
+        }
+
         public class Mock : ReactiveObject
         {
             string _Name;

diff --git a/ReactiveUI/ObservableCollectionView.cs b/ReactiveUI/ObservableCollectionView.cs
@@ -78,10 +78,15 @@ void wireNotificationHandlers()
 
             source.ObserveCollectionItemChanged<T>()
                 .Where(updateFilter)
-                .Select(x => x.Sender)
-                .Where(filter)
+                .Select(x => new { Item = x.Sender, Match = filter(x.Sender) })
                 .ObserveOn(RxApp.DeferredScheduler)
-                .Subscribe(updateItem);
+                .Subscribe(x => {
+                    if (x.Match) {
+                        updateItem(x.Item);
+                    } else {
+                        removeItem(x.Item);
+                    }
+                });
         }
 
         public IObservable<int> ViewCountChanged