{"commit":{"authoredAt":"2017-10-02T13:43:45+01:00","subject":"Remove Stack (part 4: remove Stack-only branches and types) (#10798)","shortRevision":"5c13e2ee58","revision":"5c13e2ee58b88bf1668628a06dbe0109519bdb3c","authorName":"Dan Abramov","authorEmail":"dan.abramov@gmail.com"},"files":[{"status":"M","path":"src\/isomorphic\/classic\/element\/ReactCurrentOwner.js"},{"status":"M","path":"src\/renderers\/dom\/fiber\/ReactDOMFiberEntry.js"},{"status":"D","path":"src\/renderers\/dom\/shared\/ReactDOMComponentFlags.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/ReactDOMComponentTree.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/ReactDOMEventListener.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/ReactDOMFeatureFlags.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponentTree-test.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/eventPlugins\/SimpleEventPlugin.js"},{"status":"D","path":"src\/renderers\/dom\/shared\/findDOMNode.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/validateDOMNesting.js"},{"status":"M","path":"src\/renderers\/dom\/shared\/warnValidStyle.js"},{"status":"M","path":"src\/renderers\/dom\/test\/ReactTestUtilsEntry.js"},{"status":"M","path":"src\/renderers\/native\/ReactNativeComponentTree.js"},{"status":"M","path":"src\/renderers\/native\/__tests__\/ReactNativeEvents-test.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactChildFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactDebugCurrentFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiber.js"},{"status":"M","path":"src\/renderers\/shared\/fiber\/ReactFiberReconciler.js"},{"status":"D","path":"src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js"},{"status":"D","path":"src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/ReactTreeTraversal.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/event\/EventPluginHub.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/event\/PluginModuleType.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/event\/ReactControlledComponent.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/event\/ReactGenericBatching.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/event\/ReactSyntheticEventType.js"},{"status":"M","path":"src\/renderers\/shared\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js"},{"status":"D","path":"src\/renderers\/shared\/shared\/getContextForSubtree.js"},{"status":"D","path":"src\/shared\/ReactInstanceType.js"},{"status":"M","path":"src\/shared\/utils\/getComponentName.js"}],"body":"* Remove findDOMNode injection and inline it\r\n\r\n* Remove Stack-only code in ReactGenericBatching\r\n\r\n* Remove Stack-only code branches","patch":"diff --git a\/src\/isomorphic\/classic\/element\/ReactCurrentOwner.js b\/src\/isomorphic\/classic\/element\/ReactCurrentOwner.js\nindex fe90c214ef..720de0acc4 100644\n--- a\/src\/isomorphic\/classic\/element\/ReactCurrentOwner.js\n+++ b\/src\/isomorphic\/classic\/element\/ReactCurrentOwner.js\n@@ -10,7 +10,6 @@\n \n 'use strict';\n \n-import type {ReactInstance} from 'ReactInstanceType';\n import type {Fiber} from 'ReactFiber';\n \n \/**\n@@ -24,7 +23,7 @@ var ReactCurrentOwner = {\n * @internal\n * @type {ReactComponent}\n *\/\n- current: (null: null | ReactInstance | Fiber),\n+ current: (null: null | Fiber),\n };\n \n module.exports = ReactCurrentOwner;\ndiff --git a\/src\/renderers\/dom\/fiber\/ReactDOMFiberEntry.js b\/src\/renderers\/dom\/fiber\/ReactDOMFiberEntry.js\nindex 34f29c189c..aca08cbb0d 100644\n--- a\/src\/renderers\/dom\/fiber\/ReactDOMFiberEntry.js\n+++ b\/src\/renderers\/dom\/fiber\/ReactDOMFiberEntry.js\n@@ -10,7 +10,6 @@\n \n 'use strict';\n \n-import type {Fiber} from 'ReactFiber';\n import type {ReactNodeList} from 'ReactTypes';\n \n require('checkReact');\n@@ -28,6 +27,7 @@ var ReactInputSelection = require('ReactInputSelection');\n var ReactInstanceMap = require('ReactInstanceMap');\n var ReactPortal = require('ReactPortal');\n var ReactVersion = require('ReactVersion');\n+var {ReactCurrentOwner} = require('ReactGlobalSharedState');\n var {injectInternals} = require('ReactFiberDevToolsHook');\n var {\n ELEMENT_NODE,\n@@ -38,7 +38,7 @@ var {\n } = require('HTMLNodeType');\n var {ROOT_ATTRIBUTE_NAME} = require('DOMProperty');\n \n-var findDOMNode = require('findDOMNode');\n+var getComponentName = require('getComponentName');\n var invariant = require('fbjs\/lib\/invariant');\n \n var {getChildNamespace} = DOMNamespaces;\n@@ -85,9 +85,6 @@ require('ReactDOMInjection');\n ReactControlledComponent.injection.injectFiberControlledHostComponent(\n ReactDOMFiberComponent,\n );\n-findDOMNode._injectFiber(function(fiber: Fiber) {\n- return DOMRenderer.findHostInstance(fiber);\n-});\n \n type DOMContainer =\n | (Element & {\n@@ -232,7 +229,7 @@ var DOMRenderer = ReactFiberReconciler({\n if (__DEV__) {\n \/\/ TODO: take namespace into account when validating.\n const hostContextDev = ((hostContext: any): HostContextDev);\n- validateDOMNesting(type, null, null, hostContextDev.ancestorInfo);\n+ validateDOMNesting(type, null, hostContextDev.ancestorInfo);\n if (\n typeof props.children === 'string' ||\n typeof props.children === 'number'\n@@ -243,7 +240,7 @@ var DOMRenderer = ReactFiberReconciler({\n type,\n null,\n );\n- validateDOMNesting(null, string, null, ownAncestorInfo);\n+ validateDOMNesting(null, string, ownAncestorInfo);\n }\n parentNamespace = hostContextDev.namespace;\n } else {\n@@ -298,7 +295,7 @@ var DOMRenderer = ReactFiberReconciler({\n type,\n null,\n );\n- validateDOMNesting(null, string, null, ownAncestorInfo);\n+ validateDOMNesting(null, string, ownAncestorInfo);\n }\n }\n return diffProperties(\n@@ -365,7 +362,7 @@ var DOMRenderer = ReactFiberReconciler({\n ): TextInstance {\n if (__DEV__) {\n const hostContextDev = ((hostContext: any): HostContextDev);\n- validateDOMNesting(null, text, null, hostContextDev.ancestorInfo);\n+ validateDOMNesting(null, text, hostContextDev.ancestorInfo);\n }\n var textNode: TextInstance = createTextNode(text, rootContainerInstance);\n precacheFiberNode(internalInstanceHandle, textNode);\n@@ -675,6 +672,48 @@ function createPortal(\n var ReactDOMFiber = {\n createPortal,\n \n+ findDOMNode(\n+ componentOrElement: Element | ?React$Component,\n+ ): null | Element | Text {\n+ if (__DEV__) {\n+ var owner = (ReactCurrentOwner.current: any);\n+ if (owner !== null) {\n+ var warnedAboutRefsInRender = owner.stateNode._warnedAboutRefsInRender;\n+ warning(\n+ warnedAboutRefsInRender,\n+ '%s is accessing findDOMNode inside its render(). ' +\n+ 'render() should be a pure function of props and state. It should ' +\n+ 'never access something that requires stale data from the previous ' +\n+ 'render, such as refs. Move this logic to componentDidMount and ' +\n+ 'componentDidUpdate instead.',\n+ getComponentName(owner) || 'A component',\n+ );\n+ owner.stateNode._warnedAboutRefsInRender = true;\n+ }\n+ }\n+ if (componentOrElement == null) {\n+ return null;\n+ }\n+ if ((componentOrElement: any).nodeType === ELEMENT_NODE) {\n+ return (componentOrElement: any);\n+ }\n+\n+ var inst = ReactInstanceMap.get(componentOrElement);\n+ if (inst) {\n+ return DOMRenderer.findHostInstance(inst);\n+ }\n+\n+ if (typeof componentOrElement.render === 'function') {\n+ invariant(false, 'Unable to find node on an unmounted component.');\n+ } else {\n+ invariant(\n+ false,\n+ 'Element appears to be neither ReactComponent nor DOMNode. Keys: %s',\n+ Object.keys(componentOrElement),\n+ );\n+ }\n+ },\n+\n hydrate(element: React$Node, container: DOMContainer, callback: ?Function) {\n \/\/ TODO: throw or warn if we couldn't hydrate?\n return renderSubtreeIntoContainer(null, element, container, true, callback);\n@@ -768,8 +807,6 @@ var ReactDOMFiber = {\n }\n },\n \n- findDOMNode: findDOMNode,\n-\n \/\/ Temporary alias since we already shipped React 16 RC with it.\n \/\/ TODO: remove in React 17.\n unstable_createPortal: createPortal,\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponentFlags.js b\/src\/renderers\/dom\/shared\/ReactDOMComponentFlags.js\ndeleted file mode 100644\nindex bc40a5a560..0000000000\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponentFlags.js\n+++ \/dev\/null\n@@ -1,16 +0,0 @@\n-\/**\n- * Copyright (c) 2015-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule ReactDOMComponentFlags\n- *\/\n-\n-'use strict';\n-\n-var ReactDOMComponentFlags = {\n- hasCachedChildNodes: 1 << 0,\n-};\n-\n-module.exports = ReactDOMComponentFlags;\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponentTree.js b\/src\/renderers\/dom\/shared\/ReactDOMComponentTree.js\nindex abcb36b31f..e8969c183a 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponentTree.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponentTree.js\n@@ -9,116 +9,18 @@\n \n 'use strict';\n \n-var DOMProperty = require('DOMProperty');\n-var ReactDOMComponentFlags = require('ReactDOMComponentFlags');\n var {HostComponent, HostText} = require('ReactTypeOfWork');\n-var {ELEMENT_NODE, COMMENT_NODE} = require('HTMLNodeType');\n \n var invariant = require('fbjs\/lib\/invariant');\n \n-var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;\n-var Flags = ReactDOMComponentFlags;\n-\n var randomKey = Math.random().toString(36).slice(2);\n-\n var internalInstanceKey = '__reactInternalInstance$' + randomKey;\n-\n var internalEventHandlersKey = '__reactEventHandlers$' + randomKey;\n \n-\/**\n- * Check if a given node should be cached.\n- *\/\n-function shouldPrecacheNode(node, nodeID) {\n- return (\n- (node.nodeType === ELEMENT_NODE &&\n- node.getAttribute(ATTR_NAME) === '' + nodeID) ||\n- (node.nodeType === COMMENT_NODE &&\n- node.nodeValue === ' react-text: ' + nodeID + ' ') ||\n- (node.nodeType === COMMENT_NODE &&\n- node.nodeValue === ' react-empty: ' + nodeID + ' ')\n- );\n-}\n-\n-\/**\n- * Drill down (through composites and empty components) until we get a host or\n- * host text component.\n- *\n- * This is pretty polymorphic but unavoidable with the current structure we have\n- * for `_renderedChildren`.\n- *\/\n-function getRenderedHostOrTextFromComponent(component) {\n- var rendered;\n- while ((rendered = component._renderedComponent)) {\n- component = rendered;\n- }\n- return component;\n-}\n-\n-\/**\n- * Populate `_hostNode` on the rendered host\/text component with the given\n- * DOM node. The passed `inst` can be a composite.\n- *\/\n-function precacheNode(inst, node) {\n- var hostInst = getRenderedHostOrTextFromComponent(inst);\n- hostInst._hostNode = node;\n- node[internalInstanceKey] = hostInst;\n-}\n-\n function precacheFiberNode(hostInst, node) {\n node[internalInstanceKey] = hostInst;\n }\n \n-function uncacheNode(inst) {\n- var node = inst._hostNode;\n- if (node) {\n- delete node[internalInstanceKey];\n- inst._hostNode = null;\n- }\n-}\n-\n-\/**\n- * Populate `_hostNode` on each child of `inst`, assuming that the children\n- * match up with the DOM (element) children of `node`.\n- *\n- * We cache entire levels at once to avoid an n^2 problem where we access the\n- * children of a node sequentially and have to walk from the start to our target\n- * node every time.\n- *\n- * Since we update `_renderedChildren` and the actual DOM at (slightly)\n- * different times, we could race here and see a newer `_renderedChildren` than\n- * the DOM nodes we see. To avoid this, ReactMultiChild calls\n- * `prepareToManageChildren` before we change `_renderedChildren`, at which\n- * time the container's child nodes are always cached (until it unmounts).\n- *\/\n-function precacheChildNodes(inst, node) {\n- if (inst._flags & Flags.hasCachedChildNodes) {\n- return;\n- }\n- var children = inst._renderedChildren;\n- var childNode = node.firstChild;\n- outer: for (var name in children) {\n- if (!children.hasOwnProperty(name)) {\n- continue;\n- }\n- var childInst = children[name];\n- var childID = getRenderedHostOrTextFromComponent(childInst)._domID;\n- if (childID === 0) {\n- \/\/ We're currently unmounting this child in ReactMultiChild; skip it.\n- continue;\n- }\n- \/\/ We assume the child nodes are in the same order as the child instances.\n- for (; childNode !== null; childNode = childNode.nextSibling) {\n- if (shouldPrecacheNode(childNode, childID)) {\n- precacheNode(childInst, childNode);\n- continue outer;\n- }\n- }\n- \/\/ We reached the end of the DOM children without finding an ID match.\n- invariant(false, 'Unable to find element with ID %s.', childID);\n- }\n- inst._flags |= Flags.hasCachedChildNodes;\n-}\n-\n \/**\n * Given a DOM node, return the closest ReactDOMComponent or\n * ReactDOMTextComponent instance ancestor.\n@@ -149,9 +51,6 @@ function getClosestInstanceFromNode(node) {\n }\n for (; node && (inst = node[internalInstanceKey]); node = parents.pop()) {\n closest = inst;\n- if (parents.length) {\n- precacheChildNodes(inst, node);\n- }\n }\n \n return closest;\n@@ -166,18 +65,11 @@ function getInstanceFromNode(node) {\n if (inst) {\n if (inst.tag === HostComponent || inst.tag === HostText) {\n return inst;\n- } else if (inst._hostNode === node) {\n- return inst;\n } else {\n return null;\n }\n }\n- inst = getClosestInstanceFromNode(node);\n- if (inst != null && inst._hostNode === node) {\n- return inst;\n- } else {\n- return null;\n- }\n+ return null;\n }\n \n \/**\n@@ -193,33 +85,7 @@ function getNodeFromInstance(inst) {\n \n \/\/ Without this first invariant, passing a non-DOM-component triggers the next\n \/\/ invariant for a missing parent, which is super confusing.\n- invariant(\n- inst._hostNode !== undefined,\n- 'getNodeFromInstance: Invalid argument.',\n- );\n-\n- if (inst._hostNode) {\n- return inst._hostNode;\n- }\n-\n- \/\/ Walk up the tree until we find an ancestor whose DOM node we have cached.\n- var parents = [];\n- while (!inst._hostNode) {\n- parents.push(inst);\n- invariant(\n- inst._hostParent,\n- 'React DOM tree root should always have a node reference.',\n- );\n- inst = inst._hostParent;\n- }\n-\n- \/\/ Now parents contains each ancestor that does *not* have a cached native\n- \/\/ node, and `inst` is the deepest ancestor that does.\n- for (; parents.length; inst = parents.pop()) {\n- precacheChildNodes(inst, inst._hostNode);\n- }\n-\n- return inst._hostNode;\n+ invariant(false, 'getNodeFromInstance: Invalid argument.');\n }\n \n function getFiberCurrentPropsFromNode(node) {\n@@ -234,9 +100,6 @@ var ReactDOMComponentTree = {\n getClosestInstanceFromNode: getClosestInstanceFromNode,\n getInstanceFromNode: getInstanceFromNode,\n getNodeFromInstance: getNodeFromInstance,\n- precacheChildNodes: precacheChildNodes,\n- precacheNode: precacheNode,\n- uncacheNode: uncacheNode,\n precacheFiberNode: precacheFiberNode,\n getFiberCurrentPropsFromNode,\n updateFiberProps,\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMEventListener.js b\/src\/renderers\/dom\/shared\/ReactDOMEventListener.js\nindex 03f9bb1dde..6950f06aca 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMEventListener.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMEventListener.js\n@@ -31,22 +31,14 @@ function findRootContainerNode(inst) {\n \/\/ TODO: It may be a good idea to cache this to prevent unnecessary DOM\n \/\/ traversal, but caching is difficult to do correctly without using a\n \/\/ mutation observer to listen for all DOM changes.\n- if (typeof inst.tag === 'number') {\n- while (inst.return) {\n- inst = inst.return;\n- }\n- if (inst.tag !== HostRoot) {\n- \/\/ This can happen if we're in a detached tree.\n- return null;\n- }\n- return inst.stateNode.containerInfo;\n- } else {\n- while (inst._hostParent) {\n- inst = inst._hostParent;\n- }\n- var rootNode = ReactDOMComponentTree.getNodeFromInstance(inst);\n- return rootNode.parentNode;\n+ while (inst.return) {\n+ inst = inst.return;\n+ }\n+ if (inst.tag !== HostRoot) {\n+ \/\/ This can happen if we're in a detached tree.\n+ return null;\n }\n+ return inst.stateNode.containerInfo;\n }\n \n \/\/ Used to store ancestor hierarchy in top level callback\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMFeatureFlags.js b\/src\/renderers\/dom\/shared\/ReactDOMFeatureFlags.js\nindex 03ab7534ad..43f4085015 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMFeatureFlags.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMFeatureFlags.js\n@@ -11,7 +11,6 @@\n \n var ReactDOMFeatureFlags = {\n fiberAsyncScheduling: false,\n- useFiber: true,\n };\n \n module.exports = ReactDOMFeatureFlags;\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponentTree-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponentTree-test.js\nindex 147b6ba9ac..c3cf73bd45 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponentTree-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponentTree-test.js\n@@ -23,17 +23,11 @@ describe('ReactDOMComponentTree', () => {\n }\n \n function getTypeOf(instance) {\n- if (typeof instance.tag === 'number') {\n- return instance.type;\n- }\n- return instance._currentElement.type;\n+ return instance.type;\n }\n \n function getTextOf(instance) {\n- if (typeof instance.tag === 'number') {\n- return instance.memoizedProps;\n- }\n- return instance._stringText;\n+ return instance.memoizedProps;\n }\n \n beforeEach(() => {\ndiff --git a\/src\/renderers\/dom\/shared\/eventPlugins\/SimpleEventPlugin.js b\/src\/renderers\/dom\/shared\/eventPlugins\/SimpleEventPlugin.js\nindex 8c53cf882b..d33e45b936 100644\n--- a\/src\/renderers\/dom\/shared\/eventPlugins\/SimpleEventPlugin.js\n+++ b\/src\/renderers\/dom\/shared\/eventPlugins\/SimpleEventPlugin.js\n@@ -34,7 +34,7 @@ import type {\n DispatchConfig,\n ReactSyntheticEvent,\n } from 'ReactSyntheticEventType';\n-import type {ReactInstance} from 'ReactInstanceType';\n+import type {Fiber} from 'ReactFiber';\n import type {EventTypes, PluginModule} from 'PluginModuleType';\n \n \/**\n@@ -179,7 +179,7 @@ var SimpleEventPlugin: PluginModule = {\n \n extractEvents: function(\n topLevelType: TopLevelTypes,\n- targetInst: ReactInstance,\n+ targetInst: Fiber,\n nativeEvent: MouseEvent,\n nativeEventTarget: EventTarget,\n ): null | ReactSyntheticEvent {\ndiff --git a\/src\/renderers\/dom\/shared\/findDOMNode.js b\/src\/renderers\/dom\/shared\/findDOMNode.js\ndeleted file mode 100644\nindex 83a57e8218..0000000000\n--- a\/src\/renderers\/dom\/shared\/findDOMNode.js\n+++ \/dev\/null\n@@ -1,89 +0,0 @@\n-\/**\n- * Copyright (c) 2013-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule findDOMNode\n- * @flow\n- *\/\n-\n-var ReactInstanceMap = require('ReactInstanceMap');\n-var {ELEMENT_NODE} = require('HTMLNodeType');\n-var {ReactCurrentOwner} = require('ReactGlobalSharedState');\n-\n-var getComponentName = require('getComponentName');\n-var invariant = require('fbjs\/lib\/invariant');\n-\n-if (__DEV__) {\n- var warning = require('fbjs\/lib\/warning');\n-}\n-\n-let findFiber = function(arg) {\n- invariant(false, 'Missing injection for fiber findDOMNode');\n-};\n-let findStack = function(arg) {\n- invariant(false, 'Missing injection for stack findDOMNode');\n-};\n-\n-const findDOMNode = function(\n- componentOrElement: Element | ?React$Component,\n-): null | Element | Text {\n- if (__DEV__) {\n- var owner = (ReactCurrentOwner.current: any);\n- if (owner !== null) {\n- var isFiber = typeof owner.tag === 'number';\n- var warnedAboutRefsInRender = isFiber\n- ? owner.stateNode._warnedAboutRefsInRender\n- : owner._warnedAboutRefsInRender;\n- warning(\n- warnedAboutRefsInRender,\n- '%s is accessing findDOMNode inside its render(). ' +\n- 'render() should be a pure function of props and state. It should ' +\n- 'never access something that requires stale data from the previous ' +\n- 'render, such as refs. Move this logic to componentDidMount and ' +\n- 'componentDidUpdate instead.',\n- getComponentName(owner) || 'A component',\n- );\n- if (isFiber) {\n- owner.stateNode._warnedAboutRefsInRender = true;\n- } else {\n- owner._warnedAboutRefsInRender = true;\n- }\n- }\n- }\n- if (componentOrElement == null) {\n- return null;\n- }\n- if ((componentOrElement: any).nodeType === ELEMENT_NODE) {\n- return (componentOrElement: any);\n- }\n-\n- var inst = ReactInstanceMap.get(componentOrElement);\n- if (inst) {\n- if (typeof inst.tag === 'number') {\n- return findFiber(inst);\n- } else {\n- return findStack(inst);\n- }\n- }\n-\n- if (typeof componentOrElement.render === 'function') {\n- invariant(false, 'Unable to find node on an unmounted component.');\n- } else {\n- invariant(\n- false,\n- 'Element appears to be neither ReactComponent nor DOMNode. Keys: %s',\n- Object.keys(componentOrElement),\n- );\n- }\n-};\n-\n-findDOMNode._injectFiber = function(fn) {\n- findFiber = fn;\n-};\n-findDOMNode._injectStack = function(fn) {\n- findStack = fn;\n-};\n-\n-module.exports = findDOMNode;\ndiff --git a\/src\/renderers\/dom\/shared\/validateDOMNesting.js b\/src\/renderers\/dom\/shared\/validateDOMNesting.js\nindex 7a153f264a..ba6d55d813 100644\n--- a\/src\/renderers\/dom\/shared\/validateDOMNesting.js\n+++ b\/src\/renderers\/dom\/shared\/validateDOMNesting.js\n@@ -10,7 +10,6 @@\n 'use strict';\n \n var emptyFunction = require('fbjs\/lib\/emptyFunction');\n-var getComponentName = require('getComponentName');\n \n var validateDOMNesting = emptyFunction;\n \n@@ -405,83 +404,9 @@ if (__DEV__) {\n return null;\n };\n \n- \/**\n- * Given a ReactCompositeComponent instance, return a list of its recursive\n- * owners, starting at the root and ending with the instance itself.\n- *\/\n- var findOwnerStack = function(instance) {\n- if (!instance) {\n- return [];\n- }\n-\n- var stack = [];\n- do {\n- stack.push(instance);\n- } while ((instance = instance._currentElement._owner));\n- stack.reverse();\n- return stack;\n- };\n-\n- var getOwnerInfo = function(\n- childInstance,\n- childTag,\n- ancestorInstance,\n- ancestorTag,\n- isParent,\n- ) {\n- var childOwner = childInstance && childInstance._currentElement._owner;\n- var ancestorOwner =\n- ancestorInstance && ancestorInstance._currentElement._owner;\n-\n- var childOwners = findOwnerStack(childOwner);\n- var ancestorOwners = findOwnerStack(ancestorOwner);\n-\n- var minStackLen = Math.min(childOwners.length, ancestorOwners.length);\n- var i;\n-\n- var deepestCommon = -1;\n- for (i = 0; i < minStackLen; i++) {\n- if (childOwners[i] === ancestorOwners[i]) {\n- deepestCommon = i;\n- } else {\n- break;\n- }\n- }\n-\n- var UNKNOWN = '(unknown)';\n- var childOwnerNames = childOwners\n- .slice(deepestCommon + 1)\n- .map(inst => getComponentName(inst) || UNKNOWN);\n- var ancestorOwnerNames = ancestorOwners\n- .slice(deepestCommon + 1)\n- .map(inst => getComponentName(inst) || UNKNOWN);\n- var ownerInfo = []\n- .concat(\n- \/\/ If the parent and child instances have a common owner ancestor, start\n- \/\/ with that -- otherwise we just start with the parent's owners.\n- deepestCommon !== -1\n- ? getComponentName(childOwners[deepestCommon]) || UNKNOWN\n- : [],\n- ancestorOwnerNames,\n- ancestorTag,\n- \/\/ If we're warning about an invalid (non-parent) ancestry, add '...'\n- isParent ? [] : ['...'],\n- childOwnerNames,\n- childTag,\n- )\n- .join(' > ');\n-\n- return ownerInfo;\n- };\n-\n var didWarn = {};\n \n- validateDOMNesting = function(\n- childTag,\n- childText,\n- childInstance,\n- ancestorInfo,\n- ) {\n+ validateDOMNesting = function(childTag, childText, ancestorInfo) {\n ancestorInfo = ancestorInfo || emptyAncestorInfo;\n var parentInfo = ancestorInfo.current;\n var parentTag = parentInfo && parentInfo.tag;\n@@ -505,24 +430,8 @@ if (__DEV__) {\n return;\n }\n \n- var ancestorInstance = invalidParentOrAncestor.instance;\n var ancestorTag = invalidParentOrAncestor.tag;\n- var addendum;\n-\n- if (childInstance != null) {\n- addendum =\n- ' See ' +\n- getOwnerInfo(\n- childInstance,\n- childTag,\n- ancestorInstance,\n- ancestorTag,\n- !!invalidParent,\n- ) +\n- '.';\n- } else {\n- addendum = getCurrentFiberStackAddendum();\n- }\n+ var addendum = getCurrentFiberStackAddendum();\n \n var warnKey =\n !!invalidParent + '|' + childTag + '|' + ancestorTag + '|' + addendum;\ndiff --git a\/src\/renderers\/dom\/shared\/warnValidStyle.js b\/src\/renderers\/dom\/shared\/warnValidStyle.js\nindex 590c36f980..7a711e4a66 100644\n--- a\/src\/renderers\/dom\/shared\/warnValidStyle.js\n+++ b\/src\/renderers\/dom\/shared\/warnValidStyle.js\n@@ -15,7 +15,6 @@ var warnValidStyle = emptyFunction;\n \n if (__DEV__) {\n var camelizeStyleName = require('fbjs\/lib\/camelizeStyleName');\n- var getComponentName = require('getComponentName');\n var warning = require('fbjs\/lib\/warning');\n var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber');\n \n@@ -30,7 +29,7 @@ if (__DEV__) {\n var warnedForNaNValue = false;\n var warnedForInfinityValue = false;\n \n- var warnHyphenatedStyleName = function(name, owner) {\n+ var warnHyphenatedStyleName = function(name) {\n if (warnedStyleNames.hasOwnProperty(name) && warnedStyleNames[name]) {\n return;\n }\n@@ -41,11 +40,11 @@ if (__DEV__) {\n 'Unsupported style property %s. Did you mean %s?%s',\n name,\n camelizeStyleName(name),\n- checkRenderMessage(owner),\n+ checkRenderMessage(),\n );\n };\n \n- var warnBadVendoredStyleName = function(name, owner) {\n+ var warnBadVendoredStyleName = function(name) {\n if (warnedStyleNames.hasOwnProperty(name) && warnedStyleNames[name]) {\n return;\n }\n@@ -56,11 +55,11 @@ if (__DEV__) {\n 'Unsupported vendor-prefixed style property %s. Did you mean %s?%s',\n name,\n name.charAt(0).toUpperCase() + name.slice(1),\n- checkRenderMessage(owner),\n+ checkRenderMessage(),\n );\n };\n \n- var warnStyleValueWithSemicolon = function(name, value, owner) {\n+ var warnStyleValueWithSemicolon = function(name, value) {\n if (warnedStyleValues.hasOwnProperty(value) && warnedStyleValues[value]) {\n return;\n }\n@@ -70,13 +69,13 @@ if (__DEV__) {\n false,\n \"Style property values shouldn't contain a semicolon.%s \" +\n 'Try \"%s: %s\" instead.',\n- checkRenderMessage(owner),\n+ checkRenderMessage(),\n name,\n value.replace(badStyleValueWithSemicolonPattern, ''),\n );\n };\n \n- var warnStyleValueIsNaN = function(name, value, owner) {\n+ var warnStyleValueIsNaN = function(name, value) {\n if (warnedForNaNValue) {\n return;\n }\n@@ -86,11 +85,11 @@ if (__DEV__) {\n false,\n '`NaN` is an invalid value for the `%s` css style property.%s',\n name,\n- checkRenderMessage(owner),\n+ checkRenderMessage(),\n );\n };\n \n- var warnStyleValueIsInfinity = function(name, value, owner) {\n+ var warnStyleValueIsInfinity = function(name, value) {\n if (warnedForInfinityValue) {\n return;\n }\n@@ -100,21 +99,16 @@ if (__DEV__) {\n false,\n '`Infinity` is an invalid value for the `%s` css style property.%s',\n name,\n- checkRenderMessage(owner),\n+ checkRenderMessage(),\n );\n };\n \n- var checkRenderMessage = function(owner) {\n+ var checkRenderMessage = function() {\n var ownerName;\n- if (owner != null) {\n- \/\/ Stack passes the owner manually all the way to CSSPropertyOperations.\n- ownerName = getComponentName(owner);\n- } else {\n- \/\/ Fiber doesn't pass it but uses ReactDebugCurrentFiber to track it.\n- \/\/ It is only enabled in development and tracks host components too.\n- ownerName = getCurrentFiberOwnerName();\n- \/\/ TODO: also report the stack.\n- }\n+ \/\/ Fiber doesn't pass it but uses ReactDebugCurrentFiber to track it.\n+ \/\/ It is only enabled in development and tracks host components too.\n+ ownerName = getCurrentFiberOwnerName();\n+ \/\/ TODO: also report the stack.\n if (ownerName) {\n return '\\n\\nCheck the render method of `' + ownerName + '`.';\n }\n@@ -122,24 +116,19 @@ if (__DEV__) {\n };\n \n warnValidStyle = function(name, value, component) {\n- var owner;\n- if (component) {\n- \/\/ TODO: this only works with Stack. Seems like we need to add unit tests?\n- owner = component._currentElement._owner;\n- }\n if (name.indexOf('-') > -1) {\n- warnHyphenatedStyleName(name, owner);\n+ warnHyphenatedStyleName(name);\n } else if (badVendoredStyleNamePattern.test(name)) {\n- warnBadVendoredStyleName(name, owner);\n+ warnBadVendoredStyleName(name);\n } else if (badStyleValueWithSemicolonPattern.test(value)) {\n- warnStyleValueWithSemicolon(name, value, owner);\n+ warnStyleValueWithSemicolon(name, value);\n }\n \n if (typeof value === 'number') {\n if (isNaN(value)) {\n- warnStyleValueIsNaN(name, value, owner);\n+ warnStyleValueIsNaN(name, value);\n } else if (!isFinite(value)) {\n- warnStyleValueIsInfinity(name, value, owner);\n+ warnStyleValueIsInfinity(name, value);\n }\n }\n };\ndiff --git a\/src\/renderers\/dom\/test\/ReactTestUtilsEntry.js b\/src\/renderers\/dom\/test\/ReactTestUtilsEntry.js\nindex ec535cd7ce..a2445b3393 100644\n--- a\/src\/renderers\/dom\/test\/ReactTestUtilsEntry.js\n+++ b\/src\/renderers\/dom\/test\/ReactTestUtilsEntry.js\n@@ -43,35 +43,6 @@ function Event(suffix) {}\n * @class ReactTestUtils\n *\/\n \n-function findAllInRenderedStackTreeInternal(inst, test) {\n- if (!inst || !inst.getPublicInstance) {\n- return [];\n- }\n- var publicInst = inst.getPublicInstance();\n- var ret = test(publicInst) ? [publicInst] : [];\n- var currentElement = inst._currentElement;\n- if (ReactTestUtils.isDOMComponent(publicInst)) {\n- var renderedChildren = inst._renderedChildren;\n- var key;\n- for (key in renderedChildren) {\n- if (!renderedChildren.hasOwnProperty(key)) {\n- continue;\n- }\n- ret = ret.concat(\n- findAllInRenderedStackTreeInternal(renderedChildren[key], test),\n- );\n- }\n- } else if (\n- React.isValidElement(currentElement) &&\n- typeof currentElement.type === 'function'\n- ) {\n- ret = ret.concat(\n- findAllInRenderedStackTreeInternal(inst._renderedComponent, test),\n- );\n- }\n- return ret;\n-}\n-\n function findAllInRenderedFiberTreeInternal(fiber, test) {\n if (!fiber) {\n return [];\n@@ -169,10 +140,7 @@ var ReactTestUtils = {\n return false;\n }\n var internalInstance = ReactInstanceMap.get(inst);\n- var constructor = typeof internalInstance.tag === 'number'\n- ? internalInstance.type \/\/ Fiber reconciler\n- : internalInstance._currentElement.type; \/\/ Stack reconciler\n-\n+ var constructor = internalInstance.type;\n return constructor === type;\n },\n \n@@ -185,11 +153,7 @@ var ReactTestUtils = {\n 'findAllInRenderedTree(...): instance must be a composite component',\n );\n var internalInstance = ReactInstanceMap.get(inst);\n- if (internalInstance && typeof internalInstance.tag === 'number') {\n- return findAllInRenderedFiberTreeInternal(internalInstance, test);\n- } else {\n- return findAllInRenderedStackTreeInternal(internalInstance, test);\n- }\n+ return findAllInRenderedFiberTreeInternal(internalInstance, test);\n },\n \n \/**\ndiff --git a\/src\/renderers\/native\/ReactNativeComponentTree.js b\/src\/renderers\/native\/ReactNativeComponentTree.js\nindex 0103da2148..a67da6213b 100644\n--- a\/src\/renderers\/native\/ReactNativeComponentTree.js\n+++ b\/src\/renderers\/native\/ReactNativeComponentTree.js\n@@ -14,41 +14,10 @@ var invariant = require('fbjs\/lib\/invariant');\n var instanceCache = {};\n var instanceProps = {};\n \n-\/**\n- * Drill down (through composites and empty components) until we get a host or\n- * host text component.\n- *\n- * This is pretty polymorphic but unavoidable with the current structure we have\n- * for `_renderedChildren`.\n- *\/\n-function getRenderedHostOrTextFromComponent(component) {\n- var rendered;\n- while ((rendered = component._renderedComponent)) {\n- component = rendered;\n- }\n- return component;\n-}\n-\n-\/**\n- * Populate `_hostNode` on the rendered host\/text component with the given\n- * DOM node. The passed `inst` can be a composite.\n- *\/\n-function precacheNode(inst, tag) {\n- var nativeInst = getRenderedHostOrTextFromComponent(inst);\n- instanceCache[tag] = nativeInst;\n-}\n-\n function precacheFiberNode(hostInst, tag) {\n instanceCache[tag] = hostInst;\n }\n \n-function uncacheNode(inst) {\n- var tag = inst._rootNodeID;\n- if (tag) {\n- delete instanceCache[tag];\n- }\n-}\n-\n function uncacheFiberNode(tag) {\n delete instanceCache[tag];\n delete instanceProps[tag];\n@@ -77,9 +46,7 @@ var ReactNativeComponentTree = {\n getInstanceFromNode: getInstanceFromTag,\n getNodeFromInstance: getTagFromInstance,\n precacheFiberNode,\n- precacheNode,\n uncacheFiberNode,\n- uncacheNode,\n getFiberCurrentPropsFromNode,\n updateFiberProps,\n };\ndiff --git a\/src\/renderers\/native\/__tests__\/ReactNativeEvents-test.js b\/src\/renderers\/native\/__tests__\/ReactNativeEvents-test.js\nindex 8c4cc735e0..d56d79d840 100644\n--- a\/src\/renderers\/native\/__tests__\/ReactNativeEvents-test.js\n+++ b\/src\/renderers\/native\/__tests__\/ReactNativeEvents-test.js\n@@ -250,9 +250,7 @@ it('handles when a responder is unmounted while a touch sequence is in progress'\n if (responder === null) {\n return null;\n }\n- const props = typeof responder.tag === 'number'\n- ? responder.memoizedProps\n- : responder._currentElement.props;\n+ const props = responder.memoizedProps;\n return props ? props.id : null;\n }\n \n@@ -342,9 +340,7 @@ it('handles events without target', () => {\n if (responder === null) {\n return null;\n }\n- const props = typeof responder.tag === 'number'\n- ? responder.memoizedProps\n- : responder._currentElement.props;\n+ const props = responder.memoizedProps;\n return props ? props.id : null;\n }\n \ndiff --git a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\nindex bb5564f9f2..8eae6f4100 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactChildFiber.js\n@@ -13,7 +13,6 @@\n import type {ReactElement} from 'ReactElementType';\n import type {ReactCoroutine, ReactPortal, ReactYield} from 'ReactTypes';\n import type {Fiber} from 'ReactFiber';\n-import type {ReactInstance} from 'ReactInstanceType';\n import type {PriorityLevel} from 'ReactPriorityLevel';\n \n var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('ReactCoroutine');\n@@ -120,20 +119,15 @@ function coerceRef(current: Fiber | null, element: ReactElement) {\n let mixedRef = element.ref;\n if (mixedRef !== null && typeof mixedRef !== 'function') {\n if (element._owner) {\n- const owner: ?(Fiber | ReactInstance) = (element._owner: any);\n+ const owner: ?Fiber = (element._owner: any);\n let inst;\n if (owner) {\n- if (typeof owner.tag === 'number') {\n- const ownerFiber = ((owner: any): Fiber);\n- invariant(\n- ownerFiber.tag === ClassComponent,\n- 'Stateless function components cannot have refs.',\n- );\n- inst = ownerFiber.stateNode;\n- } else {\n- \/\/ Stack\n- inst = (owner: any).getPublicInstance();\n- }\n+ const ownerFiber = ((owner: any): Fiber);\n+ invariant(\n+ ownerFiber.tag === ClassComponent,\n+ 'Stateless function components cannot have refs.',\n+ );\n+ inst = ownerFiber.stateNode;\n }\n invariant(\n inst,\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactDebugCurrentFiber.js b\/src\/renderers\/shared\/fiber\/ReactDebugCurrentFiber.js\nindex 16a4096bd7..92b3fa26f1 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactDebugCurrentFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactDebugCurrentFiber.js\n@@ -29,8 +29,9 @@ function getCurrentFiberOwnerName(): string | null {\n if (fiber === null) {\n return null;\n }\n- if (fiber._debugOwner != null) {\n- return getComponentName(fiber._debugOwner);\n+ const owner = fiber._debugOwner;\n+ if (owner !== null && typeof owner !== 'undefined') {\n+ return getComponentName(owner);\n }\n }\n return null;\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiber.js b\/src\/renderers\/shared\/fiber\/ReactFiber.js\nindex 7fbb3a8af1..dae77d55cc 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiber.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiber.js\n@@ -11,7 +11,6 @@\n 'use strict';\n \n import type {ReactElement, Source} from 'ReactElementType';\n-import type {ReactInstance, DebugID} from 'ReactInstanceType';\n import type {\n ReactCoroutine,\n ReactFragment,\n@@ -147,9 +146,9 @@ export type Fiber = {|\n \/\/ workInProgress : Fiber -> alternate The alternate used for reuse happens\n \/\/ to be the same as work in progress.\n \/\/ __DEV__ only\n- _debugID?: DebugID,\n+ _debugID?: number,\n _debugSource?: Source | null,\n- _debugOwner?: Fiber | ReactInstance | null, \/\/ Stack compatible\n+ _debugOwner?: Fiber | null,\n _debugIsCurrentlyTiming?: boolean,\n |};\n \n@@ -349,7 +348,7 @@ function createFiberFromElementType(\n type: mixed,\n key: null | string,\n internalContextTag: TypeOfInternalContext,\n- debugOwner: null | Fiber | ReactInstance,\n+ debugOwner: null | Fiber,\n ): Fiber {\n let fiber;\n if (typeof type === 'function') {\ndiff --git a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\nindex 23738f3c40..eafa87add0 100644\n--- a\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n+++ b\/src\/renderers\/shared\/fiber\/ReactFiberReconciler.js\n@@ -25,7 +25,9 @@ var {\n } = require('ReactFiberContext');\n var {createFiberRoot} = require('ReactFiberRoot');\n var ReactFiberScheduler = require('ReactFiberScheduler');\n+var ReactInstanceMap = require('ReactInstanceMap');\n var {HostComponent} = require('ReactTypeOfWork');\n+var emptyObject = require('fbjs\/lib\/emptyObject');\n \n if (__DEV__) {\n var warning = require('fbjs\/lib\/warning');\n@@ -39,8 +41,6 @@ var {\n findCurrentHostFiberWithNoPortals,\n } = require('ReactFiberTreeReflection');\n \n-var getContextForSubtree = require('getContextForSubtree');\n-\n export type Deadline = {\n timeRemaining: () => number,\n };\n@@ -178,12 +178,19 @@ export type Reconciler = {\n findHostInstanceWithNoPortals(component: Fiber): I | TI | null,\n };\n \n-getContextForSubtree._injectFiber(function(fiber: Fiber) {\n+function getContextForSubtree(\n+ parentComponent: ?React$Component,\n+): Object {\n+ if (!parentComponent) {\n+ return emptyObject;\n+ }\n+\n+ const fiber = ReactInstanceMap.get(parentComponent);\n const parentContext = findCurrentUnmaskedContext(fiber);\n return isContextProvider(fiber)\n ? processChildContext(fiber, parentContext)\n : parentContext;\n-});\n+}\n \n module.exports = function(\n config: HostConfig,\ndiff --git a\/src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js b\/src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js\ndeleted file mode 100644\nindex 4b6142ba27..0000000000\n--- a\/src\/renderers\/shared\/hooks\/ReactHostOperationHistoryHook.js\n+++ \/dev\/null\n@@ -1,52 +0,0 @@\n-\/**\n- * Copyright (c) 2016-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule ReactHostOperationHistoryHook\n- * @flow\n- *\/\n-\n-'use strict';\n-\n-import type {DebugID} from 'ReactInstanceType';\n-\n-export type Operation = {instanceID: DebugID} & (\n- | {type: 'mount', payload: string}\n- | {type: 'insert child', payload: {toIndex: number, content: string}}\n- | {type: 'move child', payload: {fromIndex: number, toIndex: number}}\n- | {type: 'replace children', payload: string}\n- | {type: 'replace text', payload: string}\n- | {type: 'replace with', payload: string}\n- | {type: 'update styles', payload: mixed \/* Style Object *\/}\n- | {type: 'update attribute', payload: {[name: string]: string}}\n- | {type: 'remove attribute', payload: string});\n-\n-\/\/ Trust the developer to only use this with a __DEV__ check\n-var ReactHostOperationHistoryHook = ((null: any): typeof ReactHostOperationHistoryHook);\n-\n-if (__DEV__) {\n- var history: Array = [];\n-\n- ReactHostOperationHistoryHook = {\n- onHostOperation(operation: Operation) {\n- history.push(operation);\n- },\n-\n- clearHistory(): void {\n- if (ReactHostOperationHistoryHook._preventClearing) {\n- \/\/ Should only be used for tests.\n- return;\n- }\n-\n- history = [];\n- },\n-\n- getHistory(): Array {\n- return history;\n- },\n- };\n-}\n-\n-module.exports = ReactHostOperationHistoryHook;\ndiff --git a\/src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js b\/src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js\ndeleted file mode 100644\nindex eed4c06692..0000000000\n--- a\/src\/renderers\/shared\/hooks\/ReactInvalidSetStateWarningHook.js\n+++ \/dev\/null\n@@ -1,39 +0,0 @@\n-\/**\n- * Copyright (c) 2016-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule ReactInvalidSetStateWarningHook\n- * @flow\n- *\/\n-\n-'use strict';\n-\n-var ReactInvalidSetStateWarningHook = {};\n-\n-if (__DEV__) {\n- var warning = require('fbjs\/lib\/warning');\n- var processingChildContext = false;\n-\n- var warnInvalidSetState = function() {\n- warning(\n- !processingChildContext,\n- 'setState(...): Cannot call setState() inside getChildContext()',\n- );\n- };\n-\n- ReactInvalidSetStateWarningHook = {\n- onBeginProcessingChildContext(): void {\n- processingChildContext = true;\n- },\n- onEndProcessingChildContext(): void {\n- processingChildContext = false;\n- },\n- onSetState(): void {\n- warnInvalidSetState();\n- },\n- };\n-}\n-\n-module.exports = ReactInvalidSetStateWarningHook;\ndiff --git a\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js b\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js\nindex 1e73b8e199..8b58d7b10b 100644\n--- a\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js\n+++ b\/src\/renderers\/shared\/shared\/ReactTreeTraversal.js\n@@ -12,21 +12,16 @@\n var {HostComponent} = require('ReactTypeOfWork');\n \n function getParent(inst) {\n- if (inst._hostParent !== undefined) {\n- return inst._hostParent;\n- }\n- if (typeof inst.tag === 'number') {\n- do {\n- inst = inst.return;\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. We could also go through parentNode on the\n- \/\/ host node but that wouldn't work for React Native and doesn't let us\n- \/\/ do the portal feature.\n- } while (inst && inst.tag !== HostComponent);\n- if (inst) {\n- return inst;\n- }\n+ do {\n+ inst = inst.return;\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. We could also go through parentNode on the\n+ \/\/ host node but that wouldn't work for React Native and doesn't let us\n+ \/\/ do the portal feature.\n+ } while (inst && inst.tag !== HostComponent);\n+ if (inst) {\n+ return inst;\n }\n return null;\n }\ndiff --git a\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js b\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js\nindex 975166553b..7238b3ec77 100644\n--- a\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js\n+++ b\/src\/renderers\/shared\/shared\/event\/EventPluginHub.js\n@@ -122,43 +122,20 @@ var EventPluginHub = {\n \n \/\/ TODO: shouldPreventMouseEvent is DOM-specific and definitely should not\n \/\/ live here; needs to be moved to a better place soon\n- if (typeof inst.tag === 'number') {\n- const stateNode = inst.stateNode;\n- if (!stateNode) {\n- \/\/ Work in progress (ex: onload events in incremental mode).\n- return null;\n- }\n- const props = EventPluginUtils.getFiberCurrentPropsFromNode(stateNode);\n- if (!props) {\n- \/\/ Work in progress.\n- return null;\n- }\n- listener = props[registrationName];\n- if (shouldPreventMouseEvent(registrationName, inst.type, props)) {\n- return null;\n- }\n- } else {\n- const currentElement = inst._currentElement;\n- if (\n- typeof currentElement === 'string' ||\n- typeof currentElement === 'number'\n- ) {\n- \/\/ Text node, let it bubble through.\n- return null;\n- }\n- if (!inst._rootNodeID) {\n- \/\/ If the instance is already unmounted, we have no listeners.\n- return null;\n- }\n- const props = currentElement.props;\n- listener = props[registrationName];\n- if (\n- shouldPreventMouseEvent(registrationName, currentElement.type, props)\n- ) {\n- return null;\n- }\n+ const stateNode = inst.stateNode;\n+ if (!stateNode) {\n+ \/\/ Work in progress (ex: onload events in incremental mode).\n+ return null;\n+ }\n+ const props = EventPluginUtils.getFiberCurrentPropsFromNode(stateNode);\n+ if (!props) {\n+ \/\/ Work in progress.\n+ return null;\n+ }\n+ listener = props[registrationName];\n+ if (shouldPreventMouseEvent(registrationName, inst.type, props)) {\n+ return null;\n }\n-\n invariant(\n !listener || typeof listener === 'function',\n 'Expected `%s` listener to be a function, instead got a value of `%s` type.',\ndiff --git a\/src\/renderers\/shared\/shared\/event\/PluginModuleType.js b\/src\/renderers\/shared\/shared\/event\/PluginModuleType.js\nindex c6e0bcf4ad..ad9b90e78d 100644\n--- a\/src\/renderers\/shared\/shared\/event\/PluginModuleType.js\n+++ b\/src\/renderers\/shared\/shared\/event\/PluginModuleType.js\n@@ -10,7 +10,7 @@\n \n 'use strict';\n \n-import type {ReactInstance} from 'ReactInstanceType';\n+import type {Fiber} from 'ReactFiber';\n import type {\n DispatchConfig,\n ReactSyntheticEvent,\n@@ -26,7 +26,7 @@ export type PluginModule = {\n eventTypes: EventTypes,\n extractEvents: (\n topLevelType: string,\n- targetInst: ReactInstance,\n+ targetInst: Fiber,\n nativeTarget: NativeEvent,\n nativeEventTarget: EventTarget,\n ) => null | ReactSyntheticEvent,\ndiff --git a\/src\/renderers\/shared\/shared\/event\/ReactControlledComponent.js b\/src\/renderers\/shared\/shared\/event\/ReactControlledComponent.js\nindex 520a4e8e65..45eec0c89e 100644\n--- a\/src\/renderers\/shared\/shared\/event\/ReactControlledComponent.js\n+++ b\/src\/renderers\/shared\/shared\/event\/ReactControlledComponent.js\n@@ -36,30 +36,20 @@ function restoreStateOfTarget(target) {\n \/\/ Unmounted\n return;\n }\n- if (typeof internalInstance.tag === 'number') {\n- invariant(\n- fiberHostComponent &&\n- typeof fiberHostComponent.restoreControlledState === 'function',\n- 'Fiber needs to be injected to handle a fiber target for controlled ' +\n- 'events. This error is likely caused by a bug in React. Please file an issue.',\n- );\n- const props = EventPluginUtils.getFiberCurrentPropsFromNode(\n- internalInstance.stateNode,\n- );\n- fiberHostComponent.restoreControlledState(\n- internalInstance.stateNode,\n- internalInstance.type,\n- props,\n- );\n- return;\n- }\n invariant(\n- typeof internalInstance.restoreControlledState === 'function',\n- 'The internal instance must be a React host component. ' +\n- 'This error is likely caused by a bug in React. Please file an issue.',\n+ fiberHostComponent &&\n+ typeof fiberHostComponent.restoreControlledState === 'function',\n+ 'Fiber needs to be injected to handle a fiber target for controlled ' +\n+ 'events. This error is likely caused by a bug in React. Please file an issue.',\n+ );\n+ const props = EventPluginUtils.getFiberCurrentPropsFromNode(\n+ internalInstance.stateNode,\n+ );\n+ fiberHostComponent.restoreControlledState(\n+ internalInstance.stateNode,\n+ internalInstance.type,\n+ props,\n );\n- \/\/ If it is not a Fiber, we can just use dynamic dispatch.\n- internalInstance.restoreControlledState();\n }\n \n var ReactControlledComponent = {\ndiff --git a\/src\/renderers\/shared\/shared\/event\/ReactGenericBatching.js b\/src\/renderers\/shared\/shared\/event\/ReactGenericBatching.js\nindex 97d3a37853..6517db8b3a 100644\n--- a\/src\/renderers\/shared\/shared\/event\/ReactGenericBatching.js\n+++ b\/src\/renderers\/shared\/shared\/event\/ReactGenericBatching.js\n@@ -11,30 +11,22 @@\n \n var ReactControlledComponent = require('ReactControlledComponent');\n \n-\/\/ Used as a way to call batchedUpdates when we don't know if we're in a Fiber\n-\/\/ or Stack context. Such as when we're dispatching events or if third party\n+\/\/ Used as a way to call batchedUpdates when we don't have a reference to\n+\/\/ the renderer. Such as when we're dispatching events or if third party\n \/\/ libraries need to call batchedUpdates. Eventually, this API will go away when\n \/\/ everything is batched by default. We'll then have a similar API to opt-out of\n \/\/ scheduled work and instead do synchronous work.\n \n \/\/ Defaults\n-var stackBatchedUpdates = function(fn, a, b, c, d, e) {\n- return fn(a, b, c, d, e);\n-};\n var fiberBatchedUpdates = function(fn, bookkeeping) {\n return fn(bookkeeping);\n };\n \n-function performFiberBatchedUpdates(fn, bookkeeping) {\n+function batchedUpdates(fn, bookkeeping) {\n \/\/ If we have Fiber loaded, we need to wrap this in a batching call so that\n \/\/ Fiber can apply its default priority for this call.\n return fiberBatchedUpdates(fn, bookkeeping);\n }\n-function batchedUpdates(fn, bookkeeping) {\n- \/\/ We first perform work with the stack batching strategy, by passing our\n- \/\/ indirection to it.\n- return stackBatchedUpdates(performFiberBatchedUpdates, fn, bookkeeping);\n-}\n \n var isNestingBatched = false;\n function batchedUpdatesWithControlledComponents(fn, bookkeeping) {\n@@ -58,9 +50,6 @@ function batchedUpdatesWithControlledComponents(fn, bookkeeping) {\n }\n \n var ReactGenericBatchingInjection = {\n- injectStackBatchedUpdates: function(_batchedUpdates) {\n- stackBatchedUpdates = _batchedUpdates;\n- },\n injectFiberBatchedUpdates: function(_batchedUpdates) {\n fiberBatchedUpdates = _batchedUpdates;\n },\ndiff --git a\/src\/renderers\/shared\/shared\/event\/ReactSyntheticEventType.js b\/src\/renderers\/shared\/shared\/event\/ReactSyntheticEventType.js\nindex f60f3d670a..86c8a711ae 100644\n--- a\/src\/renderers\/shared\/shared\/event\/ReactSyntheticEventType.js\n+++ b\/src\/renderers\/shared\/shared\/event\/ReactSyntheticEventType.js\n@@ -12,7 +12,7 @@\n \n 'use strict';\n \n-import type {ReactInstance} from 'ReactInstanceType';\n+import type {Fiber} from 'ReactFiber';\n \n export type DispatchConfig = {\n dependencies: Array,\n@@ -27,7 +27,7 @@ export type ReactSyntheticEvent = {\n dispatchConfig: DispatchConfig,\n getPooled: (\n dispatchConfig: DispatchConfig,\n- targetInst: ReactInstance,\n+ targetInst: Fiber,\n nativeTarget: Event,\n nativeEventTarget: EventTarget,\n ) => ReactSyntheticEvent,\ndiff --git a\/src\/renderers\/shared\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js b\/src\/renderers\/shared\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\nindex cb6fafdb77..90a7ad6d43 100644\n--- a\/src\/renderers\/shared\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\n+++ b\/src\/renderers\/shared\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\n@@ -9,6 +9,8 @@\n \n 'use strict';\n \n+var {HostComponent} = require('ReactTypeOfWork');\n+\n var EventPluginHub;\n var ResponderEventPlugin;\n \n@@ -318,35 +320,37 @@ var PARENT_HOST_NODE = {};\n var CHILD_HOST_NODE = {};\n var CHILD_HOST_NODE2 = {};\n \n+\/\/ These intentionally look like Fibers. ReactTreeTraversal depends on their field names.\n+\/\/ TODO: we could test this with regular DOM nodes (and real fibers) instead.\n var GRANDPARENT_INST = {\n- _hostParent: null,\n- _rootNodeID: '1',\n- _hostNode: GRANDPARENT_HOST_NODE,\n- _currentElement: {props: {}},\n+ return: null,\n+ tag: HostComponent,\n+ stateNode: GRANDPARENT_HOST_NODE,\n+ memoizedProps: {},\n };\n var PARENT_INST = {\n- _hostParent: GRANDPARENT_INST,\n- _rootNodeID: '2',\n- _hostNode: PARENT_HOST_NODE,\n- _currentElement: {props: {}},\n+ return: GRANDPARENT_INST,\n+ tag: HostComponent,\n+ stateNode: PARENT_HOST_NODE,\n+ memoizedProps: {},\n };\n var CHILD_INST = {\n- _hostParent: PARENT_INST,\n- _rootNodeID: '3',\n- _hostNode: CHILD_HOST_NODE,\n- _currentElement: {props: {}},\n+ return: PARENT_INST,\n+ tag: HostComponent,\n+ stateNode: CHILD_HOST_NODE,\n+ memoizedProps: {},\n };\n var CHILD_INST2 = {\n- _hostParent: PARENT_INST,\n- _rootNodeID: '4',\n- _hostNode: CHILD_HOST_NODE2,\n- _currentElement: {props: {}},\n+ return: PARENT_INST,\n+ tag: HostComponent,\n+ stateNode: CHILD_HOST_NODE2,\n+ memoizedProps: {},\n };\n \n-GRANDPARENT_HOST_NODE._reactInstance = GRANDPARENT_INST;\n-PARENT_HOST_NODE._reactInstance = PARENT_INST;\n-CHILD_HOST_NODE._reactInstance = CHILD_INST;\n-CHILD_HOST_NODE2._reactInstance = CHILD_INST2;\n+GRANDPARENT_HOST_NODE.testInstance = GRANDPARENT_INST;\n+PARENT_HOST_NODE.testInstance = PARENT_INST;\n+CHILD_HOST_NODE.testInstance = CHILD_INST;\n+CHILD_HOST_NODE2.testInstance = CHILD_INST2;\n \n var three = {\n grandParent: GRANDPARENT_HOST_NODE,\n@@ -361,19 +365,23 @@ var siblings = {\n };\n \n function getInstanceFromNode(node) {\n- return node._reactInstance;\n+ return node.testInstance;\n }\n \n function getNodeFromInstance(inst) {\n- return inst._hostNode;\n+ return inst.stateNode;\n+}\n+\n+function getFiberCurrentPropsFromNode(node) {\n+ return node.testInstance.memoizedProps;\n }\n \n-function putListener(node, registrationName, handler) {\n- node._currentElement.props[registrationName] = handler;\n+function putListener(instance, registrationName, handler) {\n+ instance.memoizedProps[registrationName] = handler;\n }\n \n-function deleteAllListeners(node) {\n- node._currentElement.props = {};\n+function deleteAllListeners(instance) {\n+ instance.memoizedProps = {};\n }\n \n describe('ResponderEventPlugin', () => {\n@@ -398,6 +406,7 @@ describe('ResponderEventPlugin', () => {\n injectComponentTree({\n getInstanceFromNode,\n getNodeFromInstance,\n+ getFiberCurrentPropsFromNode,\n });\n });\n \ndiff --git a\/src\/renderers\/shared\/shared\/getContextForSubtree.js b\/src\/renderers\/shared\/shared\/getContextForSubtree.js\ndeleted file mode 100644\nindex 027e63a2e5..0000000000\n--- a\/src\/renderers\/shared\/shared\/getContextForSubtree.js\n+++ \/dev\/null\n@@ -1,39 +0,0 @@\n-\/**\n- * Copyright (c) 2013-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule getContextForSubtree\n- * @flow\n- *\/\n-\n-const ReactInstanceMap = require('ReactInstanceMap');\n-\n-const emptyObject = require('fbjs\/lib\/emptyObject');\n-const invariant = require('fbjs\/lib\/invariant');\n-\n-let getContextFiber = function(arg) {\n- invariant(false, 'Missing injection for fiber getContextForSubtree');\n-};\n-\n-function getContextForSubtree(\n- parentComponent: ?React$Component,\n-): Object {\n- if (!parentComponent) {\n- return emptyObject;\n- }\n-\n- const instance = ReactInstanceMap.get(parentComponent);\n- if (typeof instance.tag === 'number') {\n- return getContextFiber(instance);\n- } else {\n- return instance._processChildContext(instance._context);\n- }\n-}\n-\n-getContextForSubtree._injectFiber = function(fn) {\n- getContextFiber = fn;\n-};\n-\n-module.exports = getContextForSubtree;\ndiff --git a\/src\/shared\/ReactInstanceType.js b\/src\/shared\/ReactInstanceType.js\ndeleted file mode 100644\nindex ed29794f1b..0000000000\n--- a\/src\/shared\/ReactInstanceType.js\n+++ \/dev\/null\n@@ -1,27 +0,0 @@\n-\/**\n- * Copyright (c) 2016-present, Facebook, Inc.\n- *\n- * This source code is licensed under the MIT license found in the\n- * LICENSE file in the root directory of this source tree.\n- *\n- * @providesModule ReactInstanceType\n- * @flow\n- *\/\n-\n-'use strict';\n-\n-\/\/ TODO: delete this file.\n-\/\/ It was only necessary for Stack.\n-\n-import type {ReactElement} from 'ReactElementType';\n-\n-export type DebugID = number;\n-\n-export type ReactInstance = {\n- mountComponent: any,\n- unmountComponent: any,\n- receiveComponent: any,\n- getName: () => string,\n- getPublicInstance: any,\n- _currentElement: ReactElement,\n-};\ndiff --git a\/src\/shared\/utils\/getComponentName.js b\/src\/shared\/utils\/getComponentName.js\nindex 772949d19d..5a3b00ec29 100644\n--- a\/src\/shared\/utils\/getComponentName.js\n+++ b\/src\/shared\/utils\/getComponentName.js\n@@ -10,27 +10,15 @@\n \n 'use strict';\n \n-import type {ReactInstance} from 'ReactInstanceType';\n import type {Fiber} from 'ReactFiber';\n \n-function getComponentName(\n- instanceOrFiber: ReactInstance | Fiber,\n-): string | null {\n- if (typeof instanceOrFiber.getName === 'function') {\n- \/\/ Stack reconciler\n- const instance = ((instanceOrFiber: any): ReactInstance);\n- return instance.getName();\n+function getComponentName(fiber: Fiber): string | null {\n+ const {type} = fiber;\n+ if (typeof type === 'string') {\n+ return type;\n }\n- if (typeof instanceOrFiber.tag === 'number') {\n- \/\/ Fiber reconciler\n- const fiber = ((instanceOrFiber: any): Fiber);\n- const {type} = fiber;\n- if (typeof type === 'string') {\n- return type;\n- }\n- if (typeof type === 'function') {\n- return type.displayName || type.name;\n- }\n+ if (typeof type === 'function') {\n+ return type.displayName || type.name;\n }\n return null;\n }\n","parents":["df445270a66b0894cce463885cd8fa32476fb0d5"]}

dillon1000/react

Files changed