Merge pull request #247 from runceel/main

v7.8.1
runceel · Mar 11, 2021 · c69fcd4 · c69fcd4
2 parents 8852ef1 + dde1ba4
commit c69fcd4
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 15 deletions.
diff --git a/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj b/Samples/Reactive.Todo.Main/Reactive.Todo.Main.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0775" />
-    <PackageReference Include="Prism.Wpf" Version="7.2.0.1422" />
+    <PackageReference Include="Prism.Wpf" Version="8.0.0.1909" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ReactiveProperty.Platform.WPF\ReactiveProperty.Platform.WPF.csproj" />

diff --git a/Samples/Reactive.Todo/Reactive.Todo.csproj b/Samples/Reactive.Todo/Reactive.Todo.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0775" />
-    <PackageReference Include="Prism.Unity" Version="7.2.0.1422" />
+    <PackageReference Include="Prism.Unity" Version="8.0.0.1909" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Source\ReactiveProperty.Platform.WPF\ReactiveProperty.Platform.WPF.csproj" />

diff --git a/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj b/Samples/ReactivePropertySamples.WPF/ReactivePropertySamples.WPF.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.31" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/ReactiveProperty.NETStandard/Helpers/FilteredReadOnlyObservableCollection.cs b/Source/ReactiveProperty.NETStandard/Helpers/FilteredReadOnlyObservableCollection.cs
@@ -158,13 +158,8 @@ public FilteredReadOnlyObservableCollection(TCollection source, Func<TElement, b
                                 break;
 
                             case NotifyCollectionChangedAction.Reset:
-                                IndexList.Clear();
-                                InnerCollection.Clear();
+                                Initialize();
                                 OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
-                                if (source.Any())
-                                {
-                                    throw new NotSupportedException("Reset is clear only");
-                                }
                                 break;
 
                             default:

diff --git a/Source/SharedProperties.csproj b/Source/SharedProperties.csproj
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <RootNamespace>Reactive.Bindings</RootNamespace>
-    <Version>7.8.0</Version>
+    <Version>7.8.1</Version>
     <Authors>neuecc xin9le okazuki</Authors>
     <PackageProjectUrl>https://github.com/runceel/ReactiveProperty</PackageProjectUrl>
     <PackageTags>rx mvvm async rx-main reactive</PackageTags>

diff --git a/Test/ReactiveProperty.NETStandard.Tests/Helpers/FilteredReadOnlyObservableCollectionTest.cs b/Test/ReactiveProperty.NETStandard.Tests/Helpers/FilteredReadOnlyObservableCollectionTest.cs
@@ -369,7 +369,20 @@ public void PerformanceTest()
             filtered.Count.Is(500000);
         }
 
-        #region private class
+        [TestMethod]
+        public void ResetTest()
+        {
+            var c = new RangedObservableCollection<Person>();
+            var filtered = c.ToFilteredReadOnlyObservableCollection(x => x.IsRemoved);
+            var people = Enumerable.Range(1, 1000000).Select(x => new Person
+            {
+                Name = $"tanaka {x}",
+                IsRemoved = x % 2 == 0,
+            });
+
+            c.AddRange(people);
+            filtered.Count.Is(500000);
+        }
 
         private class Person : INotifyPropertyChanged
         {
@@ -400,6 +413,25 @@ public bool IsRemoved
             }
         }
 
-        #endregion private class
+        public class RangedObservableCollection<T> : ObservableCollection<T>
+        {
+            private bool _suppressNotification = false;
+
+            protected override void OnCollectionChanged(NotifyCollectionChangedEventArgs e)
+            {
+                if (!_suppressNotification) base.OnCollectionChanged(e);
+            }
+
+            public void AddRange(IEnumerable<T> list)
+            {
+                if (list == null) throw new ArgumentNullException("list");
+
+                _suppressNotification = true;
+                foreach (T item in list) Add(item);
+                _suppressNotification = false;
+
+                OnCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+            }
+        }
     }
 }
diff --git a/docs/package-lock.json b/docs/package-lock.json