{"files":[{"path":"src\/renderers\/dom\/shared\/ReactEventListener.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactChildFiber.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiber.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberContext.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberRoot.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberScheduler.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js","status":"M"},{"path":"src\/renderers\/shared\/fiber\/ReactTypeOfWork.js","status":"M"},{"path":"src\/renderers\/shared\/shared\/ReactTreeTraversal.js","status":"M"}],"parents":["7cd26024ceffafc61a744325ef71b583db2ac1cd"],"commit":{"shortRevision":"df9dc89333","subject":"Rename HostContainer => HostRoot, Portal => HostPortal (#8474)","authorName":"Dan Abramov","authoredAt":"2016-12-01T18:36:28+00:00","authorEmail":"dan.abramov@gmail.com","revision":"df9dc8933387c5f1e6126ce38e95771c890f8e4f"},"patch":"diff --git a\/src\/renderers\/dom\/shared\/ReactEventListener.js b\/src\/renderers\/dom\/shared\/ReactEventListener.js\nindex 2856f7de3b..9c33a3714e 100644\n--- a\/src\/renderers\/dom\/shared\/ReactEventListener.js\n+++ b\/src\/renderers\/dom\/shared\/ReactEventListener.js\n@@ -21,7 +21,7 @@ var ReactTypeOfWork = require('ReactTypeOfWork');\n var getEventTarget = require('getEventTarget');\n var getUnboundedScrollPosition = require('getUnboundedScrollPosition');\n \n-var { HostContainer } = ReactTypeOfWork;\n+var { HostRoot } = ReactTypeOfWork;\n \n \/**\n * Find the deepest React component completely containing the root of the\n@@ -36,7 +36,7 @@ function findRootContainerNode(inst) {\n while (inst.return) {\n inst = inst.return;\n }\n- if (inst.tag !== HostContainer) {\n+ if (inst.tag !== HostRoot) {\n \/\/ This can happen if we're in a detached tree.\n return null;\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\nindex 0dc661d627..413fd234f6 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n@@ -56,10 +56,10 @@ const isArray = Array.isArray;\n const {\n ClassComponent,\n HostText,\n+ HostPortal,\n CoroutineComponent,\n YieldComponent,\n Fragment,\n- Portal,\n } = ReactTypeOfWork;\n \n const {\n@@ -330,7 +330,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {\n ) : Fiber {\n if (\n current == null ||\n- current.tag !== Portal ||\n+ current.tag !== HostPortal ||\n current.stateNode.containerInfo !== portal.containerInfo ||\n current.stateNode.implementation !== portal.implementation\n ) {\n@@ -970,7 +970,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {\n \/\/ the first item in the list.\n if (child.key === key) {\n if (\n- child.tag === Portal &&\n+ child.tag === HostPortal &&\n child.stateNode.containerInfo === portal.containerInfo &&\n child.stateNode.implementation === portal.implementation\n ) {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiber.js b\/src\/renderers\/shared\/fiber\/ReactFiber.js\nindex 3b30d19cde..98e47ecaab 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiber.js\n@@ -24,13 +24,13 @@ var ReactTypeOfWork = require('ReactTypeOfWork');\n var {\n IndeterminateComponent,\n ClassComponent,\n- HostContainer,\n+ HostRoot,\n HostComponent,\n HostText,\n+ HostPortal,\n CoroutineComponent,\n YieldComponent,\n Fragment,\n- Portal,\n } = ReactTypeOfWork;\n \n var {\n@@ -269,8 +269,8 @@ exports.cloneFiber = function(fiber : Fiber, priorityLevel : PriorityLevel) : Fi\n return alt;\n };\n \n-exports.createHostContainerFiber = function() : Fiber {\n- const fiber = createFiber(HostContainer, null);\n+exports.createHostRootFiber = function() : Fiber {\n+ const fiber = createFiber(HostRoot, null);\n return fiber;\n };\n \n@@ -345,7 +345,7 @@ exports.createFiberFromYield = function(yieldNode : ReactYield, priorityLevel :\n };\n \n exports.createFiberFromPortal = function(portal : ReactPortal, priorityLevel : PriorityLevel) : Fiber {\n- const fiber = createFiber(Portal, portal.key);\n+ const fiber = createFiber(HostPortal, portal.key);\n fiber.pendingProps = portal.children;\n fiber.pendingWorkPriority = priorityLevel;\n fiber.stateNode = {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\nindex b4e0d3a6f0..812614dd34 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberBeginWork.js\n@@ -38,14 +38,14 @@ var {\n IndeterminateComponent,\n FunctionalComponent,\n ClassComponent,\n- HostContainer,\n+ HostRoot,\n HostComponent,\n HostText,\n+ HostPortal,\n CoroutineComponent,\n CoroutineHandlerPhase,\n YieldComponent,\n Fragment,\n- Portal,\n } = ReactTypeOfWork;\n var {\n NoWork,\n@@ -449,7 +449,7 @@ module.exports = function(\n return updateFunctionalComponent(current, workInProgress);\n case ClassComponent:\n return updateClassComponent(current, workInProgress);\n- case HostContainer: {\n+ case HostRoot: {\n const root = (workInProgress.stateNode : FiberRoot);\n if (root.pendingContext) {\n pushTopLevelContextObject(\n@@ -483,7 +483,7 @@ module.exports = function(\n \/\/ A yield component is just a placeholder, we can just run through the\n \/\/ next one immediately.\n return null;\n- case Portal:\n+ case HostPortal:\n updatePortalComponent(current, workInProgress);\n \/\/ TODO: is this right?\n return workInProgress.child;\n@@ -497,7 +497,7 @@ module.exports = function(\n \n function beginFailedWork(current : ?Fiber, workInProgress : Fiber, priorityLevel : PriorityLevel) {\n if (workInProgress.tag !== ClassComponent &&\n- workInProgress.tag !== HostContainer) {\n+ workInProgress.tag !== HostRoot) {\n throw new Error('Invalid type of work');\n }\n \ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\nindex 7391676ab8..36cf684b28 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberCommitWork.js\n@@ -18,11 +18,11 @@ import type { HostConfig } from 'ReactFiberReconciler';\n var ReactTypeOfWork = require('ReactTypeOfWork');\n var {\n ClassComponent,\n- HostContainer,\n+ HostRoot,\n HostComponent,\n HostText,\n+ HostPortal,\n CoroutineComponent,\n- Portal,\n } = ReactTypeOfWork;\n var { callCallbacks } = require('ReactFiberUpdateQueue');\n \n@@ -75,9 +75,9 @@ module.exports = function(\n switch (parent.tag) {\n case HostComponent:\n return parent.stateNode;\n- case HostContainer:\n+ case HostRoot:\n return parent.stateNode.containerInfo;\n- case Portal:\n+ case HostPortal:\n return parent.stateNode.containerInfo;\n }\n parent = parent.return;\n@@ -99,8 +99,8 @@ module.exports = function(\n function isHostParent(fiber : Fiber) : boolean {\n return (\n fiber.tag === HostComponent ||\n- fiber.tag === HostContainer ||\n- fiber.tag === Portal\n+ fiber.tag === HostRoot ||\n+ fiber.tag === HostPortal\n );\n }\n \n@@ -153,10 +153,10 @@ module.exports = function(\n case HostComponent:\n parent = parentFiber.stateNode;\n break;\n- case HostContainer:\n+ case HostRoot:\n parent = parentFiber.stateNode.containerInfo;\n break;\n- case Portal:\n+ case HostPortal:\n parent = parentFiber.stateNode.containerInfo;\n break;\n default:\n@@ -180,7 +180,7 @@ module.exports = function(\n } else {\n appendChild(parent, node.stateNode);\n }\n- } else if (node.tag === Portal) {\n+ } else if (node.tag === HostPortal) {\n \/\/ If the insertion itself is a portal, then we don't want to traverse\n \/\/ down its children. Instead, we'll get insertions from each child in\n \/\/ the portal directly.\n@@ -243,7 +243,7 @@ module.exports = function(\n \/\/ After all the children have unmounted, it is now safe to remove the\n \/\/ node from the tree.\n removeChild(parent, node.stateNode);\n- } else if (node.tag === Portal) {\n+ } else if (node.tag === HostPortal) {\n \/\/ When we go into a portal, it becomes the parent to remove from.\n \/\/ We will reassign it back when we pop the portal on the way up.\n parent = node.stateNode.containerInfo;\n@@ -268,7 +268,7 @@ module.exports = function(\n return;\n }\n node = node.return;\n- if (node.tag === Portal) {\n+ if (node.tag === HostPortal) {\n \/\/ When we go out of the portal, we need to restore the parent.\n \/\/ Since we don't keep a stack of them, we will search for it.\n parent = getHostParent(node);\n@@ -319,7 +319,7 @@ module.exports = function(\n commitNestedUnmounts(current.stateNode);\n return;\n }\n- case Portal: {\n+ case HostPortal: {\n \/\/ TODO: this is recursive.\n commitDeletion(current);\n return;\n@@ -354,10 +354,10 @@ module.exports = function(\n commitTextUpdate(textInstance, oldText, newText);\n return;\n }\n- case HostContainer: {\n+ case HostRoot: {\n return;\n }\n- case Portal: {\n+ case HostPortal: {\n return;\n }\n default:\n@@ -400,7 +400,7 @@ module.exports = function(\n }\n return;\n }\n- case HostContainer: {\n+ case HostRoot: {\n const rootFiber = finishedWork.stateNode;\n let firstError = null;\n if (rootFiber.callbackList) {\n@@ -422,7 +422,7 @@ module.exports = function(\n \/\/ We have no life-cycles associated with text.\n return;\n }\n- case Portal: {\n+ case HostPortal: {\n \/\/ We have no life-cycles associated with portals.\n return;\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js b\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\nindex a188cf5813..f683a08331 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberCompleteWork.js\n@@ -29,14 +29,14 @@ var {\n IndeterminateComponent,\n FunctionalComponent,\n ClassComponent,\n- HostContainer,\n+ HostRoot,\n HostComponent,\n HostText,\n+ HostPortal,\n CoroutineComponent,\n CoroutineHandlerPhase,\n YieldComponent,\n Fragment,\n- Portal,\n } = ReactTypeOfWork;\n var {\n Update,\n@@ -66,7 +66,7 @@ module.exports = function(config : HostConfig) {\n let node = workInProgress.child;\n while (node) {\n if (node.tag === HostComponent || node.tag === HostText ||\n- node.tag === Portal) {\n+ node.tag === HostPortal) {\n throw new Error('A coroutine cannot have host component children.');\n } else if (node.tag === YieldComponent) {\n yields.push(node.type);\n@@ -132,7 +132,7 @@ module.exports = function(config : HostConfig) {\n while (node) {\n if (node.tag === HostComponent || node.tag === HostText) {\n appendInitialChild(parent, node.stateNode);\n- } else if (node.tag === Portal) {\n+ } else if (node.tag === HostPortal) {\n \/\/ If we have a portal child, then we don't want to traverse\n \/\/ down its children. Instead, we'll get insertions from each child in\n \/\/ the portal directly.\n@@ -188,7 +188,7 @@ module.exports = function(config : HostConfig) {\n markCallback(workInProgress);\n }\n return null;\n- case HostContainer: {\n+ case HostRoot: {\n workInProgress.memoizedProps = workInProgress.pendingProps;\n popContextProvider();\n const fiberRoot = (workInProgress.stateNode : FiberRoot);\n@@ -290,7 +290,7 @@ module.exports = function(config : HostConfig) {\n case Fragment:\n workInProgress.memoizedProps = workInProgress.pendingProps;\n return null;\n- case Portal:\n+ case HostPortal:\n \/\/ TODO: Only mark this as an update if we have any pending callbacks.\n markUpdate(workInProgress);\n workInProgress.memoizedProps = workInProgress.pendingProps;\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberContext.js b\/src\/renderers\/shared\/fiber\/ReactFiberContext.js\nindex e86cfbcea7..2479939e9b 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberContext.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberContext.js\n@@ -22,7 +22,7 @@ var {\n } = require('ReactFiberTreeReflection');\n var {\n ClassComponent,\n- HostContainer,\n+ HostRoot,\n } = require('ReactTypeOfWork');\n \n if (__DEV__) {\n@@ -142,7 +142,7 @@ exports.findCurrentUnmaskedContext = function(fiber: Fiber) : Object {\n );\n \n let node : Fiber = fiber;\n- while (node.tag !== HostContainer) {\n+ while (node.tag !== HostRoot) {\n if (isContextProvider(node)) {\n return node.stateNode.__reactInternalMemoizedMergedChildContext;\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberRoot.js b\/src\/renderers\/shared\/fiber\/ReactFiberRoot.js\nindex aeff58043b..4da3b9d18e 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberRoot.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberRoot.js\n@@ -15,7 +15,7 @@\n import type { Fiber } from 'ReactFiber';\n import type { UpdateQueue } from 'ReactFiberUpdateQueue';\n \n-const { createHostContainerFiber } = require('ReactFiber');\n+const { createHostRootFiber } = require('ReactFiber');\n \n export type FiberRoot = {\n \/\/ Any additional information from the host associated with this root.\n@@ -36,7 +36,7 @@ export type FiberRoot = {\n exports.createFiberRoot = function(containerInfo : any, context : Object) : FiberRoot {\n \/\/ Cyclic construction. This cheats the type system right now because\n \/\/ stateNode is any.\n- const uninitializedFiber = createHostContainerFiber();\n+ const uninitializedFiber = createHostRootFiber();\n const root = {\n current: uninitializedFiber,\n containerInfo: containerInfo,\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\nindex febc08f59e..4154a36525 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberScheduler.js\n@@ -46,7 +46,7 @@ var {\n } = require('ReactTypeOfSideEffect');\n \n var {\n- HostContainer,\n+ HostRoot,\n ClassComponent,\n } = require('ReactTypeOfWork');\n \n@@ -622,7 +622,7 @@ module.exports = function(config : HostConfig) {\n \/\/ Host containers are a special case. If the failed work itself is a host\n \/\/ container, then it acts as its own boundary. In all other cases, we\n \/\/ ignore the work itself and only search through the parents.\n- if (failedWork.tag === HostContainer) {\n+ if (failedWork.tag === HostRoot) {\n boundary = failedWork;\n } else {\n let node = failedWork.return;\n@@ -633,7 +633,7 @@ module.exports = function(config : HostConfig) {\n \/\/ Found an error boundary!\n boundary = node;\n }\n- } else if (node.tag === HostContainer) {\n+ } else if (node.tag === HostRoot) {\n \/\/ Treat the root like a no-op error boundary.\n boundary = node;\n }\n@@ -686,7 +686,7 @@ module.exports = function(config : HostConfig) {\n captureError(effectfulFiber, e, false);\n }\n return;\n- case HostContainer:\n+ case HostRoot:\n if (!firstUncaughtError) {\n \/\/ If this is the host container, we treat it as a no-op error\n \/\/ boundary. We'll throw the first uncaught error once it's safe to\n@@ -789,7 +789,7 @@ module.exports = function(config : HostConfig) {\n }\n }\n if (!node.return) {\n- if (node.tag === HostContainer) {\n+ if (node.tag === HostRoot) {\n const root : FiberRoot = (node.stateNode : any);\n scheduleWorkAtPriority(root, priorityLevel);\n } else {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js b\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js\nindex b4f105c2f7..21389c0c42 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberTreeReflection.js\n@@ -19,7 +19,7 @@ var ReactInstanceMap = require('ReactInstanceMap');\n var invariant = require('invariant');\n \n var {\n- HostContainer,\n+ HostRoot,\n HostComponent,\n HostText,\n } = require('ReactTypeOfWork');\n@@ -52,8 +52,8 @@ function isFiberMountedImpl(fiber : Fiber) : number {\n node = node.return;\n }\n }\n- if (node.tag === HostContainer) {\n- \/\/ TODO: Check if this was a nested HostContainer when used with\n+ if (node.tag === HostRoot) {\n+ \/\/ TODO: Check if this was a nested HostRoot when used with\n \/\/ renderContainerIntoSubtree.\n return MOUNTED;\n }\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactTypeOfWork.js b\/src\/renderers\/shared\/fiber\/ReactTypeOfWork.js\nindex 8098417683..ef3585e134 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactTypeOfWork.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactTypeOfWork.js\n@@ -18,12 +18,12 @@ module.exports = {\n IndeterminateComponent: 0, \/\/ Before we know whether it is functional or class\n FunctionalComponent: 1,\n ClassComponent: 2,\n- HostContainer: 3, \/\/ Root of a host tree. Could be nested inside another node.\n- HostComponent: 4,\n- HostText: 5,\n- CoroutineComponent: 6,\n- CoroutineHandlerPhase: 7,\n- YieldComponent: 8,\n- Fragment: 9,\n- Portal: 10, \/\/ A subtree. Could be an entry point to a different renderer.\n+ HostRoot: 3, \/\/ Root of a host tree. Could be nested inside another node.\n+ HostPortal: 4, \/\/ A subtree. Could be an entry point to a different renderer.\n+ HostComponent: 5,\n+ HostText: 6,\n+ CoroutineComponent: 7,\n+ CoroutineHandlerPhase: 8,\n+ YieldComponent: 9,\n+ Fragment: 10,\n };\ndiff --git a\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js b\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js\nindex fe4e7f24d9..22a72b0a67 100644\n--- a\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js\n+++ b\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js\n@@ -20,7 +20,7 @@ function getParent(inst) {\n if (typeof inst.tag === 'number') {\n do {\n inst = inst.return;\n- \/\/ TODO: If this is a HostContainer we might want to bail out.\n+ \/\/ TODO: If this is a HostRoot we might want to bail out.\n \/\/ That is depending on if we want nested subtrees (layers) to bubble\n \/\/ events to their parent.\n } while (inst && inst.tag !== HostComponent);\n","body":""}

dillon1000/react

Files changed