{"patch":"diff --git a\/flow\/react-native-host-hooks.js b\/flow\/react-native-host-hooks.js\nindex b52951fcd3..0f96747133 100644\n--- a\/flow\/react-native-host-hooks.js\n+++ b\/flow\/react-native-host-hooks.js\n@@ -29,16 +29,35 @@ declare module 'TextInputState' {\n declare module 'UIManager' {\n declare var customBubblingEventTypes : Object;\n declare var customDirectEventTypes : Object;\n- declare function createView() : void;\n- declare function manageChildren() : void;\n+ declare function createView(\n+ reactTag : number,\n+ viewName : string,\n+ rootTag : number,\n+ props : ?Object,\n+ ) : void;\n+ declare function manageChildren(\n+ containerTag : number,\n+ moveFromIndices : Array,\n+ moveToIndices : Array,\n+ addChildReactTags : Array,\n+ addAtIndices : Array,\n+ removeAtIndices : Array\n+ ) : void;\n declare function measure() : void;\n declare function measureInWindow() : void;\n declare function measureLayout() : void;\n declare function removeRootView() : void;\n declare function removeSubviewsFromContainerWithID() : void;\n declare function replaceExistingNonRootView() : void;\n- declare function setChildren() : void;\n- declare function updateView() : void;\n+ declare function setChildren(\n+ containerTag : number,\n+ reactTags : Array,\n+ ) : void;\n+ declare function updateView(\n+ reactTag : number,\n+ viewName : string,\n+ props : ?Object,\n+ ) : void;\n }\n declare module 'View' {\n declare var exports : typeof ReactComponent;\ndiff --git a\/src\/renderers\/native\/NativeMethodsMixin.js b\/src\/renderers\/native\/NativeMethodsMixin.js\nindex 5bc75fc332..e212f7ed30 100644\n--- a\/src\/renderers\/native\/NativeMethodsMixin.js\n+++ b\/src\/renderers\/native\/NativeMethodsMixin.js\n@@ -150,7 +150,7 @@ var NativeMethodsMixin = {\n );\n \n UIManager.updateView(\n- findNodeHandle(this),\n+ (findNodeHandle(this) : any),\n this.viewConfig.uiViewClassName,\n updatePayload\n );\ndiff --git a\/src\/renderers\/native\/ReactNative.js b\/src\/renderers\/native\/ReactNative.js\nindex 6112e9045b..27c56d54ba 100644\n--- a\/src\/renderers\/native\/ReactNative.js\n+++ b\/src\/renderers\/native\/ReactNative.js\n@@ -11,67 +11,5 @@\n *\/\n 'use strict';\n \n-\/\/ Require ReactNativeDefaultInjection first for its side effects of setting up\n-\/\/ the JS environment\n-var ReactNativeComponentTree = require('ReactNativeComponentTree');\n-var ReactNativeInjection = require('ReactNativeInjection');\n-var ReactNativeStackInjection = require('ReactNativeStackInjection');\n-\n-var ReactNativeMount = require('ReactNativeMount');\n-var ReactUpdates = require('ReactUpdates');\n-\n-var findNodeHandle = require('findNodeHandle');\n-\n-ReactNativeInjection.inject();\n-ReactNativeStackInjection.inject();\n-\n-var render = function(\n- element: ReactElement,\n- mountInto: number,\n- callback?: ?(() => void)\n-): ?ReactComponent {\n- return ReactNativeMount.renderComponent(element, mountInto, callback);\n-};\n-\n-var ReactNative = {\n- hasReactNativeInitialized: false,\n- findNodeHandle: findNodeHandle,\n- render: render,\n- unmountComponentAtNode: ReactNativeMount.unmountComponentAtNode,\n-\n- \/* eslint-disable camelcase *\/\n- unstable_batchedUpdates: ReactUpdates.batchedUpdates,\n- \/* eslint-enable camelcase *\/\n-\n- unmountComponentAtNodeAndRemoveContainer: ReactNativeMount.unmountComponentAtNodeAndRemoveContainer,\n-};\n-\n-\/\/ Inject the runtime into a devtools global hook regardless of browser.\n-\/\/ Allows for debugging when the hook is injected on the page.\n-\/* globals __REACT_DEVTOOLS_GLOBAL_HOOK__ *\/\n-if (\n- typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined' &&\n- typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function') {\n- __REACT_DEVTOOLS_GLOBAL_HOOK__.inject({\n- ComponentTree: {\n- getClosestInstanceFromNode: function(node) {\n- return ReactNativeComponentTree.getClosestInstanceFromNode(node);\n- },\n- getNodeFromInstance: function(inst) {\n- \/\/ inst is an internal instance (but could be a composite)\n- while (inst._renderedComponent) {\n- inst = inst._renderedComponent;\n- }\n- if (inst) {\n- return ReactNativeComponentTree.getNodeFromInstance(inst);\n- } else {\n- return null;\n- }\n- },\n- },\n- Mount: ReactNativeMount,\n- Reconciler: require('ReactReconciler'),\n- });\n-}\n-\n-module.exports = ReactNative;\n+\/\/ TODO (bvaughn) Enable Fiber experiement via ReactNativeFeatureFlags\n+module.exports = require('ReactNativeStack');\ndiff --git a\/src\/renderers\/native\/ReactNativeComponentTree.js b\/src\/renderers\/native\/ReactNativeComponentTree.js\nindex 7b16b8512a..e95932a036 100644\n--- a\/src\/renderers\/native\/ReactNativeComponentTree.js\n+++ b\/src\/renderers\/native\/ReactNativeComponentTree.js\n@@ -39,6 +39,10 @@ function precacheNode(inst, tag) {\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@@ -46,21 +50,29 @@ function uncacheNode(inst) {\n }\n }\n \n+function uncacheFiberNode(tag) {\n+ delete instanceCache[tag];\n+}\n+\n function getInstanceFromTag(tag) {\n return instanceCache[tag] || null;\n }\n \n function getTagFromInstance(inst) {\n- invariant(inst._rootNodeID, 'All native instances should have a tag.');\n- return inst._rootNodeID;\n+ \/\/ TODO (bvaughn) Clean up once Stack is deprecated\n+ var tag = inst._rootNodeID || inst.stateNode._nativeTag;\n+ invariant(tag, 'All native instances should have a tag.');\n+ return tag;\n }\n \n var ReactNativeComponentTree = {\n getClosestInstanceFromNode: getInstanceFromTag,\n getInstanceFromNode: getInstanceFromTag,\n getNodeFromInstance: getTagFromInstance,\n- precacheNode: precacheNode,\n- uncacheNode: uncacheNode,\n+ precacheFiberNode,\n+ precacheNode,\n+ uncacheFiberNode,\n+ uncacheNode,\n };\n \n module.exports = ReactNativeComponentTree;\ndiff --git a\/src\/renderers\/native\/ReactNativeFeatureFlags.js b\/src\/renderers\/native\/ReactNativeFeatureFlags.js\nnew file mode 100644\nindex 0000000000..1686eec51a\n--- \/dev\/null\n+++ b\/src\/renderers\/native\/ReactNativeFeatureFlags.js\n@@ -0,0 +1,18 @@\n+\/**\n+ * Copyright 2013-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactNativeFeatureFlags\n+ *\/\n+\n+'use strict';\n+\n+var ReactNativeFeatureFlags = {\n+ useFiber: false,\n+};\n+\n+module.exports = ReactNativeFeatureFlags;\ndiff --git a\/src\/renderers\/native\/ReactNativeFiber.js b\/src\/renderers\/native\/ReactNativeFiber.js\nnew file mode 100644\nindex 0000000000..d11438a114\n--- \/dev\/null\n+++ b\/src\/renderers\/native\/ReactNativeFiber.js\n@@ -0,0 +1,395 @@\n+\/**\n+ * Copyright 2013-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactNativeFiber\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+import type { Element } from 'React';\n+import type { Fiber } from 'ReactFiber';\n+import type { ReactNodeList } from 'ReactTypes';\n+import type { ReactNativeBaseComponentViewConfig } from 'ReactNativeViewConfigRegistry';\n+\n+const NativeMethodsMixin = require('NativeMethodsMixin');\n+const ReactFiberReconciler = require('ReactFiberReconciler');\n+const ReactGenericBatching = require('ReactGenericBatching');\n+const ReactNativeAttributePayload = require('ReactNativeAttributePayload');\n+const ReactNativeComponentTree = require('ReactNativeComponentTree');\n+const ReactNativeInjection = require('ReactNativeInjection');\n+const ReactNativeTagHandles = require('ReactNativeTagHandles');\n+const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');\n+const ReactPortal = require('ReactPortal');\n+const UIManager = require('UIManager');\n+\n+const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');\n+const findNodeHandle = require('findNodeHandle');\n+const invariant = require('invariant');\n+\n+const { precacheFiberNode, uncacheFiberNode } = ReactNativeComponentTree;\n+\n+ReactNativeInjection.inject();\n+\n+type Container = number;\n+type Instance = {\n+ _children: Array,\n+ _nativeTag: number,\n+ viewConfig: ReactNativeBaseComponentViewConfig,\n+};\n+type Props = Object;\n+type TextInstance = number;\n+\n+function NativeHostComponent(tag, viewConfig) {\n+ this._nativeTag = tag;\n+ this._children = [];\n+ this.viewConfig = viewConfig;\n+}\n+Object.assign(NativeHostComponent.prototype, NativeMethodsMixin);\n+\n+function recursivelyUncacheFiberNode(node : Instance | TextInstance) {\n+ if (typeof node === 'number') { \/\/ Leaf node (eg text)\n+ uncacheFiberNode(node);\n+ } else {\n+ uncacheFiberNode((node : any)._nativeTag);\n+\n+ (node : any)._children.forEach(recursivelyUncacheFiberNode);\n+ }\n+}\n+\n+const NativeRenderer = ReactFiberReconciler({\n+ appendChild(\n+ parentInstance : Instance | Container,\n+ child : Instance | TextInstance\n+ ) : void {\n+ if (typeof parentInstance === 'number') {\n+ \/\/ Root container\n+ UIManager.setChildren(\n+ parentInstance, \/\/ containerTag\n+ [(child : any)._nativeTag] \/\/ reactTags\n+ );\n+ } else {\n+ const children = parentInstance._children;\n+\n+ children.push(child);\n+\n+ UIManager.manageChildren(\n+ parentInstance._nativeTag, \/\/ containerTag\n+ [], \/\/ moveFromIndices\n+ [], \/\/ moveToIndices\n+ [(child : any)._nativeTag], \/\/ addChildReactTags\n+ [children.length - 1], \/\/ addAtIndices\n+ [], \/\/ removeAtIndices\n+ );\n+ }\n+ },\n+\n+ appendInitialChild(parentInstance : Instance, child : Instance | TextInstance) : void {\n+ if (typeof child === 'number') {\n+ parentInstance._children.push(child);\n+ } else {\n+ parentInstance._children.push(child);\n+ }\n+ },\n+\n+ commitTextUpdate(\n+ textInstance : TextInstance,\n+ oldText : string,\n+ newText : string\n+ ) : void {\n+ UIManager.updateView(\n+ textInstance, \/\/ reactTag\n+ 'RCTRawText', \/\/ viewName\n+ {text: newText}, \/\/ props\n+ );\n+ },\n+\n+ commitUpdate(\n+ instance : Instance,\n+ type : string,\n+ oldProps : Props,\n+ newProps : Props,\n+ rootContainerInstance : Object,\n+ internalInstanceHandle : Object\n+ ) : void {\n+ const viewConfig = instance.viewConfig;\n+\n+ precacheFiberNode(internalInstanceHandle, instance._nativeTag);\n+\n+ const updatePayload = ReactNativeAttributePayload.diff(\n+ oldProps,\n+ newProps,\n+ viewConfig.validAttributes\n+ );\n+\n+ UIManager.updateView(\n+ (instance : any)._nativeTag, \/\/ reactTag\n+ viewConfig.uiViewClassName, \/\/ viewName\n+ updatePayload, \/\/ props\n+ );\n+ },\n+\n+ createInstance(\n+ type : string,\n+ props : Props,\n+ rootContainerInstance : Container,\n+ hostContext : string | null,\n+ internalInstanceHandle : Object\n+ ) : Instance {\n+ const tag = ReactNativeTagHandles.allocateTag();\n+ const viewConfig = ReactNativeViewConfigRegistry.get(type);\n+\n+ if (__DEV__) {\n+ for (let key in viewConfig.validAttributes) {\n+ if (props.hasOwnProperty(key)) {\n+ deepFreezeAndThrowOnMutationInDev(props[key]);\n+ }\n+ }\n+ }\n+\n+ const updatePayload = ReactNativeAttributePayload.create(\n+ props,\n+ viewConfig.validAttributes\n+ );\n+\n+ UIManager.createView(\n+ tag, \/\/ reactTag\n+ viewConfig.uiViewClassName, \/\/ viewName\n+ rootContainerInstance, \/\/ rootTag\n+ updatePayload, \/\/ props\n+ );\n+\n+ const component = new NativeHostComponent(tag, viewConfig);\n+\n+ precacheFiberNode(internalInstanceHandle, tag);\n+\n+ return component;\n+ },\n+\n+ createTextInstance(\n+ text : string,\n+ rootContainerInstance : Container,\n+ internalInstanceHandle : Object,\n+ ) : TextInstance {\n+ const tag = ReactNativeTagHandles.allocateTag();\n+\n+ UIManager.createView(\n+ tag, \/\/ reactTag\n+ 'RCTRawText', \/\/ viewName\n+ rootContainerInstance, \/\/ rootTag\n+ {text: text} \/\/ props\n+ );\n+\n+ precacheFiberNode(internalInstanceHandle, tag);\n+\n+ return tag;\n+ },\n+\n+ finalizeInitialChildren(\n+ parentInstance : Instance,\n+ type : string,\n+ props : Props,\n+ rootContainerInstance : Container,\n+ ) : void {\n+ \/\/ Map from child objects to native tags.\n+ \/\/ Either way we need to pass a copy of the Array to prevent it from being frozen.\n+ const nativeTags = parentInstance._children.map(\n+ (child) => typeof child === 'number'\n+ ? child \/\/ Leaf node (eg text)\n+ : child._nativeTag\n+ );\n+\n+ UIManager.setChildren(\n+ parentInstance._nativeTag, \/\/ containerTag\n+ nativeTags \/\/ reactTags\n+ );\n+ },\n+\n+ getChildHostContext(\n+ parentHostContext : string | null,\n+ type : string\n+ ) {\n+ return parentHostContext;\n+ },\n+\n+ insertBefore(\n+ parentInstance : Instance | Container,\n+ child : Instance | TextInstance,\n+ beforeChild : Instance | TextInstance\n+ ) : void {\n+ \/\/ TODO (bvaughn): Remove this check when...\n+ \/\/ We create a wrapper object for the container in ReactNative render()\n+ \/\/ Or we refactor to remove wrapper objects entirely.\n+ \/\/ For more info on pros\/cons see PR #8560 description.\n+ invariant(\n+ typeof parentInstance !== 'number',\n+ 'Container does not support insertBefore operation',\n+ );\n+\n+ const children = (parentInstance : any)._children;\n+\n+ const beforeChildIndex = children.indexOf(beforeChild);\n+ const index = children.indexOf(child);\n+\n+ \/\/ Move existing child or add new child?\n+ if (index >= 0) {\n+ children.splice(index, 1);\n+ children.splice(beforeChildIndex, 0, child);\n+\n+ UIManager.manageChildren(\n+ (parentInstance : any)._nativeTag, \/\/ containerID\n+ [index], \/\/ moveFromIndices\n+ [beforeChildIndex], \/\/ moveToIndices\n+ [], \/\/ addChildReactTags\n+ [], \/\/ addAtIndices\n+ [], \/\/ removeAtIndices\n+ );\n+ } else {\n+ children.splice(beforeChildIndex, 0, child);\n+\n+ UIManager.manageChildren(\n+ (parentInstance : any)._nativeTag, \/\/ containerID\n+ [], \/\/ moveFromIndices\n+ [], \/\/ moveToIndices\n+ [(child : any)._nativeTag], \/\/ addChildReactTags\n+ [beforeChildIndex], \/\/ addAtIndices\n+ [], \/\/ removeAtIndices\n+ );\n+ }\n+ },\n+\n+ prepareForCommit() : void {\n+ \/\/ Noop\n+ },\n+\n+ prepareUpdate(\n+ instance : Instance,\n+ type : string,\n+ oldProps : Props,\n+ newProps : Props\n+ ) : boolean {\n+ return true;\n+ },\n+\n+ removeChild(\n+ parentInstance : Instance | Container,\n+ child : Instance | TextInstance\n+ ) : void {\n+ recursivelyUncacheFiberNode(child);\n+\n+ if (typeof parentInstance === 'number') {\n+ UIManager.manageChildren(\n+ parentInstance, \/\/ containerID\n+ [], \/\/ moveFromIndices\n+ [], \/\/ moveToIndices\n+ [], \/\/ addChildReactTags\n+ [], \/\/ addAtIndices\n+ [0], \/\/ removeAtIndices\n+ );\n+ } else {\n+ const children = parentInstance._children;\n+ const index = children.indexOf(child);\n+\n+ children.splice(index, 1);\n+\n+ UIManager.manageChildren(\n+ parentInstance._nativeTag, \/\/ containerID\n+ [], \/\/ moveFromIndices\n+ [], \/\/ moveToIndices\n+ [], \/\/ addChildReactTags\n+ [], \/\/ addAtIndices\n+ [index], \/\/ removeAtIndices\n+ );\n+ }\n+ },\n+\n+ resetAfterCommit() : void {\n+ \/\/ Noop\n+ },\n+\n+ resetTextContent(instance : Instance) : void {\n+ \/\/ Noop\n+ },\n+\n+ scheduleAnimationCallback: global.requestAnimationFrame,\n+\n+ scheduleDeferredCallback: global.requestIdleCallback,\n+\n+ shouldSetTextContent(props : Props) : boolean {\n+ \/\/ TODO (bvaughn) Revisit this decision.\n+ \/\/ Always returning false simplifies the createInstance() implementation,\n+ \/\/ But creates an additional child Fiber for raw text children.\n+ \/\/ No additional native views are created though.\n+ \/\/ It's not clear to me which is better so I'm deferring for now.\n+ \/\/ More context @ github.com\/facebook\/react\/pull\/8560#discussion_r92111303 \n+ return false;\n+ },\n+\n+ useSyncScheduling: true,\n+});\n+\n+ReactGenericBatching.injection.injectFiberBatchedUpdates(\n+ NativeRenderer.batchedUpdates\n+);\n+\n+const roots = new Map();\n+\n+findNodeHandle.injection.injectFindNode(\n+ (fiber: Fiber) => {\n+ const instance: any = NativeRenderer.findHostInstance(fiber);\n+ return instance ? instance._nativeTag : null;\n+ }\n+);\n+findNodeHandle.injection.injectFindRootNodeID(\n+ (instance) => instance._nativeTag\n+);\n+\n+const ReactNative = {\n+ findNodeHandle,\n+\n+ render(element : Element, containerTag : any, callback: ?Function) {\n+ let root = roots.get(containerTag);\n+\n+ if (!root) {\n+ \/\/ TODO (bvaughn): If we decide to keep the wrapper component,\n+ \/\/ We could create a wrapper for containerTag as well to reduce special casing.\n+ root = NativeRenderer.mountContainer(element, containerTag, null, callback);\n+\n+ roots.set(containerTag, root);\n+ } else {\n+ NativeRenderer.updateContainer(element, root, null, callback);\n+ }\n+\n+ return NativeRenderer.getPublicRootInstance(root);\n+ },\n+\n+ unmountComponentAtNode(containerTag : number) {\n+ const root = roots.get(containerTag);\n+ if (root) {\n+ \/\/ TODO: Is it safe to reset this now or should I wait since this unmount could be deferred?\n+ roots.delete(containerTag);\n+ NativeRenderer.unmountContainer(root);\n+ }\n+ },\n+\n+ unmountComponentAtNodeAndRemoveContainer(containerTag: number) {\n+ ReactNative.unmountComponentAtNode(containerTag);\n+\n+ \/\/ Call back into native to remove all of the subviews from this container\n+ UIManager.removeRootView(containerTag);\n+ },\n+\n+ unstable_createPortal(children: ReactNodeList, containerTag : number, key : ?string = null) {\n+ return ReactPortal.createPortal(children, containerTag, null, key);\n+ },\n+\n+ unstable_batchedUpdates: ReactGenericBatching.batchedUpdates,\n+\n+};\n+\n+module.exports = ReactNative;\ndiff --git a\/src\/renderers\/native\/ReactNativeGlobalResponderHandler.js b\/src\/renderers\/native\/ReactNativeGlobalResponderHandler.js\nindex 84bd45fb6f..4efacfd829 100644\n--- a\/src\/renderers\/native\/ReactNativeGlobalResponderHandler.js\n+++ b\/src\/renderers\/native\/ReactNativeGlobalResponderHandler.js\n@@ -15,8 +15,9 @@ var UIManager = require('UIManager');\n var ReactNativeGlobalResponderHandler = {\n onChange: function(from, to, blockNativeResponder) {\n if (to !== null) {\n+ \/\/ TODO (bvaughn) Clean up once Stack is deprecated\n UIManager.setJSResponder(\n- to._rootNodeID,\n+ to._rootNodeID || to.stateNode._nativeTag,\n blockNativeResponder\n );\n } else {\ndiff --git a\/src\/renderers\/native\/ReactNativeStack.js b\/src\/renderers\/native\/ReactNativeStack.js\nnew file mode 100644\nindex 0000000000..55cf71fa1c\n--- \/dev\/null\n+++ b\/src\/renderers\/native\/ReactNativeStack.js\n@@ -0,0 +1,81 @@\n+\/**\n+ * Copyright (c) 2015-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactNativeStack\n+ * @flow\n+ *\/\n+'use strict';\n+\n+var ReactNativeComponentTree = require('ReactNativeComponentTree');\n+var ReactNativeInjection = require('ReactNativeInjection');\n+var ReactNativeStackInjection = require('ReactNativeStackInjection');\n+var ReactNativeMount = require('ReactNativeMount');\n+var ReactUpdates = require('ReactUpdates');\n+\n+var findNodeHandle = require('findNodeHandle');\n+\n+ReactNativeInjection.inject();\n+ReactNativeStackInjection.inject();\n+\n+var render = function(\n+ element: ReactElement,\n+ mountInto: number,\n+ callback?: ?(() => void)\n+): ?ReactComponent {\n+ return ReactNativeMount.renderComponent(element, mountInto, callback);\n+};\n+\n+findNodeHandle.injection.injectFindNode(\n+ (instance) => instance.getHostNode()\n+);\n+findNodeHandle.injection.injectFindRootNodeID(\n+ (instance) => instance._rootNodeID\n+);\n+\n+var ReactNative = {\n+ hasReactNativeInitialized: false,\n+ findNodeHandle: findNodeHandle,\n+ render: render,\n+ unmountComponentAtNode: ReactNativeMount.unmountComponentAtNode,\n+\n+ \/* eslint-disable camelcase *\/\n+ unstable_batchedUpdates: ReactUpdates.batchedUpdates,\n+ \/* eslint-enable camelcase *\/\n+\n+ unmountComponentAtNodeAndRemoveContainer: ReactNativeMount.unmountComponentAtNodeAndRemoveContainer,\n+};\n+\n+\/\/ Inject the runtime into a devtools global hook regardless of browser.\n+\/\/ Allows for debugging when the hook is injected on the page.\n+\/* globals __REACT_DEVTOOLS_GLOBAL_HOOK__ *\/\n+if (\n+ typeof __REACT_DEVTOOLS_GLOBAL_HOOK__ !== 'undefined' &&\n+ typeof __REACT_DEVTOOLS_GLOBAL_HOOK__.inject === 'function') {\n+ __REACT_DEVTOOLS_GLOBAL_HOOK__.inject({\n+ ComponentTree: {\n+ getClosestInstanceFromNode: function(node) {\n+ return ReactNativeComponentTree.getClosestInstanceFromNode(node);\n+ },\n+ getNodeFromInstance: function(inst) {\n+ \/\/ inst is an internal instance (but could be a composite)\n+ while (inst._renderedComponent) {\n+ inst = inst._renderedComponent;\n+ }\n+ if (inst) {\n+ return ReactNativeComponentTree.getNodeFromInstance(inst);\n+ } else {\n+ return null;\n+ }\n+ },\n+ },\n+ Mount: ReactNativeMount,\n+ Reconciler: require('ReactReconciler'),\n+ });\n+}\n+\n+module.exports = ReactNative;\ndiff --git a\/src\/renderers\/native\/ReactNativeStackInjection.js b\/src\/renderers\/native\/ReactNativeStackInjection.js\nindex 8b85a67e9b..90b912c020 100644\n--- a\/src\/renderers\/native\/ReactNativeStackInjection.js\n+++ b\/src\/renderers\/native\/ReactNativeStackInjection.js\n@@ -30,6 +30,7 @@ var ReactNativeTextComponent = require('ReactNativeTextComponent');\n var ReactSimpleEmptyComponent = require('ReactSimpleEmptyComponent');\n var ReactUpdates = require('ReactUpdates');\n \n+var findNodeHandle = require('findNodeHandle');\n var invariant = require('invariant');\n \n function inject() {\n@@ -61,6 +62,13 @@ function inject() {\n );\n };\n \n+ findNodeHandle.injection.injectFindNode(\n+ (instance) => instance.getHostNode()\n+ );\n+ findNodeHandle.injection.injectFindRootNodeID(\n+ (instance) => instance._rootNodeID\n+ );\n+\n ReactEmptyComponent.injection.injectEmptyComponentFactory(EmptyComponent);\n \n ReactHostComponent.injection.injectTextComponentClass(\ndiff --git a\/src\/renderers\/native\/ReactNativeViewConfigRegistry.js b\/src\/renderers\/native\/ReactNativeViewConfigRegistry.js\nnew file mode 100644\nindex 0000000000..383ee8bba2\n--- \/dev\/null\n+++ b\/src\/renderers\/native\/ReactNativeViewConfigRegistry.js\n@@ -0,0 +1,50 @@\n+\/**\n+ * Copyright (c) 2015-present, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\n+ * @providesModule ReactNativeViewConfigRegistry\n+ * @flow\n+ *\/\n+\n+'use strict';\n+\n+const invariant = require('invariant');\n+\n+export type ReactNativeBaseComponentViewConfig = {\n+ validAttributes: Object,\n+ uiViewClassName: string,\n+ propTypes?: Object,\n+};\n+\n+const viewConfigs = new Map();\n+\n+const prefix = 'topsecret-';\n+\n+const ReactNativeViewConfigRegistry = {\n+ register(viewConfig : ReactNativeBaseComponentViewConfig) {\n+ const name = viewConfig.uiViewClassName;\n+ invariant(\n+ !viewConfigs.has(name),\n+ 'Tried to register two views with the same name %s',\n+ name\n+ );\n+ const secretName = prefix + name;\n+ viewConfigs.set(secretName, viewConfig);\n+ return secretName;\n+ },\n+ get(secretName: string) {\n+ const config = viewConfigs.get(secretName);\n+ invariant(\n+ config,\n+ 'View config not found for name %s',\n+ secretName\n+ );\n+ return config;\n+ },\n+};\n+\n+module.exports = ReactNativeViewConfigRegistry;\ndiff --git a\/src\/renderers\/native\/__mocks__\/ReactNative.js b\/src\/renderers\/native\/__mocks__\/ReactNative.js\nnew file mode 100644\nindex 0000000000..ce5f605038\n--- \/dev\/null\n+++ b\/src\/renderers\/native\/__mocks__\/ReactNative.js\n@@ -0,0 +1,16 @@\n+\/**\n+ * Copyright 2013-2015, Facebook, Inc.\n+ * All rights reserved.\n+ *\n+ * This source code is licensed under the BSD-style license found in the\n+ * LICENSE file in the root directory of this source tree. An additional grant\n+ * of patent rights can be found in the PATENTS file in the same directory.\n+ *\/\n+\n+'use strict';\n+\n+const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');\n+\n+module.exports = ReactNativeFeatureFlags.useFiber\n+ ? require('ReactNativeFiber')\n+ : require('ReactNativeStack');\ndiff --git a\/src\/renderers\/native\/createReactNativeComponentClass.js b\/src\/renderers\/native\/createReactNativeComponentClass.js\nindex e5f113bf0b..0d560c0553 100644\n--- a\/src\/renderers\/native\/createReactNativeComponentClass.js\n+++ b\/src\/renderers\/native\/createReactNativeComponentClass.js\n@@ -12,23 +12,35 @@\n \n 'use strict';\n \n-var ReactNativeBaseComponent = require('ReactNativeBaseComponent');\n+const ReactNativeBaseComponent = require('ReactNativeBaseComponent');\n+const ReactNativeViewConfigRegistry = require('ReactNativeViewConfigRegistry');\n+const ReactNativeFeatureFlags = require('ReactNativeFeatureFlags');\n \n \/\/ See also ReactNativeBaseComponent\n type ReactNativeBaseComponentViewConfig = {\n validAttributes: Object,\n uiViewClassName: string,\n propTypes?: Object,\n-}\n+};\n+\n+\/**\n+ * @param {string} config iOS View configuration.\n+ * @private\n+ *\/\n+const createReactNativeFiberComponentClass = function(\n+ viewConfig: ReactNativeBaseComponentViewConfig\n+): string {\n+ return ReactNativeViewConfigRegistry.register(viewConfig);\n+};\n \n \/**\n * @param {string} config iOS View configuration.\n * @private\n *\/\n-var createReactNativeComponentClass = function(\n+const createReactNativeComponentClass = function(\n viewConfig: ReactNativeBaseComponentViewConfig\n ): ReactClass {\n- var Constructor = function(element) {\n+ const Constructor = function(element) {\n this._currentElement = element;\n this._topLevelWrapper = null;\n this._hostParent = null;\n@@ -45,4 +57,6 @@ var createReactNativeComponentClass = function(\n return ((Constructor: any): ReactClass);\n };\n \n-module.exports = createReactNativeComponentClass;\n+module.exports = ReactNativeFeatureFlags.useFiber\n+ ? createReactNativeFiberComponentClass\n+ : createReactNativeComponentClass;\ndiff --git a\/src\/renderers\/native\/findNodeHandle.js b\/src\/renderers\/native\/findNodeHandle.js\nindex aca064b529..345700f1c0 100644\n--- a\/src\/renderers\/native\/findNodeHandle.js\n+++ b\/src\/renderers\/native\/findNodeHandle.js\n@@ -50,6 +50,9 @@ import type { ReactInstance } from 'ReactInstanceType';\n * nodeHandle N\/A rootNodeID tag\n *\/\n \n+let injectedFindNode;\n+let injectedFindRootNodeID;\n+\n function findNodeHandle(componentOrHandle: any): ?number {\n if (__DEV__) {\n \/\/ TODO: fix this unsafe cast to work with Fiber.\n@@ -82,9 +85,9 @@ function findNodeHandle(componentOrHandle: any): ?number {\n \/\/ ReactInstanceMap.get here will always succeed for mounted components\n var internalInstance = ReactInstanceMap.get(component);\n if (internalInstance) {\n- return internalInstance.getHostNode();\n+ return injectedFindNode(internalInstance);\n } else {\n- var rootNodeID = component._rootNodeID;\n+ var rootNodeID = injectedFindRootNodeID(component);\n if (rootNodeID) {\n return rootNodeID;\n } else {\n@@ -92,7 +95,10 @@ function findNodeHandle(componentOrHandle: any): ?number {\n (\n \/\/ Native\n typeof component === 'object' &&\n- '_rootNodeID' in component\n+ (\n+ '_rootNodeID' in component || \/\/ TODO (bvaughn) Clean up once Stack is deprecated\n+ '_nativeTag' in component\n+ )\n ) || (\n \/\/ Composite\n component.render != null &&\n@@ -112,4 +118,14 @@ function findNodeHandle(componentOrHandle: any): ?number {\n }\n }\n \n+\/\/ Fiber and stack implementations differ; each must inject a strategy\n+findNodeHandle.injection = {\n+ injectFindNode(findNode) {\n+ injectedFindNode = findNode;\n+ },\n+ injectFindRootNodeID(findRootNodeID) {\n+ injectedFindRootNodeID = findRootNodeID;\n+ },\n+};\n+\n module.exports = findNodeHandle;\n","commit":{"authorName":"Brian Vaughn","revision":"ab72f626deb86040e042df518801524f9da5b7f4","authoredAt":"2016-12-14T20:05:17-08:00","authorEmail":"brian.david.vaughn@gmail.com","subject":"Merge pull request #8560 from bvaughn\/react-native-fiber","shortRevision":"ab72f626de"},"parents":["ac241972bdf0dbacde07ab781b280b192f2b7803","5266ca9312bf007b5f6868ad97d91dd687ca3517"],"files":[{"path":"flow\/react-native-host-hooks.js","status":"M"},{"path":"src\/renderers\/native\/NativeMethodsMixin.js","status":"M"},{"path":"src\/renderers\/native\/ReactNative.js","status":"M"},{"path":"src\/renderers\/native\/ReactNativeComponentTree.js","status":"M"},{"path":"src\/renderers\/native\/ReactNativeFeatureFlags.js","status":"A"},{"path":"src\/renderers\/native\/ReactNativeFiber.js","status":"A"},{"path":"src\/renderers\/native\/ReactNativeGlobalResponderHandler.js","status":"M"},{"path":"src\/renderers\/native\/ReactNativeStack.js","status":"A"},{"path":"src\/renderers\/native\/ReactNativeStackInjection.js","status":"M"},{"path":"src\/renderers\/native\/ReactNativeViewConfigRegistry.js","status":"A"},{"path":"src\/renderers\/native\/__mocks__\/ReactNative.js","status":"A"},{"path":"src\/renderers\/native\/createReactNativeComponentClass.js","status":"M"},{"path":"src\/renderers\/native\/findNodeHandle.js","status":"M"}],"body":"ReactNative fiber renderer"}

dillon1000/react

Files changed