{"parents":["178e89927a4f5322311a1f00ca0e771bd7d358ca"],"files":[{"status":"M","path":"src\/__tests__\/__snapshots__\/store-test.js.snap"},{"status":"M","path":"src\/__tests__\/store-test.js"},{"status":"M","path":"src\/devtools\/store.js"}],"body":"","commit":{"shortRevision":"74be389124","authoredAt":"2019-04-17T09:39:54-07:00","authorEmail":"bvaughn@fb.com","revision":"74be38912464d63020eb52df016624b9d227335c","authorName":"Brian Vaughn","subject":"Fixed a bug with re-ordering of children within a collapsed node"},"patch":"diff --git a\/src\/__tests__\/__snapshots__\/store-test.js.snap b\/src\/__tests__\/__snapshots__\/store-test.js.snap\nindex bfa9d217b1..fe37abce49 100644\n--- a\/src\/__tests__\/__snapshots__\/store-test.js.snap\n+++ b\/src\/__tests__\/__snapshots__\/store-test.js.snap\n@@ -138,6 +138,26 @@ exports[`Store collapseNodesByDefault:false should support mount and update oper\n \n exports[`Store collapseNodesByDefault:false should support mount and update operations: 3: unmount 1`] = ``;\n \n+exports[`Store collapseNodesByDefault:false should support reordering of children: 1: mount 1`] = `\n+[root]\n+ ▾ \n+ ▾ \n+ \n+ ▾ \n+ \n+ \n+`;\n+\n+exports[`Store collapseNodesByDefault:false should support reordering of children: 3: reorder children 1`] = `\n+[root]\n+ ▾ \n+ ▾ \n+ \n+ \n+ ▾ \n+ \n+`;\n+\n exports[`Store collapseNodesByDefault:true should display Suspense nodes properly in various states: 1: loading 1`] = `\n [root]\n ▸ \n@@ -310,6 +330,16 @@ exports[`Store collapseNodesByDefault:true should support mount and update opera\n \n exports[`Store collapseNodesByDefault:true should support mount and update operations: 3: unmount 1`] = ``;\n \n+exports[`Store collapseNodesByDefault:true should support reordering of children: 1: mount 1`] = `\n+[root]\n+ ▸ \n+`;\n+\n+exports[`Store collapseNodesByDefault:true should support reordering of children: 3: reorder children 1`] = `\n+[root]\n+ ▸ \n+`;\n+\n exports[`Store should not allow a root node to be collapsed: 1: mount 1`] = `\n [root]\n \ndiff --git a\/src\/__tests__\/store-test.js b\/src\/__tests__\/store-test.js\nindex c4e6b42497..bfe0d88da8 100644\n--- a\/src\/__tests__\/store-test.js\n+++ b\/src\/__tests__\/store-test.js\n@@ -187,6 +187,27 @@ describe('Store', () => {\n act(() => store.toggleIsCollapsed(grandparentID, false));\n expect(store).toMatchSnapshot('6: expand Grandparent');\n });\n+\n+ it('should support reordering of children', () => {\n+ const Component = ({ children = null }) => children;\n+\n+ const Foo = () => [];\n+ const Bar = () => [, ];\n+ const foo = ;\n+ const bar = ;\n+\n+ const container = document.createElement('div');\n+\n+ act(() =>\n+ ReactDOM.render({[foo, bar]}<\/Component>, container)\n+ );\n+ expect(store).toMatchSnapshot('1: mount');\n+\n+ act(() =>\n+ ReactDOM.render({[bar, foo]}<\/Component>, container)\n+ );\n+ expect(store).toMatchSnapshot('3: reorder children');\n+ });\n });\n \n describe('collapseNodesByDefault:true', () => {\n@@ -406,5 +427,26 @@ describe('Store', () => {\n act(() => store.toggleIsCollapsed(id, false));\n expect(store).toMatchSnapshot('6: expand middle node');\n });\n+\n+ it('should support reordering of children', () => {\n+ const Component = ({ children = null }) => children;\n+\n+ const Foo = () => [];\n+ const Bar = () => [, ];\n+ const foo = ;\n+ const bar = ;\n+\n+ const container = document.createElement('div');\n+\n+ act(() =>\n+ ReactDOM.render({[foo, bar]}<\/Component>, container)\n+ );\n+ expect(store).toMatchSnapshot('1: mount');\n+\n+ act(() =>\n+ ReactDOM.render({[bar, foo]}<\/Component>, container)\n+ );\n+ expect(store).toMatchSnapshot('3: reorder children');\n+ });\n });\n });\ndiff --git a\/src\/devtools\/store.js b\/src\/devtools\/store.js\nindex 2451abd98f..817af3daf0 100644\n--- a\/src\/devtools\/store.js\n+++ b\/src\/devtools\/store.js\n@@ -544,6 +544,7 @@ export default class Store extends EventEmitter {\n }\n \n if (__DEBUG__) {\n+ console.groupCollapsed('onBridgeOperations');\n debug('onBridgeOperations', operations);\n }\n \n@@ -797,17 +798,19 @@ export default class Store extends EventEmitter {\n element = ((this._idToElement.get(id): any): Element);\n element.children = Array.from(children);\n \n- const prevWeight = element.weight;\n- let childWeight = 0;\n+ if (!element.isCollapsed) {\n+ const prevWeight = element.weight;\n+ let childWeight = 0;\n \n- children.forEach(childID => {\n- const child = ((this._idToElement.get(childID): any): Element);\n- childWeight += child.weight;\n- });\n+ children.forEach(childID => {\n+ const child = ((this._idToElement.get(childID): any): Element);\n+ childWeight += child.weight;\n+ });\n \n- element.weight = childWeight + 1;\n+ element.weight = childWeight + 1;\n \n- weightDelta = childWeight + 1 - prevWeight;\n+ weightDelta = childWeight + 1 - prevWeight;\n+ }\n break;\n case TREE_OPERATION_UPDATE_TREE_BASE_DURATION:\n \/\/ Base duration updates are only sent while profiling is in progress.\n@@ -861,6 +864,11 @@ export default class Store extends EventEmitter {\n this.emit('roots');\n }\n \n+ if (__DEBUG__) {\n+ console.log(this.__toSnapshot(true));\n+ console.groupEnd();\n+ }\n+\n this.emit('mutated', [addedElementIDs, removedElementIDs]);\n };\n \n"}

dillon1000/react

Files changed