Merge (partial) fixture changes from proxy with current state

react-cosmos · Dec 4, 2016 · 1b98298 · 1b98298
1 parent 0b7b959
commit 1b98298
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/packages/react-component-playground/src/components/component-playground.jsx b/packages/react-component-playground/src/components/component-playground.jsx
@@ -401,18 +401,28 @@ module.exports = React.createClass({
     this.setState({ isEditorFocused: isFocused });
   },
 
-  onFixtureUpdate(fixtureContents) {
+  onFixtureUpdate(fixtureBody) {
+    const {
+      isEditorFocused,
+      fixtureContents,
+    } = this.state;
+
     // Don't update fixture contents while the user is editing the fixture
-    if (this.state.isEditorFocused) {
+    if (isEditorFocused) {
       return;
     }
 
     // We assume data received in this handler is serializable (& thus
     // part of state.fixtureContents)
+    const newFixtureContents = {
+      ...fixtureContents,
+      ...fixtureBody,
+    };
+
     this.setState({
-      fixtureContents,
+      fixtureContents: newFixtureContents,
       fixtureUserInput:
-          this.constructor.getStringifiedFixtureContents(fixtureContents),
+          this.constructor.getStringifiedFixtureContents(newFixtureContents),
       isFixtureUserInputValid: true,
     });
   },

diff --git a/...round/test/components/component-playground/selected-fixture-and-editor/events/handlers.js b/...round/test/components/component-playground/selected-fixture-and-editor/events/handlers.js
@@ -25,7 +25,9 @@ describe(`ComponentPlayground (${FIXTURE}) Events Handlers`, () => {
         data: {
           type: 'fixtureUpdate',
           fixtureBody: {
-            foo: 'bar',
+            state: {
+              somethingHappened: true,
+            },
           },
         },
       });
@@ -42,7 +44,12 @@ describe(`ComponentPlayground (${FIXTURE}) Events Handlers`, () => {
     });
 
     it('should override serializable fixture part', () => {
-      expect(stateSet.fixtureContents).to.deep.equal({ foo: 'bar' });
+      expect(stateSet.fixtureContents).to.deep.equal({
+        ...fixture.state.fixtureContents,
+        state: {
+          somethingHappened: true,
+        },
+      });
     });
 
     it('should keep unserializable fixture part', () => {
@@ -52,8 +59,12 @@ describe(`ComponentPlayground (${FIXTURE}) Events Handlers`, () => {
     });
 
     it('should update stringified child snapshot state', () => {
-      expect(stateSet.fixtureUserInput)
-            .to.equal(JSON.stringify({ foo: 'bar' }, null, 2));
+      expect(stateSet.fixtureUserInput).to.equal(JSON.stringify({
+        ...fixture.state.fixtureContents,
+        state: {
+          somethingHappened: true,
+        },
+      }, null, 2));
     });
   });