{"files":[{"path":"src\/backend\/renderer.js","status":"M"},{"path":"src\/devtools\/store.js","status":"M"},{"path":"src\/devtools\/views\/Profiler\/CommitTreeBuilder.js","status":"M"}],"body":"","parents":["346b628b43f24e08ee7c0f09492a292436f13324"],"commit":{"shortRevision":"8830ba890c","authorEmail":"dan.abramov@gmail.com","revision":"8830ba890cdfc27970f1183fec41f8c2025d5977","authoredAt":"2019-04-19T01:09:57+01:00","subject":"Fix more Suspense traversal bugs","authorName":"Dan Abramov"},"patch":"diff --git a\/src\/backend\/renderer.js b\/src\/backend\/renderer.js\nindex d59490ecc8..a15771a1fc 100644\n--- a\/src\/backend\/renderer.js\n+++ b\/src\/backend\/renderer.js\n@@ -574,13 +574,21 @@ export function attach(\n }\n \n let pendingOperations: Array = [];\n+ let pendingRealUnmountedIDs: Array = [];\n+ let pendingSimulatedUnmountedIDs: Array = [];\n let pendingOperationsQueue: Array | null = [];\n \n+ \/\/ We keep track of which Fibers have been reported as unmounted by React\n+ \/\/ during this commit phase so that we don't try to \"hide\" them or their\n+ \/\/ children when Suspense flips to fallback. These Fibers won't have IDs.\n+ let fibersUnmountedInThisCommitPhase: WeakSet = new WeakSet();\n+\n+ \/\/ TODO: we could make this layer DEV-only and write directly to pendingOperations.\n let nextOperation: Array = [];\n function beginNextOperation(size: number): void {\n nextOperation.length = size;\n }\n- function endNextOperation(addToStartOfQueue: boolean): void {\n+ function endNextOperation(): void {\n if (__DEV__) {\n for (let i = 0; i < nextOperation.length; i++) {\n if (!Number.isInteger(nextOperation[i])) {\n@@ -591,20 +599,16 @@ export function attach(\n }\n }\n }\n-\n- if (addToStartOfQueue) {\n- pendingOperations.splice.apply(\n- pendingOperations,\n- [0, 0].concat(nextOperation)\n- );\n- } else {\n- pendingOperations.push.apply(pendingOperations, nextOperation);\n- }\n+ pendingOperations.push.apply(pendingOperations, nextOperation);\n nextOperation.length = 0;\n }\n \n function flushPendingEvents(root: Object): void {\n- if (pendingOperations.length === 0) {\n+ if (\n+ pendingOperations.length === 0 &&\n+ pendingRealUnmountedIDs.length === 0 &&\n+ pendingSimulatedUnmountedIDs.length === 0\n+ ) {\n \/\/ If we're currently profiling, send an \"operations\" method even if there are no mutations to the tree.\n \/\/ The frontend needs this no-op info to know how to reconstruct the tree for each commit,\n \/\/ even if a particular commit didn't change the shape of the tree.\n@@ -613,18 +617,48 @@ export function attach(\n }\n }\n \n+ const ops = new Uint32Array(\n+ \/\/ Identify which renderer this update is coming from.\n+ 2 + \/\/ [rendererID, rootFiberID]\n+ \/\/ All unmounts are batched in a single message.\n+ 2 + \/\/ [TREE_OPERATION_REMOVE, removedIDLength]\n+ pendingRealUnmountedIDs.length +\n+ pendingSimulatedUnmountedIDs.length +\n+ \/\/ Regular operations\n+ pendingOperations.length\n+ );\n+\n \/\/ Identify which renderer this update is coming from.\n \/\/ This enables roots to be mapped to renderers,\n \/\/ Which in turn enables fiber props, states, and hooks to be inspected.\n- beginNextOperation(2);\n- nextOperation[0] = rendererID;\n- nextOperation[1] = getFiberID(getPrimaryFiber(root.current));\n- endNextOperation(true);\n+ let i = 0;\n+ ops[i++] = rendererID;\n+ ops[i++] = getFiberID(getPrimaryFiber(root.current));\n+\n+ \/\/ All unmounts except roots are batched in a single message.\n+ ops[i++] = TREE_OPERATION_REMOVE;\n+ \/\/ The first number is how many unmounted IDs we're gonna send.\n+ ops[i++] =\n+ pendingRealUnmountedIDs.length + pendingSimulatedUnmountedIDs.length;\n+ \/\/ Fill in the real unmounts in the reverse order.\n+ \/\/ They were inserted parents-first by React, but we want children-first.\n+ \/\/ So we traverse our array backwards.\n+ for (let j = pendingRealUnmountedIDs.length - 1; j >= 0; j--) {\n+ ops[i++] = pendingRealUnmountedIDs[j];\n+ }\n+ \/\/ Fill in the simulated unmounts (hidden Suspense subtrees) in their order.\n+ \/\/ (We want children to go before parents.)\n+ \/\/ They go *after* the real unmounts because we know for sure they won't be\n+ \/\/ children of already pushed \"real\" IDs. If they were, we wouldn't be able\n+ \/\/ to discover them during the traversal, as they would have been deleted.\n+ ops.set(pendingSimulatedUnmountedIDs, i);\n+ i += pendingSimulatedUnmountedIDs.length;\n+ \/\/ Fill in the rest of the operations.\n+ ops.set(pendingOperations, i);\n \n \/\/ Let the frontend know about tree operations.\n \/\/ The first value in this array will identify which root it corresponds to,\n \/\/ so we do no longer need to dispatch a separate root-committed event.\n- const ops = Uint32Array.from(pendingOperations);\n if (pendingOperationsQueue !== null) {\n \/\/ Until the frontend has been connected, store the tree operations.\n \/\/ This will let us avoid walking the tree later when the frontend connects,\n@@ -635,7 +669,10 @@ export function attach(\n hook.emit('operations', ops);\n }\n \n- pendingOperations = [];\n+ pendingOperations.length = 0;\n+ pendingRealUnmountedIDs.length = 0;\n+ pendingSimulatedUnmountedIDs.length = 0;\n+ fibersUnmountedInThisCommitPhase = new WeakSet();\n }\n \n function recordMount(fiber: Fiber, parentFiber: Fiber | null) {\n@@ -657,7 +694,7 @@ export function attach(\n nextOperation[2] = ElementTypeRoot;\n nextOperation[3] = isProfilingSupported ? 1 : 0;\n nextOperation[4] = hasOwnerMetadata ? 1 : 0;\n- endNextOperation(false);\n+ endNextOperation();\n } else {\n const { displayName, key, type } = getDataForFiber(fiber);\n const { _debugOwner } = fiber;\n@@ -702,7 +739,7 @@ export function attach(\n nextOperation[6 + encodedDisplayNameSize + 1 + i] = encodedKey[i];\n }\n }\n- endNextOperation(false);\n+ endNextOperation();\n }\n \n if (isProfiling) {\n@@ -714,7 +751,7 @@ export function attach(\n nextOperation[0] = TREE_OPERATION_UPDATE_TREE_BASE_DURATION;\n nextOperation[1] = id;\n nextOperation[2] = treeBaseDuration;\n- endNextOperation(false);\n+ endNextOperation();\n \n const { actualDuration } = fiber;\n if (actualDuration > 0) {\n@@ -729,7 +766,7 @@ export function attach(\n }\n }\n \n- function recordUnmount(fiber: Fiber) {\n+ function recordUnmount(fiber: Fiber, isSimulated: boolean) {\n const isRoot = fiber.tag === HostRoot;\n const primaryFiber = getPrimaryFiber(fiber);\n if (!fiberToIDMap.has(primaryFiber)) {\n@@ -744,19 +781,22 @@ export function attach(\n }\n const id = getFiberID(primaryFiber);\n if (isRoot) {\n- beginNextOperation(2);\n+ \/\/ Removing a root needs to happen at the end\n+ \/\/ so we don't batch it with other unmounts.\n+ beginNextOperation(3);\n nextOperation[0] = TREE_OPERATION_REMOVE;\n- nextOperation[1] = id;\n- endNextOperation(false);\n+ nextOperation[1] = 1; \/\/ Remove one item\n+ nextOperation[2] = id;\n+ endNextOperation();\n } else if (!shouldFilterFiber(fiber)) {\n- beginNextOperation(2);\n- nextOperation[0] = TREE_OPERATION_REMOVE;\n- nextOperation[1] = id;\n- \/\/ Non-root fibers are deleted during the commit phase.\n- \/\/ They are deleted in the parent-first order. However\n- \/\/ DevTools currently expects deletions to be child-first.\n- \/\/ This is why we prepend the delete operation to the queue.\n- endNextOperation(true);\n+ \/\/ To maintain child-first ordering,\n+ \/\/ we'll push it into one of these queues,\n+ \/\/ and later arrange them in the correct order.\n+ if (isSimulated) {\n+ pendingSimulatedUnmountedIDs.push(id);\n+ } else {\n+ pendingRealUnmountedIDs.push(id);\n+ }\n }\n fiberToIDMap.delete(primaryFiber);\n idToFiberMap.delete(id);\n@@ -816,14 +856,35 @@ export function attach(\n }\n }\n \n+ \/\/ We use this to simulate unmounting for Suspense trees\n+ \/\/ when we switch from primary to fallback.\n function unmountFiberChildrenRecursively(fiber: Fiber) {\n if (__DEBUG__) {\n debug('unmountFiberChildrenRecursively()', fiber);\n }\n+\n+ \/\/ We might meet a nested Suspense on our way.\n+ const isTimedOutSuspense =\n+ fiber.tag === ReactTypeOfWork.SuspenseComponent &&\n+ fiber.memoizedState !== null;\n+\n let child = fiber.child;\n+ if (isTimedOutSuspense) {\n+ \/\/ If it's showing fallback tree, let's traverse it instead.\n+ const primaryChildFragment = fiber.child;\n+ const fallbackChildFragment = primaryChildFragment.sibling;\n+ \/\/ Skip over to the real Fiber child.\n+ child = fallbackChildFragment.child;\n+ }\n+\n while (child !== null) {\n- recordUnmount(child);\n- unmountFiberChildrenRecursively(child);\n+ \/\/ Record simulated unmounts children-first.\n+ \/\/ We might find real committed unmounts along the way--skip them.\n+ \/\/ Otherwise we would send duplicated messages for the same IDs.\n+ if (!fibersUnmountedInThisCommitPhase.has(child)) {\n+ unmountFiberChildrenRecursively(child);\n+ recordUnmount(child, true);\n+ }\n child = child.sibling;\n }\n }\n@@ -844,7 +905,7 @@ export function attach(\n nextOperation[0] = TREE_OPERATION_UPDATE_TREE_BASE_DURATION;\n nextOperation[1] = getFiberID(getPrimaryFiber(fiber));\n nextOperation[2] = treeBaseDuration;\n- endNextOperation(false);\n+ endNextOperation();\n }\n \n if (haveProfilerTimesChanged(fiber.alternate, fiber)) {\n@@ -883,7 +944,7 @@ export function attach(\n for (let i = 0; i < nextChildren.length; i++) {\n nextOperation[3 + i] = nextChildren[i];\n }\n- endNextOperation(false);\n+ endNextOperation();\n }\n \n function findReorderedChildrenRecursively(\n@@ -1091,10 +1152,13 @@ export function attach(\n }\n \n function handleCommitFiberUnmount(fiber) {\n+ \/\/ Remeber this is a real deletion so we don't\n+ \/\/ go down this tree when hiding Suspense nodes.\n+ fibersUnmountedInThisCommitPhase.add(fiber);\n \/\/ This is not recursive.\n \/\/ We can't traverse fibers after unmounting so instead\n \/\/ we rely on React telling us about each unmount.\n- recordUnmount(fiber);\n+ recordUnmount(fiber, false);\n }\n \n function handleCommitFiberRoot(root) {\n@@ -1134,7 +1198,7 @@ export function attach(\n updateFiberRecursively(current, alternate, null);\n } else if (wasMounted && !isMounted) {\n \/\/ Unmount an existing root.\n- recordUnmount(current);\n+ recordUnmount(current, false);\n }\n } else {\n \/\/ Mount a new root.\ndiff --git a\/src\/devtools\/store.js b\/src\/devtools\/store.js\nindex 1010f5c56e..814f6799de 100644\n--- a\/src\/devtools\/store.js\n+++ b\/src\/devtools\/store.js\n@@ -543,6 +543,33 @@ export default class Store extends EventEmitter {\n }\n };\n \n+ _adjustParentTreeWeight = (\n+ parentElement: Element | null,\n+ weightDelta: number\n+ ) => {\n+ let isInsideCollapsedSubTree = false;\n+\n+ while (parentElement != null) {\n+ parentElement.weight += weightDelta;\n+\n+ \/\/ Additions and deletions within a collapsed subtree should not bubble beyond the collapsed parent.\n+ \/\/ Their weight will bubble up when the parent is expanded.\n+ if (parentElement.isCollapsed) {\n+ isInsideCollapsedSubTree = true;\n+ break;\n+ }\n+\n+ parentElement = ((this._idToElement.get(\n+ parentElement.parentID\n+ ): any): Element);\n+ }\n+\n+ \/\/ Additions and deletions within a collapsed subtree should not affect the overall number of elements.\n+ if (!isInsideCollapsedSubTree) {\n+ this._weightAcrossRoots += weightDelta;\n+ }\n+ };\n+\n onBridgeOperations = (operations: Uint32Array) => {\n if (!(operations instanceof Uint32Array)) {\n \/\/ $FlowFixMe TODO HACK Temporary workaround for the fact that Chrome is not transferring the typed array.\n@@ -579,20 +606,11 @@ export default class Store extends EventEmitter {\n \n let i = 2;\n while (i < operations.length) {\n- let id: number = ((null: any): number);\n- let element: Element = ((null: any): Element);\n- let ownerID: number = 0;\n- let parentID: number = ((null: any): number);\n- let parentElement: Element = ((null: any): Element);\n- let type: ElementType = ((null: any): ElementType);\n- let weightDelta: number = 0;\n-\n const operation = operations[i];\n-\n switch (operation) {\n- case TREE_OPERATION_ADD:\n- id = ((operations[i + 1]: any): number);\n- type = ((operations[i + 2]: any): ElementType);\n+ case TREE_OPERATION_ADD: {\n+ const id = ((operations[i + 1]: any): number);\n+ const type = ((operations[i + 2]: any): ElementType);\n \n i = i + 3;\n \n@@ -602,6 +620,8 @@ export default class Store extends EventEmitter {\n );\n }\n \n+ let ownerID: number = 0;\n+ let parentID: number = ((null: any): number);\n if (type === ElementTypeRoot) {\n if (__DEBUG__) {\n debug('Add', `new root node ${id}`);\n@@ -672,7 +692,9 @@ export default class Store extends EventEmitter {\n );\n }\n \n- parentElement = ((this._idToElement.get(parentID): any): Element);\n+ const parentElement = ((this._idToElement.get(\n+ parentID\n+ ): any): Element);\n parentElement.children = parentElement.children.concat(id);\n \n const element: Element = {\n@@ -690,74 +712,83 @@ export default class Store extends EventEmitter {\n \n this._idToElement.set(id, element);\n \n+ \/\/ TODO: don't recreate this on every iteration.\n const oldAddedElementIDs = addedElementIDs;\n addedElementIDs = new Uint32Array(addedElementIDs.length + 1);\n addedElementIDs.set(oldAddedElementIDs);\n addedElementIDs[oldAddedElementIDs.length] = id;\n \n- weightDelta = 1;\n+ this._adjustParentTreeWeight(parentElement, 1);\n }\n break;\n+ }\n case TREE_OPERATION_REMOVE: {\n- id = ((operations[i + 1]: any): number);\n-\n- if (!this._idToElement.has(id)) {\n- throw Error(\n- `Cannot remove node ${id} because no matching node was found in the Store.`\n- );\n- }\n-\n+ const removeLength = ((operations[i + 1]: any): number);\n i = i + 2;\n \n- element = ((this._idToElement.get(id): any): Element);\n- parentID = element.parentID;\n- weightDelta = -element.weight;\n-\n- if (element.children.length > 0) {\n- throw new Error(\n- 'Fiber ' +\n- id +\n- ' was removed before its children. ' +\n- 'This is a bug in React DevTools.'\n- );\n- }\n-\n- this._idToElement.delete(id);\n+ for (let removeIndex = 0; removeIndex < removeLength; removeIndex++) {\n+ const id = ((operations[i]: any): number);\n \n- if (parentID === 0) {\n- if (__DEBUG__) {\n- debug('Remove', `node ${id} root`);\n+ if (!this._idToElement.has(id)) {\n+ throw Error(\n+ `Cannot remove node ${id} because no matching node was found in the Store.`\n+ );\n }\n \n- this._roots = this._roots.filter(rootID => rootID !== id);\n- this._rootIDToRendererID.delete(id);\n- this._rootIDToCapabilities.delete(id);\n+ i = i + 1;\n \n- haveRootsChanged = true;\n- } else {\n- if (__DEBUG__) {\n- debug('Remove', `node ${id} from parent ${parentID}`);\n+ const element = ((this._idToElement.get(id): any): Element);\n+ if (element.children.length > 0) {\n+ throw new Error(\n+ 'Fiber ' +\n+ id +\n+ ' was removed before its children. ' +\n+ 'This is a bug in React DevTools.'\n+ );\n }\n- parentElement = ((this._idToElement.get(parentID): any): Element);\n- if (parentElement === undefined) {\n- throw Error(\n- `Cannot remove node ${id} from parent ${parentID} because no matching node was found in the Store.`\n+\n+ this._idToElement.delete(id);\n+\n+ const parentID = element.parentID;\n+ let parentElement = null;\n+ if (parentID === 0) {\n+ if (__DEBUG__) {\n+ debug('Remove', `fiber ${id} root`);\n+ }\n+\n+ this._roots = this._roots.filter(rootID => rootID !== id);\n+ this._rootIDToRendererID.delete(id);\n+ this._rootIDToCapabilities.delete(id);\n+\n+ haveRootsChanged = true;\n+ } else {\n+ if (__DEBUG__) {\n+ debug('Remove', `fiber ${id} from parent ${parentID}`);\n+ }\n+ parentElement = ((this._idToElement.get(parentID): any): Element);\n+ if (parentElement === undefined) {\n+ throw Error(\n+ `Cannot remove node ${id} from parent ${parentID} because no matching node was found in the Store.`\n+ );\n+ }\n+ parentElement.children = parentElement.children.filter(\n+ childID => childID !== id\n );\n }\n- parentElement.children = parentElement.children.filter(\n- childID => childID !== id\n- );\n- }\n \n- \/\/ Track removed items so search results can be updated\n- const oldRemovedElementIDs = removedElementIDs;\n- removedElementIDs = new Uint32Array(removedElementIDs.length + 1);\n- removedElementIDs.set(oldRemovedElementIDs);\n- removedElementIDs[oldRemovedElementIDs.length] = id;\n+ this._adjustParentTreeWeight(parentElement, -element.weight);\n+\n+ \/\/ Track removed items so search results can be updated\n+ \/\/ TODO: no need to recreate this in a loop.\n+ const oldRemovedElementIDs = removedElementIDs;\n+ removedElementIDs = new Uint32Array(removedElementIDs.length + 1);\n+ removedElementIDs.set(oldRemovedElementIDs);\n+ removedElementIDs[oldRemovedElementIDs.length] = id;\n+ }\n break;\n }\n- case TREE_OPERATION_RESET_CHILDREN:\n- id = ((operations[i + 1]: any): number);\n+ case TREE_OPERATION_RESET_CHILDREN: {\n+ const id = ((operations[i + 1]: any): number);\n const numChildren = ((operations[i + 2]: any): number);\n const children = ((operations.slice(\n i + 3,\n@@ -776,7 +807,7 @@ export default class Store extends EventEmitter {\n );\n }\n \n- element = ((this._idToElement.get(id): any): Element);\n+ const element = ((this._idToElement.get(id): any): Element);\n const prevChildren = element.children;\n element.children = Array.from(children);\n if (element.children.length !== prevChildren.length) {\n@@ -799,10 +830,13 @@ export default class Store extends EventEmitter {\n });\n \n element.weight = nextWeight;\n-\n- weightDelta = nextWeight - prevWeight;\n+ \/\/ TODO: passing null here is suspicious, but it's existing behavior.\n+ \/\/ It is suspicious because either we shouldn't need a delta at all--\n+ \/\/ or we should apply it to all parents, and not just this item.\n+ this._adjustParentTreeWeight(null, nextWeight - prevWeight);\n }\n break;\n+ }\n case TREE_OPERATION_UPDATE_TREE_BASE_DURATION:\n \/\/ Base duration updates are only sent while profiling is in progress.\n \/\/ We can ignore them at this point.\n@@ -812,28 +846,6 @@ export default class Store extends EventEmitter {\n default:\n throw Error(`Unsupported Bridge operation ${operation}`);\n }\n-\n- let isInsideCollapsedSubTree = false;\n-\n- while (parentElement != null) {\n- parentElement.weight += weightDelta;\n-\n- \/\/ Additions and deletions within a collapsed subtree should not bubble beyond the collapsed parent.\n- \/\/ Their weight will bubble up when the parent is expanded.\n- if (parentElement.isCollapsed) {\n- isInsideCollapsedSubTree = true;\n- break;\n- }\n-\n- parentElement = ((this._idToElement.get(\n- parentElement.parentID\n- ): any): Element);\n- }\n-\n- \/\/ Additions and deletions within a collapsed subtree should not affect the overall number of elements.\n- if (!isInsideCollapsedSubTree) {\n- this._weightAcrossRoots += weightDelta;\n- }\n }\n \n this._revision++;\ndiff --git a\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js b\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js\nindex b077f51e3b..0737dd8d6a 100644\n--- a\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js\n+++ b\/src\/devtools\/views\/Profiler\/CommitTreeBuilder.js\n@@ -168,18 +168,12 @@ function updateTree(\n \n let i = 2;\n while (i < operations.length) {\n- let id: number = ((null: any): number);\n- let node: Node = ((null: any): Node);\n- let parentID: number = ((null: any): number);\n- let parentNode: Node = ((null: any): Node);\n- let type: ElementType = ((null: any): ElementType);\n-\n const operation = operations[i];\n \n switch (operation) {\n case TREE_OPERATION_ADD:\n- id = ((operations[i + 1]: any): number);\n- type = ((operations[i + 2]: any): ElementType);\n+ const id = ((operations[i + 1]: any): number);\n+ const type = ((operations[i + 2]: any): ElementType);\n \n i = i + 3;\n \n@@ -210,7 +204,7 @@ function updateTree(\n \n nodes.set(id, node);\n } else {\n- parentID = ((operations[i]: any): number);\n+ const parentID = ((operations[i]: any): number);\n i++;\n \n i++; \/\/ ownerID\n@@ -240,7 +234,7 @@ function updateTree(\n );\n }\n \n- parentNode = getClonedNode(parentID);\n+ const parentNode = getClonedNode(parentID);\n parentNode.children = parentNode.children.concat(id);\n \n const node: Node = {\n@@ -254,40 +248,46 @@ function updateTree(\n \n nodes.set(id, node);\n }\n- break;\n- case TREE_OPERATION_REMOVE:\n- id = ((operations[i + 1]: any): number);\n \n+ break;\n+ case TREE_OPERATION_REMOVE: {\n+ const removeLength = ((operations[i + 1]: any): number);\n i = i + 2;\n \n- if (!nodes.has(id)) {\n- throw new Error(\n- 'Commit tree does not contain fiber ' +\n- id +\n- '. This is a bug in React DevTools.'\n- );\n- }\n+ for (let removeIndex = 0; removeIndex < removeLength; removeIndex++) {\n+ const id = ((operations[i]: any): number);\n+ i = i + 1;\n+\n+ if (!nodes.has(id)) {\n+ throw new Error(\n+ 'Commit tree does not contain fiber ' +\n+ id +\n+ '. This is a bug in React DevTools.'\n+ );\n+ }\n \n- node = getClonedNode(id);\n- parentID = node.parentID;\n+ const node = getClonedNode(id);\n+ const parentID = node.parentID;\n \n- nodes.delete(id);\n+ nodes.delete(id);\n \n- parentNode = getClonedNode(parentID);\n- if (parentNode == null) {\n- \/\/ No-op\n- } else {\n- if (__DEBUG__) {\n- debug('Remove', `fiber ${id} from parent ${parentID}`);\n- }\n+ const parentNode = getClonedNode(parentID);\n+ if (parentNode == null) {\n+ \/\/ No-op\n+ } else {\n+ if (__DEBUG__) {\n+ debug('Remove', `fiber ${id} from parent ${parentID}`);\n+ }\n \n- parentNode.children = parentNode.children.filter(\n- childID => childID !== id\n- );\n+ parentNode.children = parentNode.children.filter(\n+ childID => childID !== id\n+ );\n+ }\n }\n break;\n- case TREE_OPERATION_RESET_CHILDREN:\n- id = ((operations[i + 1]: any): number);\n+ }\n+ case TREE_OPERATION_RESET_CHILDREN: {\n+ const id = ((operations[i + 1]: any): number);\n const numChildren = ((operations[i + 2]: any): number);\n const children = ((operations.slice(\n i + 3,\n@@ -300,14 +300,15 @@ function updateTree(\n debug('Re-order', `fiber ${id} children ${children.join(',')}`);\n }\n \n- node = getClonedNode(id);\n+ const node = getClonedNode(id);\n node.children = Array.from(children);\n \n break;\n- case TREE_OPERATION_UPDATE_TREE_BASE_DURATION:\n- id = operations[i + 1];\n+ }\n+ case TREE_OPERATION_UPDATE_TREE_BASE_DURATION: {\n+ const id = operations[i + 1];\n \n- node = getClonedNode(id);\n+ const node = getClonedNode(id);\n node.treeBaseDuration = operations[i + 2] \/ 1000; \/\/ Convert microseconds back to milliseconds;\n \n if (__DEBUG__) {\n@@ -319,6 +320,7 @@ function updateTree(\n \n i = i + 3;\n break;\n+ }\n default:\n throw Error(`Unsupported Bridge operation ${operation}`);\n }\n"}

dillon1000/react

Files changed