{"files":[{"path":"src\/__tests__\/__snapshots__\/store-test.js.snap","status":"M"},{"path":"src\/__tests__\/store-test.js","status":"M"},{"path":"src\/devtools\/store.js","status":"M"}],"body":"","patch":"diff --git a\/src\/__tests__\/__snapshots__\/store-test.js.snap b\/src\/__tests__\/__snapshots__\/store-test.js.snap\nindex 1e1af1d669..a3b156a40b 100644\n--- a\/src\/__tests__\/__snapshots__\/store-test.js.snap\n+++ b\/src\/__tests__\/__snapshots__\/store-test.js.snap\n@@ -214,6 +214,32 @@ exports[`Store collapseNodesByDefault:true should filter DOM nodes from the stor\n ▸ \n `;\n \n+exports[`Store collapseNodesByDefault:true should not add new nodes when suspense is toggled: 1: mount 1`] = `\n+[root]\n+ ▸ \n+`;\n+\n+exports[`Store collapseNodesByDefault:true should not add new nodes when suspense is toggled: 2: expand tree 1`] = `\n+[root]\n+ ▾ \n+ ▾ \n+ ▸ \n+`;\n+\n+exports[`Store collapseNodesByDefault:true should not add new nodes when suspense is toggled: 3: toggle fallback on 1`] = `\n+[root]\n+ ▾ \n+ ▾ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:true should not add new nodes when suspense is toggled: 4: toggle fallback on 1`] = `\n+[root]\n+ ▾ \n+ ▾ \n+ ▸ \n+`;\n+\n exports[`Store collapseNodesByDefault:true should support expanding deep parts of the tree: 1: mount 1`] = `\n [root]\n ▸ \ndiff --git a\/src\/__tests__\/store-test.js b\/src\/__tests__\/store-test.js\nindex 5dad4ed956..46383476be 100644\n--- a\/src\/__tests__\/store-test.js\n+++ b\/src\/__tests__\/store-test.js\n@@ -4,6 +4,7 @@ describe('Store', () => {\n let React;\n let ReactDOM;\n let TestUtils;\n+ let agent;\n let store;\n \n const act = (callback: Function) => {\n@@ -14,6 +15,7 @@ describe('Store', () => {\n };\n \n beforeEach(() => {\n+ agent = global.agent;\n store = global.store;\n \n React = require('react');\n@@ -409,7 +411,7 @@ describe('Store', () => {\n );\n expect(store).toMatchSnapshot('1: mount');\n \n- const deepestedNodeID = global.agent.getIDForNode(ref.current);\n+ const deepestedNodeID = agent.getIDForNode(ref.current);\n \n act(() => store.toggleIsCollapsed(deepestedNodeID, false));\n expect(store).toMatchSnapshot('2: expand deepest node');\n@@ -460,5 +462,50 @@ describe('Store', () => {\n act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(0), true));\n expect(store).toMatchSnapshot('6: collapse root');\n });\n+\n+ it('should not add new nodes when suspense is toggled', () => {\n+ const SuspenseTree = () => {\n+ return (\n+ Loading outer<\/Fallback>}>\n+ \n+ <\/React.Suspense>\n+ );\n+ };\n+\n+ const Fallback = () => null;\n+ const Parent = () => ;\n+ const Child = () => null;\n+\n+ act(() =>\n+ ReactDOM.render(, document.createElement('div'))\n+ );\n+ expect(store).toMatchSnapshot('1: mount');\n+\n+ act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(0), false));\n+ act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(1), false));\n+ expect(store).toMatchSnapshot('2: expand tree');\n+\n+ \/\/ HACK There's only one renderer for this test\n+ const rendererID = Object.keys(agent._rendererInterfaces)[0];\n+ const suspenseID = store.getElementIDAtIndex(1);\n+\n+ act(() =>\n+ agent.overrideSuspense({\n+ id: suspenseID,\n+ rendererID,\n+ forceFallback: true,\n+ })\n+ );\n+ expect(store).toMatchSnapshot('3: toggle fallback on');\n+\n+ act(() =>\n+ agent.overrideSuspense({\n+ id: suspenseID,\n+ rendererID,\n+ forceFallback: false,\n+ })\n+ );\n+ expect(store).toMatchSnapshot('4: toggle fallback on');\n+ });\n });\n });\ndiff --git a\/src\/devtools\/store.js b\/src\/devtools\/store.js\nindex d1bc5884e1..9ac8ac5598 100644\n--- a\/src\/devtools\/store.js\n+++ b\/src\/devtools\/store.js\n@@ -551,7 +551,7 @@ export default class Store extends EventEmitter {\n \n if (__DEBUG__) {\n console.groupCollapsed('onBridgeOperations');\n- debug('onBridgeOperations', operations);\n+ debug('onBridgeOperations', operations.join(','));\n }\n \n let haveRootsChanged = false;\n@@ -772,7 +772,7 @@ export default class Store extends EventEmitter {\n \n children.forEach(childID => {\n const child = ((this._idToElement.get(childID): any): Element);\n- childWeight += child.weight;\n+ childWeight += child.isCollapsed ? 1 : child.weight;\n });\n \n element.weight = childWeight + 1;\n","commit":{"shortRevision":"358e63ac3d","subject":"Fixed a Suspense toggling bug that incorrectly impacted tree weight","revision":"358e63ac3d103ca4698fb36777d9278150a6fb37","authorName":"Brian Vaughn","authorEmail":"bvaughn@fb.com","authoredAt":"2019-04-18T09:38:41-07:00"},"parents":["b45e743f522344eb0e13e8d9c6d62c6fc02aa4ea"]}

dillon1000/react

Files changed