{"parents":["94bebda8252a1d922a8e518a7f53c5d4f277dc44"],"commit":{"revision":"4422337562574cb87012d3dc68ea66cab638dda6","authorEmail":"bvaughn@fb.com","subject":"Added another (disabled) test; refactored getChildren slightly","shortRevision":"4422337562","authorName":"Brian Vaughn","authoredAt":"2019-05-26T08:37:05-07:00"},"patch":"diff --git a\/src\/__tests__\/legacy\/storeLegacy-v15-test.js b\/src\/__tests__\/legacy\/storeLegacy-v15-test.js\nindex 1b8d38753d..baa882e538 100644\n--- a\/src\/__tests__\/legacy\/storeLegacy-v15-test.js\n+++ b\/src\/__tests__\/legacy\/storeLegacy-v15-test.js\n@@ -176,6 +176,45 @@ describe('Store (legacy)', () => {\n expect(store).toMatchSnapshot('6: expand Grandparent');\n });\n \n+ \/\/ TODO Re-enable this test once the renderer supports it.\n+ xit('should support adding and removing children', () => {\n+ const Root = ({ children }) =>

{children}<\/div>;\n+ const Component = () => null;\n+\n+ const container = document.createElement('div');\n+\n+ act(() =>\n+ ReactDOM.render(\n+ \n+ \n+ <\/Root>,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('1: mount');\n+\n+ act(() =>\n+ ReactDOM.render(\n+ \n+ \n+ \n+ <\/Root>,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('2: add child');\n+\n+ act(() =>\n+ ReactDOM.render(\n+ \n+ \n+ <\/Root>,\n+ container\n+ )\n+ );\n+ expect(store).toMatchSnapshot('3: remove child');\n+ });\n+\n \/\/ TODO Re-enable this test once the renderer supports it.\n xit('should support reordering of children', () => {\n const Root = ({ children }) =>

{children}<\/div>;\n@@ -194,13 +233,13 @@ describe('Store (legacy)', () => {\n expect(store).toMatchSnapshot('1: mount');\n \n act(() => ReactDOM.render({[bar, foo]}<\/Root>, container));\n- expect(store).toMatchSnapshot('3: reorder children');\n+ expect(store).toMatchSnapshot('2: reorder children');\n \n act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(0), true));\n- expect(store).toMatchSnapshot('4: collapse root');\n+ expect(store).toMatchSnapshot('3: collapse root');\n \n act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(0), false));\n- expect(store).toMatchSnapshot('5: expand root');\n+ expect(store).toMatchSnapshot('4: expand root');\n });\n });\n \n@@ -422,19 +461,19 @@ describe('Store (legacy)', () => {\n expect(store).toMatchSnapshot('1: mount');\n \n act(() => ReactDOM.render({[bar, foo]}<\/Root>, container));\n- expect(store).toMatchSnapshot('3: reorder children');\n+ expect(store).toMatchSnapshot('2: reorder children');\n \n act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(0), false));\n- expect(store).toMatchSnapshot('4: expand root');\n+ expect(store).toMatchSnapshot('3: expand root');\n \n act(() => {\n store.toggleIsCollapsed(store.getElementIDAtIndex(2), false);\n store.toggleIsCollapsed(store.getElementIDAtIndex(1), false);\n });\n- expect(store).toMatchSnapshot('5: expand leaves');\n+ expect(store).toMatchSnapshot('4: expand leaves');\n \n act(() => store.toggleIsCollapsed(store.getElementIDAtIndex(0), true));\n- expect(store).toMatchSnapshot('6: collapse root');\n+ expect(store).toMatchSnapshot('5: collapse root');\n });\n });\n });\ndiff --git a\/src\/backend\/legacy\/getChildren.js b\/src\/backend\/legacy\/getChildren.js\nindex 1ed8b52e08..0ce3a39603 100644\n--- a\/src\/backend\/legacy\/getChildren.js\n+++ b\/src\/backend\/legacy\/getChildren.js\n@@ -1,22 +1,30 @@\n \/\/ @flow\n \n+import traverseAllChildrenImpl from '.\/traverseAllChildrenImpl';\n+\n+\/\/ TODO (legacy) Respect component filters\n+\n export default function getChildren(internalInstance: Object): Array {\n+ let children = [];\n+\n \/\/ If the parent is a native node without rendered children, but with\n \/\/ multiple string children, then the `element` that gets passed in here is\n \/\/ a plain value -- a string or number.\n- if (internalInstance._renderedComponent) {\n- return [internalInstance._renderedComponent];\n+ if (typeof internalInstance !== 'object') {\n+ \/\/ No children\n+ } else if (\n+ internalInstance._currentElement === null ||\n+ internalInstance._currentElement === false\n+ ) {\n+ \/\/ No children\n+ } else if (internalInstance._renderedComponent) {\n+ children = [internalInstance._renderedComponent];\n } else if (internalInstance._renderedChildren) {\n- return childrenToArray(internalInstance._renderedChildren);\n+ children = renderedChildrenToArray(internalInstance._renderedChildren);\n } else if (\n internalInstance._currentElement &&\n internalInstance._currentElement.props\n ) {\n- \/\/ DevTools doesn't need to display primative child types,\n- \/\/ So we can filter them out early.\n- \/*\n- const children = [];\n-\n \/\/ This is a native node without rendered children -- meaning the children\n \/\/ prop is the unfiltered list of children.\n \/\/ This may include 'null' or even other invalid values, so we need to\n@@ -34,30 +42,26 @@ export default function getChildren(internalInstance: Object): Array {\n children.push(child);\n }\n }\n- \/\/ traverseContext\n );\n-\n- return children;\n- *\/\n }\n \n- if (internalInstance._instance) {\n- var inst = internalInstance._instance;\n+ const instance = internalInstance._instance;\n+ if (instance) {\n \/\/ TODO: React ART currently falls in this bucket, but this doesn't\n \/\/ actually make sense and we should clean this up after stabilizing our\n \/\/ API for backends\n- if (inst._renderedChildren) {\n- return childrenToArray(inst._renderedChildren);\n+ if (instance._renderedChildren) {\n+ children = renderedChildrenToArray(instance._renderedChildren);\n }\n }\n \n- return [];\n+ return children;\n }\n \n-function childrenToArray(children) {\n- const array = [];\n- for (var name in children) {\n- array.push(children[name]);\n+function renderedChildrenToArray(renderedChildren): Array {\n+ const childrenArray = [];\n+ for (let name in renderedChildren) {\n+ childrenArray.push(renderedChildren[name]);\n }\n- return array;\n+ return childrenArray;\n }\n","files":[{"status":"M","path":"src\/__tests__\/legacy\/storeLegacy-v15-test.js"},{"status":"M","path":"src\/backend\/legacy\/getChildren.js"}],"body":""}

dillon1000/react

Files changed