{"body":"","parents":["4e04907d13e8617dd38ce2f4f6c3c1ff031fed17"],"files":[{"path":"src\/__tests__\/store-test.js","status":"M"},{"path":"src\/devtools\/store.js","status":"M"}],"patch":"diff --git a\/src\/__tests__\/store-test.js b\/src\/__tests__\/store-test.js\nindex 067448426c..5942574a77 100644\n--- a\/src\/__tests__\/store-test.js\n+++ b\/src\/__tests__\/store-test.js\n@@ -696,4 +696,91 @@ describe('Store', () => {\n expect(store).toMatchSnapshot('4: toggle fallback on');\n });\n });\n+\n+ describe('getIndexOfElementID', () => {\n+ beforeEach(() => {\n+ store.collapseNodesByDefault = false;\n+ });\n+\n+ it('should support a single root with a single child', () => {\n+ const Grandparent = () => (\n+ \n+ \n+ \n+ <\/React.Fragment>\n+ );\n+ const Parent = () => ;\n+ const Child = () => null;\n+\n+ act(() =>\n+ ReactDOM.render(, document.createElement('div'))\n+ );\n+\n+ for (let i = 0; i < store.numElements; i++) {\n+ expect(store.getIndexOfElementID(store.getElementIDAtIndex(i))).toBe(i);\n+ }\n+ });\n+\n+ it('should support multiple roots with one children each', () => {\n+ const Grandparent = () => ;\n+ const Parent = () => ;\n+ const Child = () => null;\n+\n+ act(() => {\n+ ReactDOM.render(, document.createElement('div'));\n+ ReactDOM.render(, document.createElement('div'));\n+ });\n+\n+ for (let i = 0; i < store.numElements; i++) {\n+ expect(store.getIndexOfElementID(store.getElementIDAtIndex(i))).toBe(i);\n+ }\n+ });\n+\n+ it('should support a single root with multiple top level children', () => {\n+ const Grandparent = () => ;\n+ const Parent = () => ;\n+ const Child = () => null;\n+\n+ act(() =>\n+ ReactDOM.render(\n+ \n+ \n+ \n+ <\/React.Fragment>,\n+ document.createElement('div')\n+ )\n+ );\n+\n+ for (let i = 0; i < store.numElements; i++) {\n+ expect(store.getIndexOfElementID(store.getElementIDAtIndex(i))).toBe(i);\n+ }\n+ });\n+\n+ it('should support multiple roots with multiple top level children', () => {\n+ const Grandparent = () => ;\n+ const Parent = () => ;\n+ const Child = () => null;\n+\n+ act(() => {\n+ ReactDOM.render(\n+ \n+ \n+ \n+ <\/React.Fragment>,\n+ document.createElement('div')\n+ );\n+ ReactDOM.render(\n+ \n+ \n+ \n+ <\/React.Fragment>,\n+ document.createElement('div')\n+ );\n+ });\n+\n+ for (let i = 0; i < store.numElements; i++) {\n+ expect(store.getIndexOfElementID(store.getElementIDAtIndex(i))).toBe(i);\n+ }\n+ });\n+ });\n });\ndiff --git a\/src\/devtools\/store.js b\/src\/devtools\/store.js\nindex 6da87d3032..9c129d7162 100644\n--- a\/src\/devtools\/store.js\n+++ b\/src\/devtools\/store.js\n@@ -429,12 +429,6 @@ export default class Store extends EventEmitter {\n let index = 0;\n while (true) {\n const current = ((this._idToElement.get(currentID): any): Element);\n- if (current.parentID === 0) {\n- \/\/ We found the root; stop crawling.\n- break;\n- }\n-\n- index++;\n \n const { children } = current;\n for (let i = 0; i < children.length; i++) {\n@@ -446,6 +440,13 @@ export default class Store extends EventEmitter {\n index += child.isCollapsed ? 1 : child.weight;\n }\n \n+ if (current.parentID === 0) {\n+ \/\/ We found the root; stop crawling.\n+ break;\n+ }\n+\n+ index++;\n+\n previousID = current.id;\n currentID = current.parentID;\n }\n","commit":{"shortRevision":"d7447a8458","authoredAt":"2019-05-02T15:12:57-07:00","authorName":"Brian Vaughn","subject":"Fixed bug in Store.getIndexOfElementID() that caused roots with multiple top-level children to return an incorrect item index","authorEmail":"bvaughn@fb.com","revision":"d7447a8458c8196425e94ef746ba6c9d1be6f421"}}

dillon1000/react

Files changed