{"patch":"diff --git a\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js b\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js\nindex dfd128ac2e..53d29d2dca 100644\n--- a\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js\n+++ b\/src\/renderers\/dom\/client\/ReactDOMComponentTree.js\n@@ -77,7 +77,7 @@ function precacheChildNodes(inst, node) {\n continue;\n }\n var childInst = children[name];\n- var childID = childInst._rootNodeID;\n+ var childID = getRenderedNativeOrTextFromComponent(childInst)._domID;\n if (childID == null) {\n \/\/ We're currently unmounting this child in ReactMultiChild; skip it.\n continue;\n@@ -85,7 +85,7 @@ function precacheChildNodes(inst, node) {\n \/\/ We assume the child nodes are in the same order as the child instances.\n for (; childNode !== null; childNode = childNode.nextSibling) {\n if (childNode.nodeType === 1 &&\n- childNode.getAttribute(ATTR_NAME) === childID) {\n+ childNode.getAttribute(ATTR_NAME) === String(childID)) {\n precacheNode(childInst, childNode);\n continue outer;\n }\ndiff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 88ed3a01a8..4db71492bb 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -11,7 +11,6 @@\n \n 'use strict';\n \n-var ClientReactRootIndex = require('ClientReactRootIndex');\n var DOMLazyTree = require('DOMLazyTree');\n var DOMProperty = require('DOMProperty');\n var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');\n@@ -20,7 +19,6 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactDOMContainerInfo = require('ReactDOMContainerInfo');\n var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');\n var ReactElement = require('ReactElement');\n-var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactMarkupChecksum = require('ReactMarkupChecksum');\n var ReactPerf = require('ReactPerf');\n var ReactReconciler = require('ReactReconciler');\n@@ -35,23 +33,12 @@ var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var warning = require('warning');\n \n var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;\n+var ROOT_ATTR_NAME = DOMProperty.ROOT_ATTRIBUTE_NAME;\n \n var ELEMENT_NODE_TYPE = 1;\n var DOC_NODE_TYPE = 9;\n var DOCUMENT_FRAGMENT_NODE_TYPE = 11;\n \n-\n-\/** Mapping from reactRootID to React component instance. *\/\n-var instancesByReactRootID = {};\n-\n-\/** Mapping from reactRootID to `container` nodes. *\/\n-var containersByReactRootID = {};\n-\n-if (__DEV__) {\n- \/** __DEV__-only mapping from reactRootID to root elements. *\/\n- var rootElementsByReactRootID = {};\n-}\n-\n \/**\n * Finds the index of the first character\n * that's not common between the two given strings.\n@@ -85,20 +72,11 @@ function getReactRootElementInContainer(container) {\n }\n }\n \n-\/**\n- * @param {DOMElement} container DOM element that may contain a React component.\n- * @return {?string} A \"reactRoot\" ID, if a React component is rendered.\n- *\/\n-function getReactRootID(container) {\n- var rootElement = getReactRootElementInContainer(container);\n- return rootElement && internalGetID(rootElement);\n-}\n-\n function internalGetID(node) {\n \/\/ If node is something like a window, document, or text node, none of\n \/\/ which support attributes or a .getAttribute method, gracefully return\n \/\/ the empty string, as if the attribute were missing.\n- return node && node.getAttribute && node.getAttribute(ATTR_NAME) || '';\n+ return node.getAttribute && node.getAttribute(ATTR_NAME) || '';\n }\n \n \/**\n@@ -111,7 +89,7 @@ function internalGetID(node) {\n * @param {boolean} shouldReuseMarkup If true, do not insert markup\n *\/\n function mountComponentIntoNode(\n- componentInstance,\n+ wrapperInstance,\n rootID,\n container,\n transaction,\n@@ -119,18 +97,18 @@ function mountComponentIntoNode(\n context\n ) {\n var markup = ReactReconciler.mountComponent(\n- componentInstance,\n+ wrapperInstance,\n rootID,\n transaction,\n null,\n- ReactDOMContainerInfo(container),\n+ ReactDOMContainerInfo(wrapperInstance, container),\n context\n );\n- componentInstance._renderedComponent._topLevelWrapper = componentInstance;\n+ wrapperInstance._renderedComponent._topLevelWrapper = wrapperInstance;\n ReactMount._mountImageIntoNode(\n markup,\n container,\n- componentInstance,\n+ wrapperInstance,\n shouldReuseMarkup,\n transaction\n );\n@@ -200,10 +178,21 @@ function unmountComponentFromNode(instance, container) {\n * rendered by React but is not a root element.\n * @internal\n *\/\n-function hasNonRootReactChild(node) {\n- var reactRootID = getReactRootID(node);\n- return reactRootID ? reactRootID !==\n- ReactInstanceHandles.getReactRootIDFromNodeID(reactRootID) : false;\n+function hasNonRootReactChild(container) {\n+ var rootElement = getReactRootElementInContainer(container);\n+ return !!(\n+ rootElement &&\n+ internalGetID(rootElement) &&\n+ !rootElement.hasAttribute(ROOT_ATTR_NAME)\n+ );\n+}\n+\n+function getTopLevelWrapperInContainer(container) {\n+ var rootEl = getReactRootElementInContainer(container);\n+ var prevNativeInstance =\n+ rootEl && ReactDOMComponentTree.getInstanceFromNode(rootEl);\n+ return !prevNativeInstance || prevNativeInstance._nativeParent ? null :\n+ prevNativeInstance._nativeContainerInfo._topLevelWrapper;\n }\n \n \/**\n@@ -243,9 +232,6 @@ var ReactMount = {\n \n TopLevelWrapper: TopLevelWrapper,\n \n- \/** Exposed for debugging purposes **\/\n- _instancesByReactRootID: instancesByReactRootID,\n-\n \/**\n * This is a hook provided to support rendering React components while\n * ensuring that the apparent scroll position of its `container` does not\n@@ -277,39 +263,9 @@ var ReactMount = {\n }\n });\n \n- if (__DEV__) {\n- \/\/ Record the root element in case it later gets transplanted.\n- rootElementsByReactRootID[getReactRootID(container)] =\n- getReactRootElementInContainer(container);\n- }\n-\n return prevComponent;\n },\n \n- \/**\n- * Register a component into the instance map and starts scroll value\n- * monitoring\n- * @param {ReactComponent} nextComponent component instance to render\n- * @param {DOMElement} container container to render into\n- * @return {string} reactRoot ID prefix\n- *\/\n- _registerComponent: function(nextComponent, container) {\n- invariant(\n- container && (\n- container.nodeType === ELEMENT_NODE_TYPE ||\n- container.nodeType === DOC_NODE_TYPE ||\n- container.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE\n- ),\n- '_registerComponent(...): Target container is not a DOM element.'\n- );\n-\n- ReactBrowserEventEmitter.ensureScrollValueMonitoring();\n-\n- var reactRootID = ReactMount.registerContainer(container);\n- instancesByReactRootID[reactRootID] = nextComponent;\n- return reactRootID;\n- },\n-\n \/**\n * Render a new component into the DOM.\n * @param {ReactElement} nextElement element to render\n@@ -336,12 +292,18 @@ var ReactMount = {\n 'ReactCompositeComponent'\n );\n \n- var componentInstance = instantiateReactComponent(nextElement, null);\n- var reactRootID = ReactMount._registerComponent(\n- componentInstance,\n- container\n+ invariant(\n+ container && (\n+ container.nodeType === ELEMENT_NODE_TYPE ||\n+ container.nodeType === DOC_NODE_TYPE ||\n+ container.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE\n+ ),\n+ '_registerComponent(...): Target container is not a DOM element.'\n );\n \n+ ReactBrowserEventEmitter.ensureScrollValueMonitoring();\n+ var componentInstance = instantiateReactComponent(nextElement, null);\n+\n \/\/ The initial render is synchronous but any updates that happen during\n \/\/ rendering, in componentWillMount or componentDidMount, will be batched\n \/\/ according to the current batching strategy.\n@@ -349,18 +311,12 @@ var ReactMount = {\n ReactUpdates.batchedUpdates(\n batchedMountComponentIntoNode,\n componentInstance,\n- reactRootID,\n+ '',\n container,\n shouldReuseMarkup,\n context\n );\n \n- if (__DEV__) {\n- \/\/ Record the root element in case it later gets transplanted.\n- rootElementsByReactRootID[reactRootID] =\n- getReactRootElementInContainer(container);\n- }\n-\n return componentInstance;\n },\n \n@@ -429,7 +385,7 @@ var ReactMount = {\n nextElement\n );\n \n- var prevComponent = instancesByReactRootID[getReactRootID(container)];\n+ var prevComponent = getTopLevelWrapperInContainer(container);\n \n if (prevComponent) {\n var prevWrappedElement = prevComponent._currentElement;\n@@ -519,27 +475,6 @@ var ReactMount = {\n return ReactMount._renderSubtreeIntoContainer(null, nextElement, container, callback);\n },\n \n- \/**\n- * Registers a container node into which React components will be rendered.\n- * This also creates the \"reactRoot\" ID that will be assigned to the element\n- * rendered within.\n- *\n- * @param {DOMElement} container DOM element to register as a container.\n- * @return {string} The \"reactRoot\" ID of elements rendered within.\n- *\/\n- registerContainer: function(container) {\n- var id = getReactRootID(container);\n- \/\/ If one exists, make sure it is a valid \"reactRoot\" ID.\n- if (!id || id !== ReactInstanceHandles.getReactRootIDFromNodeID(id)) {\n- \/\/ No valid \"reactRoot\" ID found, create one.\n- id = ReactInstanceHandles.createReactRootID(\n- ClientReactRootIndex.createReactRootIndex()\n- );\n- }\n- containersByReactRootID[id] = container;\n- return id;\n- },\n-\n \/**\n * Unmounts and destroys the React component rendered in the `container`.\n *\n@@ -571,19 +506,15 @@ var ReactMount = {\n 'unmountComponentAtNode(...): Target container is not a DOM element.'\n );\n \n- var reactRootID = getReactRootID(container);\n- var component = instancesByReactRootID[reactRootID];\n- if (!component) {\n+ var prevComponent = getTopLevelWrapperInContainer(container);\n+ if (!prevComponent) {\n \/\/ Check if the node being unmounted was rendered by React, but isn't a\n \/\/ root node.\n var containerHasNonRootReactChild = hasNonRootReactChild(container);\n \n \/\/ Check if the container itself is a React root node.\n- var containerID = internalGetID(container);\n var isContainerReactRoot =\n- containerID &&\n- containerID ===\n- ReactInstanceHandles.getReactRootIDFromNodeID(containerID);\n+ container.nodeType === 1 && container.hasAttribute(ROOT_ATTR_NAME);\n \n if (__DEV__) {\n warning(\n@@ -604,14 +535,9 @@ var ReactMount = {\n }\n ReactUpdates.batchedUpdates(\n unmountComponentFromNode,\n- component,\n+ prevComponent,\n container\n );\n- delete instancesByReactRootID[reactRootID];\n- delete containersByReactRootID[reactRootID];\n- if (__DEV__) {\n- delete rootElementsByReactRootID[reactRootID];\n- }\n return true;\n },\n \ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\nindex 02230bf46b..6ba359b628 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\n@@ -33,14 +33,6 @@ describe('rendering React components at document', function() {\n beforeEach(function() {\n jest.resetModuleRegistry();\n \n- \/\/ Negative integer creator. So they won't get confused with\n- \/\/ the Client positive ids.\n- var ServerReactRootIndex = require('ServerReactRootIndex');\n- var serverId = -1;\n- ServerReactRootIndex.createReactRootIndex.mockImplementation(function() {\n- return serverId--;\n- });\n-\n React = require('React');\n ReactDOM = require('ReactDOM');\n ReactDOMServer = require('ReactDOMServer');\n@@ -221,8 +213,8 @@ describe('rendering React components at document', function() {\n 'quirks by rendering at the document root. You should look for ' +\n 'environment dependent code in your components and ensure ' +\n 'the props are the same client and server side:\\n' +\n- ' (client) ata-reactid=\".-1.1\">Hello world<\/body><\/\\n' +\n- ' (server) ata-reactid=\".-1.1\">Goodbye world<\/body>'\n+ ' (client) dy data-reactid=\"4\">Hello world<\/body><\/\\n' +\n+ ' (server) dy data-reactid=\"4\">Goodbye world<\/body>'\n );\n });\n \ndiff --git a\/src\/renderers\/dom\/server\/ReactServerRendering.js b\/src\/renderers\/dom\/server\/ReactServerRendering.js\nindex ec543920c7..ffec7fcdf5 100644\n--- a\/src\/renderers\/dom\/server\/ReactServerRendering.js\n+++ b\/src\/renderers\/dom\/server\/ReactServerRendering.js\n@@ -11,15 +11,14 @@\n *\/\n 'use strict';\n \n+var ReactDOMContainerInfo = require('ReactDOMContainerInfo');\n var ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');\n var ReactElement = require('ReactElement');\n-var ReactInstanceHandles = require('ReactInstanceHandles');\n var ReactMarkupChecksum = require('ReactMarkupChecksum');\n var ReactServerBatchingStrategy = require('ReactServerBatchingStrategy');\n var ReactServerRenderingTransaction =\n require('ReactServerRenderingTransaction');\n var ReactUpdates = require('ReactUpdates');\n-var ServerReactRootIndex = require('ServerReactRootIndex');\n \n var emptyObject = require('emptyObject');\n var instantiateReactComponent = require('instantiateReactComponent');\n@@ -39,18 +38,15 @@ function renderToStringImpl(element, makeStaticMarkup) {\n try {\n ReactUpdates.injection.injectBatchingStrategy(ReactServerBatchingStrategy);\n \n- var id = ReactInstanceHandles.createReactRootID(\n- ServerReactRootIndex.createReactRootIndex()\n- );\n transaction = ReactServerRenderingTransaction.getPooled(makeStaticMarkup);\n \n return transaction.perform(function() {\n var componentInstance = instantiateReactComponent(element, null);\n var markup = componentInstance.mountComponent(\n- id,\n+ '',\n transaction,\n null,\n- null,\n+ ReactDOMContainerInfo(),\n emptyObject\n );\n if (!makeStaticMarkup) {\ndiff --git a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\nindex 83c54a8741..2462d7e853 100644\n--- a\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n+++ b\/src\/renderers\/dom\/server\/__tests__\/ReactServerRendering-test.js\n@@ -20,6 +20,7 @@ var ReactTestUtils;\n var ReactServerRendering;\n \n var ID_ATTRIBUTE_NAME;\n+var ROOT_ATTRIBUTE_NAME;\n \n describe('ReactServerRendering', function() {\n beforeEach(function() {\n@@ -36,7 +37,7 @@ describe('ReactServerRendering', function() {\n \n var DOMProperty = require('DOMProperty');\n ID_ATTRIBUTE_NAME = DOMProperty.ID_ATTRIBUTE_NAME;\n- spyOn(console, 'error');\n+ ROOT_ATTRIBUTE_NAME = DOMProperty.ROOT_ATTRIBUTE_NAME;\n });\n \n describe('renderToString', function() {\n@@ -45,7 +46,8 @@ describe('ReactServerRendering', function() {\n hello world<\/span>\n );\n expect(response).toMatch(\n- 'hello world<\/span>'\n );\n });\n@@ -55,7 +57,8 @@ describe('ReactServerRendering', function() {\n \n );\n expect(response).toMatch(\n- ''\n );\n });\n@@ -65,7 +68,8 @@ describe('ReactServerRendering', function() {\n \" \/>\n );\n expect(response).toMatch(\n- ''\n );\n });\n@@ -95,7 +99,8 @@ describe('ReactServerRendering', function() {\n \n );\n expect(response).toMatch(\n- '

' +\n '' +\n 'My name is <\/span>' +\n@@ -145,7 +150,8 @@ describe('ReactServerRendering', function() {\n );\n \n expect(response).toMatch(\n- '' +\n 'Component name: <\/span>' +\n 'TestComponent<\/span>' +\n@@ -225,6 +231,7 @@ describe('ReactServerRendering', function() {\n \/\/ Now simulate a situation where the app is not idempotent. React should\n \/\/ warn but do the right thing.\n element.innerHTML = lastMarkup;\n+ spyOn(console, 'error');\n var instance = ReactDOM.render(, element);\n expect(mountCount).toEqual(4);\n expect(console.error.argsForCall.length).toBe(1);\ndiff --git a\/src\/renderers\/dom\/shared\/DOMProperty.js b\/src\/renderers\/dom\/shared\/DOMProperty.js\nindex 69c18dd56e..2da8d2d651 100644\n--- a\/src\/renderers\/dom\/shared\/DOMProperty.js\n+++ b\/src\/renderers\/dom\/shared\/DOMProperty.js\n@@ -167,6 +167,7 @@ var defaultValueCache = {};\n var DOMProperty = {\n \n ID_ATTRIBUTE_NAME: 'data-reactid',\n+ ROOT_ATTRIBUTE_NAME: 'data-reactroot',\n \n \/**\n * Map from property \"standard name\" to an object with info about how to set\ndiff --git a\/src\/renderers\/dom\/shared\/DOMPropertyOperations.js b\/src\/renderers\/dom\/shared\/DOMPropertyOperations.js\nindex 00aa1a5e56..092ea8af2b 100644\n--- a\/src\/renderers\/dom\/shared\/DOMPropertyOperations.js\n+++ b\/src\/renderers\/dom\/shared\/DOMPropertyOperations.js\n@@ -125,6 +125,14 @@ var DOMPropertyOperations = {\n node.setAttribute(DOMProperty.ID_ATTRIBUTE_NAME, id);\n },\n \n+ createMarkupForRoot: function() {\n+ return DOMProperty.ROOT_ATTRIBUTE_NAME + '=\"\"';\n+ },\n+\n+ setAttributeForRoot: function(node) {\n+ node.setAttribute(DOMProperty.ROOT_ATTRIBUTE_NAME, '');\n+ },\n+\n \/**\n * Creates markup for a property.\n *\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex 73b06e3c05..27ed5b6767 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -301,11 +301,11 @@ function enqueuePutListener(inst, registrationName, listener, transaction) {\n );\n }\n var containerInfo = inst._nativeContainerInfo;\n- if (!containerInfo) {\n+ var doc = containerInfo._ownerDocument;\n+ if (!doc) {\n \/\/ Server rendering.\n return;\n }\n- var doc = containerInfo._ownerDocument;\n listenTo(registrationName, doc);\n transaction.getReactMountReady().enqueue(putListener, {\n inst: inst,\n@@ -494,6 +494,8 @@ function isCustomComponent(tagName, props) {\n return tagName.indexOf('-') >= 0 || props.is != null;\n }\n \n+var globalIdCounter = 1;\n+\n \/**\n * Creates a new React class that is idempotent and capable of containing other\n * React components. It accepts event listeners and DOM properties that are\n@@ -518,6 +520,7 @@ function ReactDOMComponent(tag) {\n this._nativeNode = null;\n this._nativeParent = null;\n this._rootNodeID = null;\n+ this._domID = null;\n this._nativeContainerInfo = null;\n this._wrapperState = null;\n this._topLevelWrapper = null;\n@@ -554,7 +557,8 @@ ReactDOMComponent.Mixin = {\n nativeContainerInfo,\n context\n ) {\n- this._rootNodeID = rootID;\n+ this._rootNodeID = globalIdCounter++;\n+ this._domID = nativeContainerInfo._idCounter++;\n this._nativeParent = nativeParent;\n this._nativeContainerInfo = nativeContainerInfo;\n \n@@ -604,7 +608,7 @@ ReactDOMComponent.Mixin = {\n if (nativeParent != null) {\n namespaceURI = nativeParent._namespaceURI;\n parentTag = nativeParent._tag;\n- } else if (nativeContainerInfo != null) {\n+ } else if (nativeContainerInfo._tag) {\n namespaceURI = nativeContainerInfo._namespaceURI;\n parentTag = nativeContainerInfo._tag;\n }\n@@ -625,7 +629,7 @@ ReactDOMComponent.Mixin = {\n var parentInfo;\n if (nativeParent != null) {\n parentInfo = nativeParent._ancestorInfo;\n- } else if (nativeContainerInfo != null) {\n+ } else if (nativeContainerInfo._tag) {\n parentInfo = nativeContainerInfo._ancestorInfo;\n }\n if (parentInfo) {\n@@ -660,7 +664,10 @@ ReactDOMComponent.Mixin = {\n }\n ReactDOMComponentTree.precacheNode(this, el);\n this._flags |= Flags.hasCachedChildNodes;\n- DOMPropertyOperations.setAttributeForID(el, this._rootNodeID);\n+ if (!this._nativeParent) {\n+ DOMPropertyOperations.setAttributeForRoot(el);\n+ }\n+ DOMPropertyOperations.setAttributeForID(el, this._domID);\n this._updateDOMProperties(null, props, transaction);\n var lazyTree = DOMLazyTree(el);\n this._createInitialChildren(transaction, props, context, lazyTree);\n@@ -757,8 +764,11 @@ ReactDOMComponent.Mixin = {\n return ret;\n }\n \n- var markupForID = DOMPropertyOperations.createMarkupForID(this._rootNodeID);\n- return ret + ' ' + markupForID;\n+ if (!this._nativeParent) {\n+ ret += ' ' + DOMPropertyOperations.createMarkupForRoot();\n+ }\n+ ret += ' ' + DOMPropertyOperations.createMarkupForID(this._domID);\n+ return ret;\n },\n \n \/**\n@@ -1145,6 +1155,7 @@ ReactDOMComponent.Mixin = {\n EventPluginHub.deleteAllListeners(this);\n ReactComponentBrowserEnvironment.unmountIDFromEnvironment(this._rootNodeID);\n this._rootNodeID = null;\n+ this._domID = null;\n this._wrapperState = null;\n },\n \ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMContainerInfo.js b\/src\/renderers\/dom\/shared\/ReactDOMContainerInfo.js\nindex cbee0b5e7d..f0b97c037f 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMContainerInfo.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMContainerInfo.js\n@@ -15,15 +15,19 @@ var validateDOMNesting = require('validateDOMNesting');\n \n var DOC_NODE_TYPE = 9;\n \n-function ReactDOMContainerInfo(node) {\n+function ReactDOMContainerInfo(topLevelWrapper, node) {\n var info = {\n- _ownerDocument: node.nodeType === DOC_NODE_TYPE ? node : node.ownerDocument,\n- _tag: node.nodeName.toLowerCase(),\n- _namespaceURI: node.namespaceURI,\n+ _topLevelWrapper: topLevelWrapper,\n+ _idCounter: 1,\n+ _ownerDocument: node ?\n+ node.nodeType === DOC_NODE_TYPE ? node : node.ownerDocument :\n+ null,\n+ _tag: node ? node.nodeName.toLowerCase() : null,\n+ _namespaceURI: node ? node.namespaceURI : null,\n };\n if (__DEV__) {\n- info._ancestorInfo =\n- validateDOMNesting.updatedAncestorInfo(null, info._tag, null);\n+ info._ancestorInfo = node ?\n+ validateDOMNesting.updatedAncestorInfo(null, info._tag, null) : null;\n }\n return info;\n }\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\nindex 7404b61f37..4ffa9c4746 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n@@ -15,8 +15,6 @@\n var DOMChildrenOperations = require('DOMChildrenOperations');\n var DOMLazyTree = require('DOMLazyTree');\n var DOMPropertyOperations = require('DOMPropertyOperations');\n-var ReactComponentBrowserEnvironment =\n- require('ReactComponentBrowserEnvironment');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactPerf = require('ReactPerf');\n \n@@ -60,7 +58,7 @@ assign(ReactDOMTextComponent.prototype, {\n this._nativeParent = null;\n \n \/\/ Properties\n- this._rootNodeID = null;\n+ this._domID = null;\n this._mountIndex = 0;\n },\n \n@@ -94,13 +92,14 @@ assign(ReactDOMTextComponent.prototype, {\n }\n }\n \n- this._rootNodeID = rootID;\n+ var domID = nativeContainerInfo._idCounter++;\n+ this._domID = domID;\n this._nativeParent = nativeParent;\n if (transaction.useCreateElement) {\n var ownerDocument = nativeContainerInfo._ownerDocument;\n var el = ownerDocument.createElement('span');\n ReactDOMComponentTree.precacheNode(this, el);\n- DOMPropertyOperations.setAttributeForID(el, rootID);\n+ DOMPropertyOperations.setAttributeForID(el, domID);\n var lazyTree = DOMLazyTree(el);\n DOMLazyTree.queueText(lazyTree, this._stringText);\n return lazyTree;\n@@ -115,7 +114,7 @@ assign(ReactDOMTextComponent.prototype, {\n }\n \n return (\n- '' +\n+ '' +\n escapedText +\n '<\/span>'\n );\n@@ -148,8 +147,7 @@ assign(ReactDOMTextComponent.prototype, {\n },\n \n unmountComponent: function() {\n- this._nativeNode = null;\n- ReactComponentBrowserEnvironment.unmountIDFromEnvironment(this._rootNodeID);\n+ ReactDOMComponentTree.uncacheNode(this);\n },\n \n });\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMTextComponent-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMTextComponent-test.js\nindex 049ecf0b0a..85f4cfa4f0 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMTextComponent-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMTextComponent-test.js\n@@ -13,22 +13,11 @@\n \n var React;\n var ReactDOM;\n-var ReactDOMServer;\n \n describe('ReactDOMTextComponent', function() {\n beforeEach(function() {\n React = require('React');\n ReactDOM = require('ReactDOM');\n- ReactDOMServer = require('ReactDOMServer');\n- });\n-\n- it('should escape the rootID', function() {\n- var ThisThingShouldBeEscaped = '\">>> LULZ <<<\"';\n- var ThisThingWasBeEscaped = '">>> LULZ <<<"';\n- var thing =

LULZ<\/span><\/div>;\n- var html = ReactDOMServer.renderToString(thing);\n- expect(html).not.toContain(ThisThingShouldBeEscaped);\n- expect(html).toContain(ThisThingWasBeEscaped);\n });\n \n it('updates a mounted text component in place', function() {\ndiff --git a\/src\/renderers\/shared\/reconciler\/ReactMultiChild.js b\/src\/renderers\/shared\/reconciler\/ReactMultiChild.js\nindex bfb9bda1f4..1b0be8c563 100644\n--- a\/src\/renderers\/shared\/reconciler\/ReactMultiChild.js\n+++ b\/src\/renderers\/shared\/reconciler\/ReactMultiChild.js\n@@ -249,11 +249,9 @@ var ReactMultiChild = {\n for (var name in children) {\n if (children.hasOwnProperty(name)) {\n var child = children[name];\n- \/\/ Inlined for performance, see `ReactInstanceHandles.createReactID`.\n- var rootID = this._rootNodeID + name;\n var mountImage = ReactReconciler.mountComponent(\n child,\n- rootID,\n+ name,\n transaction,\n this,\n this._nativeContainerInfo,\n@@ -510,11 +508,9 @@ var ReactMultiChild = {\n index,\n transaction,\n context) {\n- \/\/ Inlined for performance, see `ReactInstanceHandles.createReactID`.\n- var rootID = this._rootNodeID + name;\n var mountImage = ReactReconciler.mountComponent(\n child,\n- rootID,\n+ name,\n transaction,\n this,\n this._nativeContainerInfo,\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\nindex 2639ffb2d3..f5918b4abf 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\n@@ -13,7 +13,6 @@\n \n var React;\n var ReactDOM;\n-var ReactDOMComponentTree;\n var ReactFragment;\n var ReactTestUtils;\n \n@@ -23,85 +22,52 @@ describe('ReactIdentity', function() {\n jest.resetModuleRegistry();\n React = require('React');\n ReactDOM = require('ReactDOM');\n- ReactDOMComponentTree = require('ReactDOMComponentTree');\n ReactFragment = require('ReactFragment');\n ReactTestUtils = require('ReactTestUtils');\n });\n \n- var idExp = \/^\\.[^.]+(.*)$\/;\n- function checkID(child, expectedID) {\n- \/\/ TODO: Node IDs are not public API; rewrite these tests.\n- var rootID = ReactDOMComponentTree.getInstanceFromNode(child)._rootNodeID;\n- var actual = idExp.exec(rootID);\n- var expected = idExp.exec(expectedID);\n- expect(actual).toBeTruthy();\n- expect(expected).toBeTruthy();\n- expect(actual[1]).toEqual(expected[1]);\n- }\n-\n function frag(obj) {\n return ReactFragment.create(obj);\n }\n \n- it('should allow keyed objects to express identity', function() {\n- var instance =\n-

\n- {frag({\n- first:

,\n- second:

,\n- })}\n- <\/div>;\n-\n- instance = ReactDOM.render(instance, document.createElement('div'));\n- var node = ReactDOM.findDOMNode(instance);\n- expect(node.childNodes.length).toBe(2);\n- checkID(node.childNodes[0], '.0.$first\/=10');\n- checkID(node.childNodes[1], '.0.$second\/=10');\n- });\n-\n it('should allow key property to express identity', function() {\n- var instance =\n-

\n-

\n+ var node;\n+ var Component = (props) =>\n+

node = c}>\n+

\n+

\n <\/div>;\n \n- instance = ReactDOM.render(instance, document.createElement('div'));\n- var node = ReactDOM.findDOMNode(instance);\n- expect(node.childNodes.length).toBe(4);\n- checkID(node.childNodes[0], '.0.$apple');\n- checkID(node.childNodes[1], '.0.$banana');\n- checkID(node.childNodes[2], '.0.$0');\n- checkID(node.childNodes[3], '.0.$123');\n+ var container = document.createElement('div');\n+ ReactDOM.render(, container);\n+ var origChildren = Array.from(node.childNodes);\n+ ReactDOM.render(, container);\n+ var newChildren = Array.from(node.childNodes);\n+ expect(origChildren[0]).toBe(newChildren[1]);\n+ expect(origChildren[1]).toBe(newChildren[0]);\n });\n \n- it('should use instance identity', function() {\n+ it('should use composite identity', function() {\n \n var Wrapper = React.createClass({\n render: function() {\n- return {this.props.children}<\/a>;\n+ return {this.props.children}<\/a>;\n },\n });\n \n- var instance =\n-

dillon1000/react

Files changed