Support remove range on collection as part as issue #105

NeutroniumCore · Feb 16, 2019 · aa5eb18 · aa5eb18
1 parent 9ae3678
commit aa5eb18
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/Neutronium.Core/Binding/GlueObject/JSArray.cs b/Neutronium.Core/Binding/GlueObject/JSArray.cs
@@ -147,9 +147,9 @@ public BridgeUpdater GetMoveUpdater(int oldIndex, int newIndex)
             return new BridgeUpdater(viewModelUpdater => MoveJavascriptCollection(viewModelUpdater, item.GetJsSessionValue(), oldIndex, newIndex));
         }
 
-        public BridgeUpdater GetRemoveUpdater(int index)
+        public BridgeUpdater GetRemoveUpdater(int index, int count)
         {
-            var bridgeUpdater = new BridgeUpdater(viewModelUpdater => Splice(viewModelUpdater, index, 1));
+            var bridgeUpdater = new BridgeUpdater(viewModelUpdater => Splice(viewModelUpdater, index, count));
             var old = Items[index];
             Items.RemoveAt(index);
             return CheckForRemove(bridgeUpdater, old);

diff --git a/Neutronium.Core/Binding/Updaters/CollectionJavascriptUpdater.cs b/Neutronium.Core/Binding/Updaters/CollectionJavascriptUpdater.cs
@@ -49,7 +49,7 @@ private BridgeUpdater GetBridgeUpdater(JsArray array)
                     return array.GetReplaceUpdater(newValue, _Change.NewStartingIndex);
 
                 case NotifyCollectionChangedAction.Remove:
-                    return array.GetRemoveUpdater(_Change.OldStartingIndex);
+                    return array.GetRemoveUpdater(_Change.OldStartingIndex, _Change.OldItems.Count);
 
                 case NotifyCollectionChangedAction.Reset:
                     return array.GetResetUpdater(); ;

diff --git a/Tests/UniversalTests/HTMLBindingTests/HTMLBindingTests_Collection.cs b/Tests/UniversalTests/HTMLBindingTests/HTMLBindingTests_Collection.cs
@@ -200,6 +200,34 @@ public async Task TwoWay_Collection_Updates_After_InsertRange_Changes()
             await RunAsync(test);
         }
 
+
+        [Fact]
+        public async Task TwoWay_Collection_Updates_After_RemoveRange_Changes()
+        {
+            var dataContext = new VmWithRangeCollection();
+            dataContext.List.AddRange(new[] { 1, 2, 3, 4, 5 });
+            var test = new TestInContextAsync()
+            {
+                Bind = (win) => HtmlBinding.Bind(win, dataContext, JavascriptBindingMode.TwoWay),
+                Test = async (mb) =>
+                {
+                    var js = mb.JsRootObject;
+
+                    DoSafeUI(() =>
+                    {
+                        dataContext.List.RemoveRange(1, 3);
+                    });
+
+                    await Task.Delay(500);
+                    var col = GetCollectionAttribute(js, "List");
+                    col.Should().NotBeNull();
+                    CheckIntCollection(col, new[] { 1, 5 });
+                }
+            };
+
+            await RunAsync(test);
+        }
+
         [Fact]
         public async Task TwoWay_Collection_Updates_CSharp_From_JS_Update()
         {