Hello World<\/title>\n <\/head>\n <body>\n- Hello world\n+ {'Hello ' + this.props.hello}\n <\/body>\n <\/html>\n );\n },\n });\n \n- var markup = ReactDOMServer.renderToString(<Root \/>);\n+ var markup = ReactDOMServer.renderToString(<Root hello=\"world\" \/>);\n testDocument = getTestDocument(markup);\n- var component = ReactDOM.render(<Root \/>, testDocument);\n+ var body = testDocument.body;\n+\n+ ReactDOM.render(<Root hello=\"world\" \/>, testDocument);\n expect(testDocument.body.innerHTML).toBe('Hello world');\n \n- \/\/ TODO: This is a bad test. I have no idea what this is testing.\n- \/\/ Node IDs is an implementation detail and not part of the public API.\n- var componentID = ReactMount.getReactRootID(testDocument);\n- expect(componentID).toBe(ReactInstanceMap.get(component)._rootNodeID);\n+ ReactDOM.render(<Root hello=\"moon\" \/>, testDocument);\n+ expect(testDocument.body.innerHTML).toBe('Hello moon');\n+\n+ expect(body).toBe(testDocument.body);\n });\n \n it('should not be able to unmount component from document node', function() {\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\nindex 52fce3cdae..682a34961a 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\n@@ -14,7 +14,6 @@\n var DOMPropertyOperations = require('DOMPropertyOperations');\n var LinkedValueUtils = require('LinkedValueUtils');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n-var ReactMount = require('ReactMount');\n var ReactUpdates = require('ReactUpdates');\n \n var assign = require('Object.assign');\n@@ -189,19 +188,13 @@ function _handleChange(event) {\n \/\/ This will throw if radio buttons rendered by different copies of React\n \/\/ and the same name are rendered into the same form (same as #1939).\n \/\/ That's probably okay; we don't support it just as we don't support\n- \/\/ mixing React with non-React.\n- var otherID = ReactMount.getID(otherNode);\n+ \/\/ mixing React radio buttons with non-React ones.\n+ var otherInstance = ReactDOMComponentTree.getInstanceFromNode(otherNode);\n invariant(\n- otherID,\n+ otherInstance,\n 'ReactDOMInput: Mixing React and non-React radio inputs with the ' +\n 'same `name` is not supported.'\n );\n- var otherInstance = instancesByReactID[otherID];\n- invariant(\n- otherInstance,\n- 'ReactDOMInput: Unknown radio button ID %s.',\n- otherID\n- );\n \/\/ If this is a controlled radio button group, forcing the input that\n \/\/ was previously checked to update will cause it to be come re-checked\n \/\/ as appropriate.\ndiff --git a\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js b\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\nindex 3f31a52a21..d10cca3054 100644\n--- a\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\n+++ b\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\n@@ -13,7 +13,6 @@\n \n var DOMChildrenOperations = require('DOMChildrenOperations');\n var ReactDOMIDOperations = require('ReactDOMIDOperations');\n-var ReactMount = require('ReactMount');\n var ReactPerf = require('ReactPerf');\n \n \/**\n@@ -37,7 +36,6 @@ var ReactComponentBrowserEnvironment = {\n * @private\n *\/\n unmountIDFromEnvironment: function(rootNodeID) {\n- ReactMount.purgeID(rootNodeID);\n },\n \n };\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex b6cff58787..d363c242de 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -33,7 +33,6 @@ var ReactDOMInput = require('ReactDOMInput');\n var ReactDOMOption = require('ReactDOMOption');\n var ReactDOMSelect = require('ReactDOMSelect');\n var ReactDOMTextarea = require('ReactDOMTextarea');\n-var ReactMount = require('ReactMount');\n var ReactMultiChild = require('ReactMultiChild');\n var ReactPerf = require('ReactPerf');\n var ReactUpdateQueue = require('ReactUpdateQueue');\n@@ -662,8 +661,6 @@ ReactDOMComponent.Mixin = {\n ReactDOMComponentTree.precacheNode(this, el);\n this._flags |= Flags.hasCachedChildNodes;\n DOMPropertyOperations.setAttributeForID(el, this._rootNodeID);\n- \/\/ Populate node cache\n- ReactMount.getID(el);\n this._updateDOMProperties(null, props, transaction);\n var lazyTree = DOMLazyTree(el);\n this._createInitialChildren(transaction, props, context, lazyTree);\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\nindex 49e9f72291..ff94cbd8e8 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n@@ -18,7 +18,6 @@ var DOMPropertyOperations = require('DOMPropertyOperations');\n var ReactComponentBrowserEnvironment =\n require('ReactComponentBrowserEnvironment');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n-var ReactMount = require('ReactMount');\n \n var assign = require('Object.assign');\n var escapeTextContentForBrowser = require('escapeTextContentForBrowser');\n@@ -99,10 +98,8 @@ assign(ReactDOMTextComponent.prototype, {\n if (transaction.useCreateElement) {\n var ownerDocument = nativeContainerInfo._ownerDocument;\n var el = ownerDocument.createElement('span');\n- this._nativeNode = el;\n+ ReactDOMComponentTree.precacheNode(this, el);\n DOMPropertyOperations.setAttributeForID(el, rootID);\n- \/\/ Populate node cache\n- ReactMount.getID(el);\n var lazyTree = DOMLazyTree(el);\n DOMLazyTree.queueText(lazyTree, this._stringText);\n return lazyTree;\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js\nindex 298c5a1be2..c5ff51e1df 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js\n@@ -16,7 +16,6 @@ var MorphingComponent;\n var React;\n var ReactDOM;\n var ReactCurrentOwner;\n-var ReactMount;\n var ReactPropTypes;\n var ReactServerRendering;\n var ReactTestUtils;\n@@ -34,7 +33,6 @@ describe('ReactCompositeComponent', function() {\n ReactCurrentOwner = require('ReactCurrentOwner');\n ReactPropTypes = require('ReactPropTypes');\n ReactTestUtils = require('ReactTestUtils');\n- ReactMount = require('ReactMount');\n ReactServerRendering = require('ReactServerRendering');\n ReactUpdates = require('ReactUpdates');\n \n@@ -487,8 +485,6 @@ describe('ReactCompositeComponent', function() {\n var container = document.createElement('div');\n var innerUnmounted = false;\n \n- spyOn(ReactMount, 'purgeID').andCallThrough();\n-\n var Component = React.createClass({\n render: function() {\n return (\n@@ -501,11 +497,6 @@ describe('ReactCompositeComponent', function() {\n });\n var Inner = React.createClass({\n componentWillUnmount: function() {\n- \/\/ It's important that ReactMount.purgeID is called after any component\n- \/\/ lifecycle methods, because a componentWillUnmount implementation is\n- \/\/ likely to call ReactDOM.findDOMNode(this), which will repopulate the\n- \/\/ node cache after it's been cleared, causing a memory leak.\n- expect(ReactMount.purgeID.calls.length).toBe(0);\n innerUnmounted = true;\n },\n render: function() {\n@@ -516,12 +507,6 @@ describe('ReactCompositeComponent', function() {\n ReactDOM.render(<Component \/>, container);\n ReactDOM.unmountComponentAtNode(container);\n expect(innerUnmounted).toBe(true);\n-\n- \/\/ The text and both <div \/> elements and their wrappers each call\n- \/\/ unmountIDFromEnvironment which calls purgeID, for a total of 3.\n- \/\/ TODO: Test the effect of this. E.g. does the node cache get repopulated\n- \/\/ after a getDOMNode call?\n- expect(ReactMount.purgeID.calls.length).toBe(3);\n });\n \n it('should warn when shouldComponentUpdate() returns undefined', function() {\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\nindex f0b6b5bd9f..2639ffb2d3 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\n@@ -13,9 +13,9 @@\n \n var React;\n var ReactDOM;\n+var ReactDOMComponentTree;\n var ReactFragment;\n var ReactTestUtils;\n-var ReactMount;\n \n describe('ReactIdentity', function() {\n \n@@ -23,14 +23,16 @@ 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- ReactMount = require('ReactMount');\n });\n \n var idExp = \/^\\.[^.]+(.*)$\/;\n function checkID(child, expectedID) {\n- var actual = idExp.exec(ReactMount.getID(child));\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@@ -297,14 +299,16 @@ describe('ReactIdentity', function() {\n var wrapped = <TestContainer first={instance0} second={instance1} \/>;\n \n wrapped = ReactDOM.render(wrapped, document.createElement('div'));\n+ var div = ReactDOM.findDOMNode(wrapped);\n \n- var beforeID = ReactMount.getID(ReactDOM.findDOMNode(wrapped).firstChild);\n-\n+ var beforeA = div.childNodes[0];\n+ var beforeB = div.childNodes[1];\n wrapped.swap();\n+ var afterA = div.childNodes[1];\n+ var afterB = div.childNodes[0];\n \n- var afterID = ReactMount.getID(ReactDOM.findDOMNode(wrapped).firstChild);\n-\n- expect(beforeID).not.toEqual(afterID);\n+ expect(beforeA).toBe(afterA);\n+ expect(beforeB).toBe(afterB);\n \n });\n \ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\nindex 8e95862a09..17bb0b8f15 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n@@ -13,7 +13,6 @@\n \n var React = require('React');\n var ReactTestUtils = require('ReactTestUtils');\n-var ReactMount = require('ReactMount');\n \n \/**\n * Ensure that all callbacks are invoked, passing this unique argument.\n@@ -74,89 +73,6 @@ describe('ReactInstanceHandles', function() {\n aggregatedArgs = [];\n });\n \n- describe('findComponentRoot', function() {\n- it('should find the correct node with prefix sibling IDs', function() {\n- var parentNode = ReactTestUtils.renderIntoDocument(\n- <div>\n- <div \/>\n- {[<div key=\"x\" \/>]}\n- <\/div>\n- );\n- var childNodeB = parentNode.childNodes[1];\n-\n- expect(\n- ReactMount.getNode(\n- getNodeID(childNodeB)\n- )\n- ).toBe(childNodeB);\n- });\n-\n- it('should work around unidentified nodes', function() {\n- var parentNode = ReactTestUtils.renderIntoDocument(\n- <div>\n- {[<div key=\"x\" \/>]}\n- <\/div>\n- );\n- var childNodeB = parentNode.childNodes[0];\n-\n- \/\/ No ID on `childNodeA`.\n- var childNodeA = document.createElement('div');\n- parentNode.insertBefore(childNodeA, childNodeB);\n-\n- expect(\n- ReactMount.getNode(\n- getNodeID(childNodeB)\n- )\n- ).toBe(childNodeB);\n- });\n-\n- it('should throw if a rendered element cannot be found', function() {\n- spyOn(console, 'error');\n- var parentNode = ReactTestUtils.renderIntoDocument(\n- <table>\n- <tr \/>\n- <\/table>\n- );\n- var childNodeA = parentNode.childNodes[0];\n- var childNodeB;\n- if (childNodeA.tagName === 'TR') {\n- childNodeB = childNodeA;\n- \/\/ No ID on `childNodeA`, it was \"rendered by the browser\".\n- childNodeA = document.createElement('tbody');\n- childNodeA.appendChild(childNodeB);\n- parentNode.appendChild(childNodeA);\n- } else {\n- childNodeB = childNodeA.childNodes[0];\n- }\n- expect(childNodeA.tagName).toBe('TBODY');\n-\n- expect(\n- ReactMount.getNode(\n- getNodeID(childNodeB)\n- )\n- ).toBe(childNodeB);\n-\n- var junkID = getNodeID(childNodeB) + ':junk';\n- expect(function() {\n- ReactMount.getNode(\n- junkID\n- );\n- }).toThrow(\n- 'findComponentRoot(..., ' + junkID + '): Unable to find element. ' +\n- 'This probably means the DOM was unexpectedly mutated (e.g., by the ' +\n- 'browser), usually due to forgetting a <tbody> when using tables, ' +\n- 'nesting tags like <form>, <p>, or <a>, or using non-SVG elements in ' +\n- 'an <svg> parent. Try inspecting the child nodes of the element with ' +\n- 'React ID ``.'\n- );\n-\n- expect(console.error.argsForCall.length).toBe(1);\n- expect(console.error.argsForCall[0][0]).toContain(\n- '<tr> cannot appear as a child of <table>'\n- );\n- });\n- });\n-\n describe('getReactRootIDFromNodeID', function() {\n it('should support strings', function() {\n var test = '.s_0_1.0..1';\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\nindex 778aeda9aa..5ca3e4afb1 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\n@@ -13,8 +13,8 @@\n \n var React = require('React');\n var ReactDOM = require('ReactDOM');\n+var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactInstanceMap = require('ReactInstanceMap');\n-var ReactMount = require('ReactMount');\n \n var mapObject = require('mapObject');\n \n@@ -190,7 +190,8 @@ function verifyDomOrderingAccurate(parentInstance, statusDisplays) {\n var i;\n var orderedDomIDs = [];\n for (i = 0; i < statusDisplayNodes.length; i++) {\n- orderedDomIDs.push(ReactMount.getID(statusDisplayNodes[i]));\n+ var inst = ReactDOMComponentTree.getInstanceFromNode(statusDisplayNodes[i]);\n+ orderedDomIDs.push(inst._rootNodeID);\n }\n \n var orderedLogicalIDs = [];\ndiff --git a\/src\/test\/ReactDefaultPerf.js b\/src\/test\/ReactDefaultPerf.js\nindex 24827bd295..7fdc6e518e 100644\n--- a\/src\/test\/ReactDefaultPerf.js\n+++ b\/src\/test\/ReactDefaultPerf.js\n@@ -13,6 +13,7 @@\n 'use strict';\n \n var DOMProperty = require('DOMProperty');\n+var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactDefaultPerfAnalysis = require('ReactDefaultPerfAnalysis');\n var ReactMount = require('ReactMount');\n var ReactPerf = require('ReactPerf');\n@@ -175,8 +176,7 @@ var ReactDefaultPerf = {\n totalTime = performanceNow() - start;\n \n if (fnName === '_mountImageIntoNode') {\n- var mountID = ReactMount.getID(args[1]);\n- ReactDefaultPerf._recordWrite(mountID, fnName, totalTime, args[0]);\n+ ReactDefaultPerf._recordWrite('', fnName, totalTime, args[0]);\n } else if (fnName === 'dangerouslyProcessChildrenUpdates') {\n \/\/ special format\n args[0].forEach(function(update) {\n@@ -206,7 +206,7 @@ var ReactDefaultPerf = {\n if (moduleName === 'EventPluginHub') {\n id = id._rootNodeID;\n } else if (typeof id === 'object') {\n- id = ReactMount.getID(args[0]);\n+ id = ReactDOMComponentTree.getInstanceFromNode(args[0])._rootNodeID;\n }\n ReactDefaultPerf._recordWrite(\n id,\n"}</article></body></html>

{"body":"","commit":{"shortRevision":"4ba0e95a96","authoredAt":"2015-10-17T20:38:45-07:00","subject":"Kill ReactMount.getNode\/getID\/purgeID with fire","revision":"4ba0e95a96507abbcb2819be328fc3d1ed3cc80f","authorEmail":"balpert@fb.com","authorName":"Ben Alpert"},"parents":["796f8c353c2a68104672c61ec2cee457bf2de490"],"files":[{"path":"src\/renderers\/dom\/client\/ReactMount.js","status":"M"},{"path":"src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js","status":"M"},{"path":"src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js","status":"M"},{"path":"src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactDOMComponent.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/ReactDOMTextComponent.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js","status":"M"},{"path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js","status":"M"},{"path":"src\/test\/ReactDefaultPerf.js","status":"M"}],"patch":"diff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 57af82b39e..88ed3a01a8 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -28,7 +28,6 @@ var ReactUpdateQueue = require('ReactUpdateQueue');\n var ReactUpdates = require('ReactUpdates');\n \n var emptyObject = require('emptyObject');\n-var containsNode = require('containsNode');\n var instantiateReactComponent = require('instantiateReactComponent');\n var invariant = require('invariant');\n var setInnerHTML = require('setInnerHTML');\n@@ -36,7 +35,6 @@ var shouldUpdateReactComponent = require('shouldUpdateReactComponent');\n var warning = require('warning');\n \n var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;\n-var nodeCache = {};\n \n var ELEMENT_NODE_TYPE = 1;\n var DOC_NODE_TYPE = 9;\n@@ -54,9 +52,6 @@ if (__DEV__) {\n var rootElementsByReactRootID = {};\n }\n \n-\/\/ Used to store breadth-first search state in findComponentRoot.\n-var findComponentRootReusableArray = [];\n-\n \/**\n * Finds the index of the first character\n * that's not common between the two given strings.\n@@ -99,33 +94,6 @@ function getReactRootID(container) {\n return rootElement && internalGetID(rootElement);\n }\n \n-\/**\n- * Accessing node[ATTR_NAME] or calling getAttribute(ATTR_NAME) on a form\n- * element can return its control whose name or ID equals ATTR_NAME. All\n- * DOM nodes support `getAttributeNode` but this can also get called on\n- * other objects so just return '' if we're given something other than a\n- * DOM node (such as window).\n- *\n- * @param {?DOMElement|DOMWindow|DOMDocument|DOMTextNode} node DOM node.\n- * @return {string} ID of the supplied `domNode`.\n- *\/\n-function getID(node) {\n- var id = internalGetID(node);\n- if (id) {\n- var cached = nodeCache[id];\n- \/\/ TODO: Fix this whole concept of \"validity\" -- the cache just shouldn't\n- \/\/ have nodes that have been unmounted.\n- invariant(\n- !cached || cached === node || !isValid(cached, id),\n- 'ReactMount: Two valid but unequal nodes with the same `%s`: %s',\n- ATTR_NAME, id\n- );\n- nodeCache[id] = node;\n- }\n-\n- return id;\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@@ -133,112 +101,6 @@ function internalGetID(node) {\n return node && node.getAttribute && node.getAttribute(ATTR_NAME) || '';\n }\n \n-\/**\n- * Sets the React-specific ID of the given node.\n- *\n- * @param {DOMElement} node The DOM node whose ID will be set.\n- * @param {string} id The value of the ID attribute.\n- *\/\n-function setID(node, id) {\n- var oldID = internalGetID(node);\n- if (oldID !== id) {\n- delete nodeCache[oldID];\n- }\n- node.setAttribute(ATTR_NAME, id);\n- nodeCache[id] = node;\n-}\n-\n-\/**\n- * Finds the node with the supplied ID if present in the cache.\n- *\/\n-function getNodeIfCached(id) {\n- var node = nodeCache[id];\n- \/\/ TODO: Fix this whole concept of \"validity\" -- the cache just shouldn't have\n- \/\/ nodes that have been unmounted.\n- if (node && isValid(node, id)) {\n- return node;\n- }\n-}\n-\n-\/**\n- * Finds the node with the supplied React-generated DOM ID.\n- *\n- * @param {string} id A React-generated DOM ID.\n- * @return {DOMElement} DOM node with the suppled `id`.\n- * @internal\n- *\/\n-function getNode(id) {\n- var node = getNodeIfCached(id);\n- if (node) {\n- return node;\n- } else {\n- return nodeCache[id] = ReactMount.findReactNodeByID(id);\n- }\n-}\n-\n-\/**\n- * A node is \"valid\" if it is contained by a currently mounted container.\n- *\n- * This means that the node does not have to be contained by a document in\n- * order to be considered valid.\n- *\n- * @param {?DOMElement} node The candidate DOM node.\n- * @param {string} id The expected ID of the node.\n- * @return {boolean} Whether the node is contained by a mounted container.\n- *\/\n-function isValid(node, id) {\n- if (node) {\n- invariant(\n- internalGetID(node) === id,\n- 'ReactMount: Unexpected modification of `%s`',\n- ATTR_NAME\n- );\n-\n- var container = ReactMount.findReactContainerForID(id);\n- if (container && containsNode(container, node)) {\n- return true;\n- }\n- }\n-\n- return false;\n-}\n-\n-\/**\n- * Causes the cache to forget about one React-specific ID.\n- *\n- * @param {string} id The ID to forget.\n- *\/\n-function purgeID(id) {\n- delete nodeCache[id];\n-}\n-\n-var deepestNodeSoFar = null;\n-function findDeepestCachedAncestorImpl(ancestorID) {\n- var ancestor = getNodeIfCached(ancestorID);\n- if (ancestor) {\n- deepestNodeSoFar = ancestor;\n- } else {\n- \/\/ This node isn't populated in the cache, so presumably none of its\n- \/\/ descendants are. Break out of the loop.\n- return false;\n- }\n-}\n-\n-\/**\n- * Return the deepest cached node whose ID is a prefix of `targetID`.\n- *\/\n-function findDeepestCachedAncestor(targetID) {\n- deepestNodeSoFar = null;\n- ReactInstanceHandles.traverseAncestors(\n- targetID,\n- findDeepestCachedAncestorImpl\n- );\n-\n- var foundNode = deepestNodeSoFar;\n- deepestNodeSoFar = null;\n- return foundNode;\n-}\n-\n \/**\n * Mounts this component and inserts it into the DOM.\n *\n@@ -344,47 +206,6 @@ function hasNonRootReactChild(node) {\n ReactInstanceHandles.getReactRootIDFromNodeID(reactRootID) : false;\n }\n \n-\/**\n- * Returns the first (deepest) ancestor of a node which is rendered by this copy\n- * of React.\n- *\/\n-function findFirstReactDOMImpl(node) {\n- \/\/ This node might be from another React instance, so we make sure not to\n- \/\/ examine the node cache here\n- for (; node && node.parentNode !== node; node = node.parentNode) {\n- if (node.nodeType !== 1) {\n- \/\/ Not a DOMElement, therefore not a React component\n- continue;\n- }\n- var nodeID = internalGetID(node);\n- if (!nodeID) {\n- continue;\n- }\n- var reactRootID = ReactInstanceHandles.getReactRootIDFromNodeID(nodeID);\n-\n- \/\/ If containersByReactRootID contains the container we find by crawling up\n- \/\/ the tree, we know that this instance of React rendered the node.\n- \/\/ nb. isValid's strategy (with containsNode) does not work because render\n- \/\/ trees may be nested and we don't want a false positive in that case.\n- var current = node;\n- var lastID;\n- do {\n- lastID = internalGetID(current);\n- current = current.parentNode;\n- if (current == null) {\n- \/\/ The passed-in node has been detached from the container it was\n- \/\/ originally rendered into.\n- return null;\n- }\n- } while (lastID !== reactRootID);\n-\n- if (current === containersByReactRootID[reactRootID]) {\n- return node;\n- }\n- }\n- return null;\n-}\n-\n \/**\n * Temporary (?) hack so that we can store all top-level pending updates on\n * composites instead of having to worry about different types of components\n@@ -794,162 +615,6 @@ var ReactMount = {\n return true;\n },\n \n- \/**\n- * Finds the container DOM element that contains React component to which the\n- * supplied DOM `id` belongs.\n- *\n- * @param {string} id The ID of an element rendered by a React component.\n- * @return {?DOMElement} DOM element that contains the `id`.\n- *\/\n- findReactContainerForID: function(id) {\n- var reactRootID = ReactInstanceHandles.getReactRootIDFromNodeID(id);\n- var container = containersByReactRootID[reactRootID];\n-\n- if (__DEV__) {\n- var rootElement = rootElementsByReactRootID[reactRootID];\n- if (rootElement && rootElement.parentNode !== container) {\n- warning(\n- \/\/ Call internalGetID here because getID calls isValid which calls\n- \/\/ findReactContainerForID (this function).\n- internalGetID(rootElement) === reactRootID,\n- 'ReactMount: Root element ID differed from reactRootID.'\n- );\n- var containerChild = container.firstChild;\n- if (containerChild &&\n- reactRootID === internalGetID(containerChild)) {\n- \/\/ If the container has a new child with the same ID as the old\n- \/\/ root element, then rootElementsByReactRootID[reactRootID] is\n- \/\/ just stale and needs to be updated. The case that deserves a\n- \/\/ warning is when the container is empty.\n- rootElementsByReactRootID[reactRootID] = containerChild;\n- } else {\n- warning(\n- false,\n- 'ReactMount: Root element has been removed from its original ' +\n- 'container. New container: %s',\n- rootElement.parentNode\n- );\n- }\n- }\n- }\n-\n- return container;\n- },\n-\n- \/**\n- * Finds an element rendered by React with the supplied ID.\n- *\n- * @param {string} id ID of a DOM node in the React component.\n- * @return {DOMElement} Root DOM node of the React component.\n- *\/\n- findReactNodeByID: function(id) {\n- var reactRoot = ReactMount.findReactContainerForID(id);\n- return ReactMount.findComponentRoot(reactRoot, id);\n- },\n-\n- \/**\n- * Traverses up the ancestors of the supplied node to find a node that is a\n- * DOM representation of a React component rendered by this copy of React.\n- *\n- * @param {*} node\n- * @return {?DOMEventTarget}\n- * @internal\n- *\/\n- getFirstReactDOM: function(node) {\n- return findFirstReactDOMImpl(node);\n- },\n-\n- \/**\n- * Finds a node with the supplied `targetID` inside of the supplied\n- * `ancestorNode`. Exploits the ID naming scheme to perform the search\n- * quickly.\n- *\n- * @param {DOMEventTarget} ancestorNode Search from this root.\n- * @pararm {string} targetID ID of the DOM representation of the component.\n- * @return {DOMEventTarget} DOM node with the supplied `targetID`.\n- * @internal\n- *\/\n- findComponentRoot: function(ancestorNode, targetID) {\n- var firstChildren = findComponentRootReusableArray;\n- var childIndex = 0;\n-\n- var deepestAncestor = findDeepestCachedAncestor(targetID) || ancestorNode;\n-\n- if (__DEV__) {\n- \/\/ This will throw on the next line; give an early warning\n- warning(\n- deepestAncestor != null,\n- 'React can\\'t find the root component node for data-reactid value ' +\n- '`%s`. If you\\'re seeing this message, it probably means that ' +\n- 'you\\'ve loaded two copies of React on the page. At this time, only ' +\n- 'a single copy of React can be loaded at a time.',\n- targetID\n- );\n- }\n-\n- firstChildren[0] = deepestAncestor.firstChild;\n- firstChildren.length = 1;\n-\n- while (childIndex < firstChildren.length) {\n- var child = firstChildren[childIndex++];\n- var targetChild;\n-\n- while (child) {\n- var childID = ReactMount.getID(child);\n- if (childID) {\n- \/\/ Even if we find the node we're looking for, we finish looping\n- \/\/ through its siblings to ensure they're cached so that we don't have\n- \/\/ to revisit this node again. Otherwise, we make n^2 calls to getID\n- \/\/ when visiting the many children of a single node in order.\n-\n- if (targetID === childID) {\n- targetChild = child;\n- } else if (ReactInstanceHandles.isAncestorIDOf(childID, targetID)) {\n- \/\/ If we find a child whose ID is an ancestor of the given ID,\n- \/\/ then we can be sure that we only want to search the subtree\n- \/\/ rooted at this child, so we can throw out the rest of the\n- \/\/ search state.\n- firstChildren.length = childIndex = 0;\n- firstChildren.push(child.firstChild);\n- }\n-\n- } else {\n- \/\/ If this child had no ID, then there's a chance that it was\n- \/\/ injected automatically by the browser, as when a ``\n- \/\/ element sprouts an extra `` child as a side effect of\n- \/\/ `.innerHTML` parsing. Optimistically continue down this\n- \/\/ branch, but not before examining the other siblings.\n- firstChildren.push(child.firstChild);\n- }\n-\n- child = child.nextSibling;\n- }\n-\n- if (targetChild) {\n- \/\/ Emptying firstChildren\/findComponentRootReusableArray is\n- \/\/ not necessary for correctness, but it helps the GC reclaim\n- \/\/ any nodes that were left at the end of the search.\n- firstChildren.length = 0;\n-\n- return targetChild;\n- }\n- }\n-\n- firstChildren.length = 0;\n-\n- invariant(\n- false,\n- 'findComponentRoot(..., %s): Unable to find element. This probably ' +\n- 'means the DOM was unexpectedly mutated (e.g., by the browser), ' +\n- 'usually due to forgetting a when using tables, nesting tags ' +\n- 'like ,

, or , or using non-SVG elements in an

\n-

b<\/div>\n- {this.props.showC &&

c<\/div>}\n- <\/div>\n- );\n- },\n- });\n-\n- var container = document.createElement('container');\n-\n- ReactDOM.render(

<\/div>, container);\n-\n- \/\/ Right now, A and B are in the cache. When we add C, it won't get added to\n- \/\/ the cache (assuming markup-string mode).\n- ReactDOM.render(

<\/div>, container);\n-\n- \/\/ Remove A, B, and C. Unmounting C shouldn't cause B to get recached.\n- ReactDOM.render(

<\/div>, container);\n-\n- \/\/ Add them back -- this shouldn't cause a cached node collision.\n- ReactDOM.render(

<\/div>, container);\n-\n- ReactDOM.unmountComponentAtNode(container);\n- });\n-\n- it('should not crash in node cache when unmounting, case 2', function() {\n- var A = React.createClass({\n- render: function() {\n- return {this.props.innerKey}<\/a>;\n- },\n- });\n- var Component = React.createClass({\n- render: function() {\n- return (\n- \n- {this.props.step === 1 && }<\/i>\n- {this.props.step === 1 && }\n- <\/b>\n- );\n- },\n- });\n-\n- var container = document.createElement('container');\n-\n- ReactDOM.render(, container);\n- ReactDOM.render(, container);\n- ReactDOM.render(, container);\n- ReactMount.getID(container.querySelector('a'));\n- });\n-\n it('passes the correct callback context', function() {\n var container = document.createElement('div');\n var calls = 0;\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\nindex 2c9d642724..02230bf46b 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactRenderDocument-test.js\n@@ -17,8 +17,6 @@ jest\n var React;\n var ReactDOM;\n var ReactDOMServer;\n-var ReactInstanceMap;\n-var ReactMount;\n \n var getTestDocument;\n \n@@ -46,14 +44,12 @@ describe('rendering React components at document', function() {\n React = require('React');\n ReactDOM = require('ReactDOM');\n ReactDOMServer = require('ReactDOMServer');\n- ReactInstanceMap = require('ReactInstanceMap');\n- ReactMount = require('ReactMount');\n getTestDocument = require('getTestDocument');\n \n testDocument = getTestDocument();\n });\n \n- it('should be able to get root component id for document node', function() {\n+ it('should be able to adopt server markup', function() {\n expect(testDocument).not.toBeUndefined();\n \n var Root = React.createClass({\n@@ -64,22 +60,24 @@ describe('rendering React components at document', function() {\n Hello World<\/title>\n <\/head>\n <body>\n- Hello world\n+ {'Hello ' + this.props.hello}\n <\/body>\n <\/html>\n );\n },\n });\n \n- var markup = ReactDOMServer.renderToString(<Root \/>);\n+ var markup = ReactDOMServer.renderToString(<Root hello=\"world\" \/>);\n testDocument = getTestDocument(markup);\n- var component = ReactDOM.render(<Root \/>, testDocument);\n+ var body = testDocument.body;\n+\n+ ReactDOM.render(<Root hello=\"world\" \/>, testDocument);\n expect(testDocument.body.innerHTML).toBe('Hello world');\n \n- \/\/ TODO: This is a bad test. I have no idea what this is testing.\n- \/\/ Node IDs is an implementation detail and not part of the public API.\n- var componentID = ReactMount.getReactRootID(testDocument);\n- expect(componentID).toBe(ReactInstanceMap.get(component)._rootNodeID);\n+ ReactDOM.render(<Root hello=\"moon\" \/>, testDocument);\n+ expect(testDocument.body.innerHTML).toBe('Hello moon');\n+\n+ expect(body).toBe(testDocument.body);\n });\n \n it('should not be able to unmount component from document node', function() {\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\nindex 52fce3cdae..682a34961a 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/ReactDOMInput.js\n@@ -14,7 +14,6 @@\n var DOMPropertyOperations = require('DOMPropertyOperations');\n var LinkedValueUtils = require('LinkedValueUtils');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n-var ReactMount = require('ReactMount');\n var ReactUpdates = require('ReactUpdates');\n \n var assign = require('Object.assign');\n@@ -189,19 +188,13 @@ function _handleChange(event) {\n \/\/ This will throw if radio buttons rendered by different copies of React\n \/\/ and the same name are rendered into the same form (same as #1939).\n \/\/ That's probably okay; we don't support it just as we don't support\n- \/\/ mixing React with non-React.\n- var otherID = ReactMount.getID(otherNode);\n+ \/\/ mixing React radio buttons with non-React ones.\n+ var otherInstance = ReactDOMComponentTree.getInstanceFromNode(otherNode);\n invariant(\n- otherID,\n+ otherInstance,\n 'ReactDOMInput: Mixing React and non-React radio inputs with the ' +\n 'same `name` is not supported.'\n );\n- var otherInstance = instancesByReactID[otherID];\n- invariant(\n- otherInstance,\n- 'ReactDOMInput: Unknown radio button ID %s.',\n- otherID\n- );\n \/\/ If this is a controlled radio button group, forcing the input that\n \/\/ was previously checked to update will cause it to be come re-checked\n \/\/ as appropriate.\ndiff --git a\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js b\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\nindex 3f31a52a21..d10cca3054 100644\n--- a\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\n+++ b\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\n@@ -13,7 +13,6 @@\n \n var DOMChildrenOperations = require('DOMChildrenOperations');\n var ReactDOMIDOperations = require('ReactDOMIDOperations');\n-var ReactMount = require('ReactMount');\n var ReactPerf = require('ReactPerf');\n \n \/**\n@@ -37,7 +36,6 @@ var ReactComponentBrowserEnvironment = {\n * @private\n *\/\n unmountIDFromEnvironment: function(rootNodeID) {\n- ReactMount.purgeID(rootNodeID);\n },\n \n };\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex b6cff58787..d363c242de 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -33,7 +33,6 @@ var ReactDOMInput = require('ReactDOMInput');\n var ReactDOMOption = require('ReactDOMOption');\n var ReactDOMSelect = require('ReactDOMSelect');\n var ReactDOMTextarea = require('ReactDOMTextarea');\n-var ReactMount = require('ReactMount');\n var ReactMultiChild = require('ReactMultiChild');\n var ReactPerf = require('ReactPerf');\n var ReactUpdateQueue = require('ReactUpdateQueue');\n@@ -662,8 +661,6 @@ ReactDOMComponent.Mixin = {\n ReactDOMComponentTree.precacheNode(this, el);\n this._flags |= Flags.hasCachedChildNodes;\n DOMPropertyOperations.setAttributeForID(el, this._rootNodeID);\n- \/\/ Populate node cache\n- ReactMount.getID(el);\n this._updateDOMProperties(null, props, transaction);\n var lazyTree = DOMLazyTree(el);\n this._createInitialChildren(transaction, props, context, lazyTree);\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\nindex 49e9f72291..ff94cbd8e8 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n@@ -18,7 +18,6 @@ var DOMPropertyOperations = require('DOMPropertyOperations');\n var ReactComponentBrowserEnvironment =\n require('ReactComponentBrowserEnvironment');\n var ReactDOMComponentTree = require('ReactDOMComponentTree');\n-var ReactMount = require('ReactMount');\n \n var assign = require('Object.assign');\n var escapeTextContentForBrowser = require('escapeTextContentForBrowser');\n@@ -99,10 +98,8 @@ assign(ReactDOMTextComponent.prototype, {\n if (transaction.useCreateElement) {\n var ownerDocument = nativeContainerInfo._ownerDocument;\n var el = ownerDocument.createElement('span');\n- this._nativeNode = el;\n+ ReactDOMComponentTree.precacheNode(this, el);\n DOMPropertyOperations.setAttributeForID(el, rootID);\n- \/\/ Populate node cache\n- ReactMount.getID(el);\n var lazyTree = DOMLazyTree(el);\n DOMLazyTree.queueText(lazyTree, this._stringText);\n return lazyTree;\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js\nindex 298c5a1be2..c5ff51e1df 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactCompositeComponent-test.js\n@@ -16,7 +16,6 @@ var MorphingComponent;\n var React;\n var ReactDOM;\n var ReactCurrentOwner;\n-var ReactMount;\n var ReactPropTypes;\n var ReactServerRendering;\n var ReactTestUtils;\n@@ -34,7 +33,6 @@ describe('ReactCompositeComponent', function() {\n ReactCurrentOwner = require('ReactCurrentOwner');\n ReactPropTypes = require('ReactPropTypes');\n ReactTestUtils = require('ReactTestUtils');\n- ReactMount = require('ReactMount');\n ReactServerRendering = require('ReactServerRendering');\n ReactUpdates = require('ReactUpdates');\n \n@@ -487,8 +485,6 @@ describe('ReactCompositeComponent', function() {\n var container = document.createElement('div');\n var innerUnmounted = false;\n \n- spyOn(ReactMount, 'purgeID').andCallThrough();\n-\n var Component = React.createClass({\n render: function() {\n return (\n@@ -501,11 +497,6 @@ describe('ReactCompositeComponent', function() {\n });\n var Inner = React.createClass({\n componentWillUnmount: function() {\n- \/\/ It's important that ReactMount.purgeID is called after any component\n- \/\/ lifecycle methods, because a componentWillUnmount implementation is\n- \/\/ likely to call ReactDOM.findDOMNode(this), which will repopulate the\n- \/\/ node cache after it's been cleared, causing a memory leak.\n- expect(ReactMount.purgeID.calls.length).toBe(0);\n innerUnmounted = true;\n },\n render: function() {\n@@ -516,12 +507,6 @@ describe('ReactCompositeComponent', function() {\n ReactDOM.render(<Component \/>, container);\n ReactDOM.unmountComponentAtNode(container);\n expect(innerUnmounted).toBe(true);\n-\n- \/\/ The text and both <div \/> elements and their wrappers each call\n- \/\/ unmountIDFromEnvironment which calls purgeID, for a total of 3.\n- \/\/ TODO: Test the effect of this. E.g. does the node cache get repopulated\n- \/\/ after a getDOMNode call?\n- expect(ReactMount.purgeID.calls.length).toBe(3);\n });\n \n it('should warn when shouldComponentUpdate() returns undefined', function() {\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\nindex f0b6b5bd9f..2639ffb2d3 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactIdentity-test.js\n@@ -13,9 +13,9 @@\n \n var React;\n var ReactDOM;\n+var ReactDOMComponentTree;\n var ReactFragment;\n var ReactTestUtils;\n-var ReactMount;\n \n describe('ReactIdentity', function() {\n \n@@ -23,14 +23,16 @@ 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- ReactMount = require('ReactMount');\n });\n \n var idExp = \/^\\.[^.]+(.*)$\/;\n function checkID(child, expectedID) {\n- var actual = idExp.exec(ReactMount.getID(child));\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@@ -297,14 +299,16 @@ describe('ReactIdentity', function() {\n var wrapped = <TestContainer first={instance0} second={instance1} \/>;\n \n wrapped = ReactDOM.render(wrapped, document.createElement('div'));\n+ var div = ReactDOM.findDOMNode(wrapped);\n \n- var beforeID = ReactMount.getID(ReactDOM.findDOMNode(wrapped).firstChild);\n-\n+ var beforeA = div.childNodes[0];\n+ var beforeB = div.childNodes[1];\n wrapped.swap();\n+ var afterA = div.childNodes[1];\n+ var afterB = div.childNodes[0];\n \n- var afterID = ReactMount.getID(ReactDOM.findDOMNode(wrapped).firstChild);\n-\n- expect(beforeID).not.toEqual(afterID);\n+ expect(beforeA).toBe(afterA);\n+ expect(beforeB).toBe(afterB);\n \n });\n \ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\nindex 8e95862a09..17bb0b8f15 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n@@ -13,7 +13,6 @@\n \n var React = require('React');\n var ReactTestUtils = require('ReactTestUtils');\n-var ReactMount = require('ReactMount');\n \n \/**\n * Ensure that all callbacks are invoked, passing this unique argument.\n@@ -74,89 +73,6 @@ describe('ReactInstanceHandles', function() {\n aggregatedArgs = [];\n });\n \n- describe('findComponentRoot', function() {\n- it('should find the correct node with prefix sibling IDs', function() {\n- var parentNode = ReactTestUtils.renderIntoDocument(\n- <div>\n- <div \/>\n- {[<div key=\"x\" \/>]}\n- <\/div>\n- );\n- var childNodeB = parentNode.childNodes[1];\n-\n- expect(\n- ReactMount.getNode(\n- getNodeID(childNodeB)\n- )\n- ).toBe(childNodeB);\n- });\n-\n- it('should work around unidentified nodes', function() {\n- var parentNode = ReactTestUtils.renderIntoDocument(\n- <div>\n- {[<div key=\"x\" \/>]}\n- <\/div>\n- );\n- var childNodeB = parentNode.childNodes[0];\n-\n- \/\/ No ID on `childNodeA`.\n- var childNodeA = document.createElement('div');\n- parentNode.insertBefore(childNodeA, childNodeB);\n-\n- expect(\n- ReactMount.getNode(\n- getNodeID(childNodeB)\n- )\n- ).toBe(childNodeB);\n- });\n-\n- it('should throw if a rendered element cannot be found', function() {\n- spyOn(console, 'error');\n- var parentNode = ReactTestUtils.renderIntoDocument(\n- <table>\n- <tr \/>\n- <\/table>\n- );\n- var childNodeA = parentNode.childNodes[0];\n- var childNodeB;\n- if (childNodeA.tagName === 'TR') {\n- childNodeB = childNodeA;\n- \/\/ No ID on `childNodeA`, it was \"rendered by the browser\".\n- childNodeA = document.createElement('tbody');\n- childNodeA.appendChild(childNodeB);\n- parentNode.appendChild(childNodeA);\n- } else {\n- childNodeB = childNodeA.childNodes[0];\n- }\n- expect(childNodeA.tagName).toBe('TBODY');\n-\n- expect(\n- ReactMount.getNode(\n- getNodeID(childNodeB)\n- )\n- ).toBe(childNodeB);\n-\n- var junkID = getNodeID(childNodeB) + ':junk';\n- expect(function() {\n- ReactMount.getNode(\n- junkID\n- );\n- }).toThrow(\n- 'findComponentRoot(..., ' + junkID + '): Unable to find element. ' +\n- 'This probably means the DOM was unexpectedly mutated (e.g., by the ' +\n- 'browser), usually due to forgetting a <tbody> when using tables, ' +\n- 'nesting tags like <form>, <p>, or <a>, or using non-SVG elements in ' +\n- 'an <svg> parent. Try inspecting the child nodes of the element with ' +\n- 'React ID ``.'\n- );\n-\n- expect(console.error.argsForCall.length).toBe(1);\n- expect(console.error.argsForCall[0][0]).toContain(\n- '<tr> cannot appear as a child of <table>'\n- );\n- });\n- });\n-\n describe('getReactRootIDFromNodeID', function() {\n it('should support strings', function() {\n var test = '.s_0_1.0..1';\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\nindex 778aeda9aa..5ca3e4afb1 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\n@@ -13,8 +13,8 @@\n \n var React = require('React');\n var ReactDOM = require('ReactDOM');\n+var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactInstanceMap = require('ReactInstanceMap');\n-var ReactMount = require('ReactMount');\n \n var mapObject = require('mapObject');\n \n@@ -190,7 +190,8 @@ function verifyDomOrderingAccurate(parentInstance, statusDisplays) {\n var i;\n var orderedDomIDs = [];\n for (i = 0; i < statusDisplayNodes.length; i++) {\n- orderedDomIDs.push(ReactMount.getID(statusDisplayNodes[i]));\n+ var inst = ReactDOMComponentTree.getInstanceFromNode(statusDisplayNodes[i]);\n+ orderedDomIDs.push(inst._rootNodeID);\n }\n \n var orderedLogicalIDs = [];\ndiff --git a\/src\/test\/ReactDefaultPerf.js b\/src\/test\/ReactDefaultPerf.js\nindex 24827bd295..7fdc6e518e 100644\n--- a\/src\/test\/ReactDefaultPerf.js\n+++ b\/src\/test\/ReactDefaultPerf.js\n@@ -13,6 +13,7 @@\n 'use strict';\n \n var DOMProperty = require('DOMProperty');\n+var ReactDOMComponentTree = require('ReactDOMComponentTree');\n var ReactDefaultPerfAnalysis = require('ReactDefaultPerfAnalysis');\n var ReactMount = require('ReactMount');\n var ReactPerf = require('ReactPerf');\n@@ -175,8 +176,7 @@ var ReactDefaultPerf = {\n totalTime = performanceNow() - start;\n \n if (fnName === '_mountImageIntoNode') {\n- var mountID = ReactMount.getID(args[1]);\n- ReactDefaultPerf._recordWrite(mountID, fnName, totalTime, args[0]);\n+ ReactDefaultPerf._recordWrite('', fnName, totalTime, args[0]);\n } else if (fnName === 'dangerouslyProcessChildrenUpdates') {\n \/\/ special format\n args[0].forEach(function(update) {\n@@ -206,7 +206,7 @@ var ReactDefaultPerf = {\n if (moduleName === 'EventPluginHub') {\n id = id._rootNodeID;\n } else if (typeof id === 'object') {\n- id = ReactMount.getID(args[0]);\n+ id = ReactDOMComponentTree.getInstanceFromNode(args[0])._rootNodeID;\n }\n ReactDefaultPerf._recordWrite(\n id,\n"}</article></body></html>

dillon1000/react

Files changed