{"patch":"diff --git a\/scripts\/fiber\/tests-passing.txt b\/scripts\/fiber\/tests-passing.txt\nindex cc1e1ff464..e78188ac61 100644\n--- a\/scripts\/fiber\/tests-passing.txt\n+++ b\/scripts\/fiber\/tests-passing.txt\n@@ -1568,6 +1568,7 @@ src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js\n * does not update one component twice in a batch (#6371)\n * unstable_batchedUpdates should return value from a callback\n * unmounts and remounts a root in the same batch\n+* handles reentrant mounting in synchronous mode\n \n src\/renderers\/shared\/shared\/__tests__\/refs-destruction-test.js\n * should remove refs when destroying the parent\ndiff --git a\/src\/renderers\/art\/ReactARTFiber.js b\/src\/renderers\/art\/ReactARTFiber.js\nindex 89bbc61fda..6244642a84 100644\n--- a\/src\/renderers\/art\/ReactARTFiber.js\n+++ b\/src\/renderers\/art\/ReactARTFiber.js\n@@ -328,9 +328,10 @@ class Surface extends Component {\n \n this._surface = Mode.Surface(+width, +height, this._tagRef);\n \n- this._mountNode = ARTRenderer.mountContainer(\n+ this._mountNode = ARTRenderer.createContainer(this._surface);\n+ ARTRenderer.updateContainer(\n this.props.children,\n- this._surface,\n+ this._mountNode,\n this,\n );\n }\ndiff --git a\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js b\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\nindex 9475f24ee2..3b6330db66 100644\n--- a\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\n+++ b\/src\/renderers\/dom\/fiber\/ReactDOMFiber.js\n@@ -289,16 +289,15 @@ function renderSubtreeIntoContainer(parentComponent : ?ReactComponent, rootID : string, callback : ?Function) {\n- if (!roots.has(rootID)) {\n+ let root = roots.get(rootID);\n+ if (!root) {\n const container = { rootID: rootID, children: [] };\n rootContainers.set(rootID, container);\n- const root = NoopRenderer.mountContainer(element, container, null, callback);\n+ root = NoopRenderer.createContainer(container);\n roots.set(rootID, root);\n- } else {\n- const root = roots.get(rootID);\n- if (root) {\n- NoopRenderer.updateContainer(element, root, null, callback);\n- }\n }\n+ NoopRenderer.updateContainer(element, root, null, callback);\n },\n \n unmountRootWithID(rootID : string) {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\nindex 72a6a1f8bc..0798ca3723 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n@@ -280,7 +280,8 @@ module.exports = function(\n root.pendingContext,\n root.pendingContext !== root.context\n );\n- } else {\n+ } else if (root.context) {\n+ \/\/ Should always be set\n pushTopLevelContextObject(\n workInProgress,\n root.context,\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex 2b63d3c5f9..35fe52d22f 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -75,7 +75,7 @@ export type HostConfig = {\n };\n \n export type Reconciler = {\n- mountContainer(element : ReactNodeList, containerInfo : C, parentComponent : ?ReactComponent) : OpaqueNode,\n+ createContainer(containerInfo : C) : OpaqueNode,\n updateContainer(element : ReactNodeList, container : OpaqueNode, parentComponent : ?ReactComponent) : void,\n performWithPriority(priorityLevel : PriorityLevel, fn : Function) : void,\n \/* eslint-disable no-undef *\/\n@@ -119,17 +119,10 @@ module.exports = function(config : HostConfig, callback: ?Function) : OpaqueNode {\n- const context = getContextForSubtree(parentComponent);\n- const root = createFiberRoot(containerInfo, context);\n+ createContainer(containerInfo : C) : OpaqueNode {\n+ const root = createFiberRoot(containerInfo);\n const current = root.current;\n \n- scheduleTopLevelUpdate(current, element, callback);\n-\n- if (__DEV__ && ReactFiberInstrumentation.debugTool) {\n- ReactFiberInstrumentation.debugTool.onMountContainer(root);\n- }\n-\n \/\/ It may seem strange that we don't return the root here, but that will\n \/\/ allow us to have containers that are in the middle of the tree instead\n \/\/ of being roots.\n@@ -141,19 +134,26 @@ module.exports = function(config : HostConfig {\n });\n expect(container.textContent).toBe('b');\n });\n+\n+ it('handles reentrant mounting in synchronous mode', () => {\n+ var mounts = 0;\n+ class Editor extends React.Component {\n+ render() {\n+ return

{this.props.text}<\/div>;\n+ }\n+ componentDidMount() {\n+ mounts++;\n+ \/\/ This should be called only once but we guard just in case.\n+ if (!this.props.rendered) {\n+ this.props.onChange({rendered: true});\n+ }\n+ }\n+ }\n+\n+ var container = document.createElement('div');\n+ function render() {\n+ ReactDOM.render(\n+ {\n+ props = {...props, ...newProps};\n+ render();\n+ }}\n+ {...props}\n+ \/>,\n+ container\n+ );\n+ }\n+\n+ var props = {text: 'hello', rendered: false};\n+ render();\n+ props = {...props, text: 'goodbye'};\n+ render();\n+ expect(container.textContent).toBe('goodbye');\n+ expect(mounts).toBe(1);\n+ });\n });\n","body":"","parents":["c978f789cc096afc7a7d86087a872d8e1d5ffcd3"],"files":[{"path":"scripts\/fiber\/tests-passing.txt","status":"M"},{"path":"src\/renderers\/art\/ReactARTFiber.js","status":"M"},{"path":"src\/renderers\/dom\/fiber\/ReactDOMFiber.js","status":"M"},{"path":"src\/renderers\/native\/ReactNativeFiber.js","status":"M"},{"path":"src\/renderers\/noop\/ReactNoop.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberReconciler.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberRoot.js","status":"M"},{"path":"src\/renderers\/shared\/shared\/__tests__\/ReactUpdates-test.js","status":"M"}],"commit":{"subject":"Fiber: Fix reentrant mounting in synchronous mode (#8623)","authorEmail":"ben@benalpert.com","shortRevision":"13980e6536","authorName":"Ben Alpert","authoredAt":"2016-12-22T11:34:35-08:00","revision":"13980e6536dbd36b13987e3ef60fac3baffb2df3"}}

dillon1000/react

Files changed