{"files":[{"path":"src\/renderers\/shared\/fiber\/ReactFiber.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js","status":"M"}],"patch":"diff --git a\/src\/renderers\/shared\/fiber\/ReactFiber.js b\/src\/renderers\/shared\/fiber\/ReactFiber.js\nindex 6cecc90b7c..9703905cb6 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiber.js\n@@ -89,7 +89,6 @@ export type Fiber = Instance & {\n firstEffect: ?Fiber,\n lastEffect: ?Fiber,\n \n-\n \/\/ This will be used to quickly determine if a subtree has no pending changes.\n pendingWorkPriority: PriorityLevel,\n \n@@ -98,10 +97,6 @@ export type Fiber = Instance & {\n \/\/ memory if we need to.\n alternate: ?Fiber,\n \n- \/\/ Keeps track of the children that are currently being processed but have not\n- \/\/ yet completed.\n- childInProgress: ?Fiber,\n-\n \/\/ Conceptual aliases\n \/\/ workInProgress : Fiber -> alternate The alternate used for reuse happens\n \/\/ to be the same as work in progress.\n@@ -140,8 +135,6 @@ var createFiber = function(tag : TypeOfWork, key : null | string) : Fiber {\n \n pendingWorkPriority: NoWork,\n \n- childInProgress: null,\n-\n alternate: null,\n \n };\n@@ -162,7 +155,6 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi\n if (alt) {\n alt.stateNode = fiber.stateNode;\n alt.child = fiber.child;\n- alt.childInProgress = fiber.childInProgress;\n alt.sibling = fiber.sibling;\n alt.ref = fiber.ref;\n alt.pendingProps = fiber.pendingProps;\n@@ -185,7 +177,6 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi\n alt.type = fiber.type;\n alt.stateNode = fiber.stateNode;\n alt.child = fiber.child;\n- alt.childInProgress = fiber.childInProgress;\n alt.sibling = fiber.sibling;\n alt.ref = fiber.ref;\n \/\/ pendingProps is here for symmetry but is unnecessary in practice for now.\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\nindex 7d48b0bc8a..9b2ec521fc 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n@@ -40,34 +40,28 @@ var {\n module.exports = function(config : HostConfig) {\n \n function reconcileChildren(current, workInProgress, nextChildren) {\n- \/\/ TODO: Children needs to be able to reconcile in place if we are\n- \/\/ overriding progressed work.\n- const priority = workInProgress.pendingWorkPriority;\n- reconcileChildrenAtPriority(current, workInProgress, nextChildren, priority);\n- }\n-\n- function reconcileChildrenAtPriority(current, workInProgress, nextChildren, priorityLevel) {\n- if (current && current.childInProgress) {\n- workInProgress.childInProgress = reconcileChildFibersInPlace(\n- workInProgress,\n- current.childInProgress,\n- nextChildren,\n- priorityLevel\n- );\n- \/\/ This is now invalid because we reused nodes.\n- current.childInProgress = null;\n- } else if (workInProgress.childInProgress) {\n- workInProgress.childInProgress = reconcileChildFibersInPlace(\n+ const priorityLevel = workInProgress.pendingWorkPriority;\n+ \/\/ At this point any memoization is no longer valid since we'll have changed\n+ \/\/ the children.\n+ workInProgress.memoizedProps = null;\n+ if (current && current.child === workInProgress.child) {\n+ \/\/ If the current child is the same as the work in progress, it means that\n+ \/\/ we haven't yet started any work on these children. Therefore, we use\n+ \/\/ the clone algorithm to create a copy of all the current children.\n+ workInProgress.child = reconcileChildFibers(\n workInProgress,\n- workInProgress.childInProgress,\n+ workInProgress.child,\n nextChildren,\n priorityLevel\n );\n } else {\n- \/\/ TODO:\n- workInProgress.childInProgress = reconcileChildFibers(\n+ \/\/ If, on the other hand, we don't have a current fiber or if it is\n+ \/\/ already using a clone, that means we've already begun some work on this\n+ \/\/ tree and we can continue where we left off by reconciling against the\n+ \/\/ existing children.\n+ workInProgress.child = reconcileChildFibersInPlace(\n workInProgress,\n- current ? current.child : workInProgress.child,\n+ workInProgress.child,\n nextChildren,\n priorityLevel\n );\n@@ -80,7 +74,7 @@ module.exports = function(config : HostConfig) {\n \n var nextChildren = fn(props);\n reconcileChildren(current, workInProgress, nextChildren);\n- return workInProgress.childInProgress;\n+ return workInProgress.child;\n }\n \n function updateClassComponent(current : ?Fiber, workInProgress : Fiber) {\n@@ -97,13 +91,13 @@ module.exports = function(config : HostConfig) {\n return bailoutOnCurrent(current, workInProgress);\n }\n }\n- if (!workInProgress.childInProgress && workInProgress.memoizedProps) {\n+ if (workInProgress.memoizedProps) {\n \/\/ Reset the props, in case this is a ping-pong case rather than a\n \/\/ completed update case. For the completed update case, the instance\n \/\/ props will already be the memoizedProps.\n instance.props = workInProgress.memoizedProps;\n if (!instance.shouldComponentUpdate(props)) {\n- return bailoutOnAlreadyFinishedWork(current, workInProgress);\n+ \/\/ return bailoutOnAlreadyFinishedWork(current, workInProgress);\n }\n }\n }\n@@ -112,44 +106,20 @@ module.exports = function(config : HostConfig) {\n var nextChildren = instance.render();\n reconcileChildren(current, workInProgress, nextChildren);\n \n- return workInProgress.childInProgress;\n+ return workInProgress.child;\n }\n \n function updateHostComponent(current, workInProgress) {\n- var nextChildren = workInProgress.pendingProps.children;\n-\n- let priority = workInProgress.pendingWorkPriority;\n- if (workInProgress.pendingProps.hidden && priority !== OffscreenPriority) {\n- \/\/ If this host component is hidden, we can reconcile its children at\n- \/\/ the lowest priority and bail out from this particular pass. Unless, we're\n- \/\/ currently reconciling the lowest priority.\n- \/\/ If we have a child in progress already, we reconcile against that set\n- \/\/ to retain any work within it. We'll recreate any component that was in\n- \/\/ the current set and next set but not in the previous in progress set.\n- \/\/ TODO: This attaches a node that hasn't completed rendering so it\n- \/\/ becomes part of the render tree, even though it never completed. Its\n- \/\/ `output` property is unpredictable because of it.\n- reconcileChildrenAtPriority(current, workInProgress, nextChildren, OffscreenPriority);\n- workInProgress.child = current ? current.child : null;\n- let child = workInProgress.childInProgress;\n- while (child) {\n- const currentChild = child.alternate;\n- if (currentChild) {\n- child.child = currentChild.child;\n- child.childInProgress = currentChild.childInProgress;\n- child.memoizedProps = currentChild.memoizedProps;\n- child.output = currentChild.output;\n- }\n- child.nextEffect = null;\n- child.firstEffect = null;\n- child.lastEffect = null;\n-\n- child = child.sibling;\n- }\n- return null;\n+ if (workInProgress.pendingProps.hidden &&\n+ workInProgress.pendingWorkPriority !== OffscreenPriority) {\n+ \/\/ If this host component is hidden, we can bail out and ignore this.\n+ \/\/ We'll rerender it later at the lower priority.\n+ workInProgress.pendingWorkPriority = OffscreenPriority;\n+ return bailoutOnLowPriority(current, workInProgress);\n } else {\n+ var nextChildren = workInProgress.pendingProps.children;\n reconcileChildren(current, workInProgress, nextChildren);\n- return workInProgress.childInProgress;\n+ return workInProgress.child;\n }\n }\n \n@@ -172,7 +142,7 @@ module.exports = function(config : HostConfig) {\n }\n }\n reconcileChildren(current, workInProgress, value);\n- return workInProgress.childInProgress;\n+ return workInProgress.child;\n }\n \n function updateCoroutineComponent(current, workInProgress) {\n@@ -240,7 +210,6 @@ module.exports = function(config : HostConfig) {\n workInProgress.firstEffect = null;\n workInProgress.lastEffect = null;\n \n- workInProgress.childInProgress = null; \/\/ current.childInProgress;\n workInProgress.child = current.child;\n \n cloneChildFibers(workInProgress);\n@@ -263,9 +232,6 @@ module.exports = function(config : HostConfig) {\n workInProgress.lastEffect = null;\n \n const child = workInProgress.child;\n- if (workInProgress.childInProgress) {\n- throw new Error('Child in progress means we cannot bail here.');\n- }\n if (child) {\n \/\/ Ensure that the effects of reused work are preserved.\n reuseChildrenEffects(workInProgress, child);\n@@ -280,6 +246,15 @@ module.exports = function(config : HostConfig) {\n return null;\n }\n \n+ function bailoutOnLowPriority(current, workInProgress) {\n+ if (current) {\n+ workInProgress.child = current.child;\n+ workInProgress.memoizedProps = current.memoizedProps;\n+ workInProgress.output = current.output;\n+ }\n+ return null;\n+ }\n+\n function beginWork(current : ?Fiber, workInProgress : Fiber, priorityLevel) : ?Fiber {\n if (!workInProgress.pendingProps) {\n throw new Error('should have pending props here');\n@@ -287,15 +262,7 @@ module.exports = function(config : HostConfig) {\n \n if (workInProgress.pendingWorkPriority === NoWork ||\n workInProgress.pendingWorkPriority > priorityLevel) {\n-\n- if (current) {\n- workInProgress.child = current.child;\n- workInProgress.childInProgress = current.childInProgress;\n- workInProgress.memoizedProps = current.memoizedProps;\n- workInProgress.output = current.output;\n- }\n-\n- return null;\n+ return bailoutOnLowPriority(current, workInProgress);\n }\n \n \/\/ The current, flushed, state of this fiber is the alternate.\n@@ -306,7 +273,7 @@ module.exports = function(config : HostConfig) {\n return bailoutOnCurrent(current, workInProgress);\n }\n \n- if (!workInProgress.childInProgress &&\n+ if (workInProgress.memoizedProps &&\n workInProgress.pendingProps === workInProgress.memoizedProps) {\n return bailoutOnAlreadyFinishedWork(current, workInProgress);\n }\n@@ -322,10 +289,10 @@ module.exports = function(config : HostConfig) {\n reconcileChildren(current, workInProgress, workInProgress.pendingProps);\n \/\/ A yield component is just a placeholder, we can just run through the\n \/\/ next one immediately.\n- if (workInProgress.childInProgress) {\n+ if (workInProgress.child) {\n return beginWork(\n- workInProgress.childInProgress.alternate,\n- workInProgress.childInProgress\n+ workInProgress.child.alternate,\n+ workInProgress.child\n );\n }\n return null;\n@@ -342,13 +309,13 @@ module.exports = function(config : HostConfig) {\n updateCoroutineComponent(current, workInProgress);\n \/\/ This doesn't take arbitrary time so we could synchronously just begin\n \/\/ eagerly do the work of workInProgress.child as an optimization.\n- if (workInProgress.childInProgress) {\n+ if (workInProgress.child) {\n return beginWork(\n- workInProgress.childInProgress.alternate,\n- workInProgress.childInProgress\n+ workInProgress.child.alternate,\n+ workInProgress.child\n );\n }\n- return workInProgress.childInProgress;\n+ return workInProgress.child;\n case YieldComponent:\n \/\/ A yield component is just a placeholder, we can just run through the\n \/\/ next one immediately.\n","body":"I will try a slightly different but similar strategy.","commit":{"revision":"49f0c952b5f796500fb25188e89be4099b0b740e","shortRevision":"49f0c952b5","authoredAt":"2016-09-01T20:50:47-07:00","authorEmail":"sema@fb.com","subject":"Drop childInProgress","authorName":"Sebastian Markbage"},"parents":["b63cda6e852b55d0f4b7d0419da2068c8540bf34"]}

dillon1000/react

Files changed