wip: wip

92green · Jun 22, 2019 · a9b4bf7 · a9b4bf7
1 parent af9b05b
commit a9b4bf7
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 14 deletions.
diff --git a/packages/dataparcels-docs/yalc.lock b/packages/dataparcels-docs/yalc.lock
@@ -2,7 +2,7 @@
   "version": "v1",
   "packages": {
     "react-dataparcels": {
-      "signature": "203b5a8de364b61c7dd93cd90bcd8f2b",
+      "signature": "2e6cda8adde0eecfd4a3af81a1613cc8",
       "file": true,
       "replaced": "^0.21.0"
     },

diff --git a/packages/react-dataparcels/src/__test__/useParcelBuffer-test.js b/packages/react-dataparcels/src/__test__/useParcelBuffer-test.js
@@ -98,6 +98,53 @@ describe('useParcelBuffer should use config.parcel', () => {
         expect(result.current[1].actions.length).toBe(0);
     });
 
+    it('should keep inner parcel and buffer contents if outer parcel is different and mergeMode is "rebase"', () => {
+
+        let parcel = new Parcel({
+            value: {
+                abc: 100,
+                def: 100
+            }
+        });
+
+        let {result, rerender} = renderHookWithProps({parcel}, ({parcel}) => useParcelBuffer({parcel}));
+
+        act(() => {
+            result.current[0].set('abc', 400);
+        });
+
+        // confirm that set() has worked
+        expect(result.current[0].value).toEqual({
+            abc: 400,
+            def: 100
+        });
+
+        act(() => {
+            let parcel = new Parcel({
+                value: {
+                    abc: 200,
+                    def: 200
+                }
+            });
+
+            parcel._frameMeta.mergeMode = "rebase";
+
+            rerender({
+                parcel
+            });
+        });
+
+        // actions should be rebased onto new parcel from props
+        // and innter parcel should contain the resulting data
+        expect(result.current[0].value).toEqual({
+            abc: 400,
+            def: 200
+        });
+
+        // buffer should remain
+        expect(result.current[1].actions.length).toBe(1);
+    });
+
 });
 
 describe('useParcelBuffer should pass ParcelBoundaryControl', () => {

diff --git a/packages/react-dataparcels/src/useParcelBuffer.js b/packages/react-dataparcels/src/useParcelBuffer.js
@@ -174,21 +174,24 @@ export default (params: Params): Return => {
         const newOuterParcel = params.parcel;
         setOuterParcel(newOuterParcel);
 
-        // clear buffer if it exists
-        if(internalBuffer.bufferState) {
-            internalBuffer.reset();
-        }
+        if(!innerParcel || newOuterParcel._frameMeta.mergeMode !== "rebase") {
+
+            // clear buffer if it exists
+            if(internalBuffer.bufferState) {
+                internalBuffer.reset();
+            }
 
-        // boundary split to ensure that inner parcels chain are
-        // completely isolated from outer parcels chain
-        newInnerParcel = params.parcel
-            ._boundarySplit({handleChange})
-            .pipe(
-                prepareInnerParcelFromOuter(),
-                applyModifiers
-            );
+            // boundary split to ensure that inner parcels chain are
+            // completely isolated from outer parcels chain
+            newInnerParcel = params.parcel
+                ._boundarySplit({handleChange})
+                .pipe(
+                    prepareInnerParcelFromOuter(),
+                    applyModifiers
+                );
 
-        setInnerParcel(newInnerParcel);
+            setInnerParcel(newInnerParcel);
+        }
     }
 
     let returnedParcel: Parcel = innerParcel || newInnerParcel;