{"body":"Refactor how composite type changes work, fix memory leak in ReactMount caching","patch":"diff --git a\/src\/renderers\/dom\/client\/ReactDOMIDOperations.js b\/src\/renderers\/dom\/client\/ReactDOMIDOperations.js\nindex d8630ce0a5..7b419e2bf9 100644\n--- a\/src\/renderers\/dom\/client\/ReactDOMIDOperations.js\n+++ b\/src\/renderers\/dom\/client\/ReactDOMIDOperations.js\n@@ -63,19 +63,6 @@ var ReactDOMIDOperations = {\n }\n },\n \n- \/**\n- * Replaces a DOM node that exists in the document with markup.\n- *\n- * @param {string} id ID of child to be replaced.\n- * @param {string} markup Dangerous markup to inject in place of child.\n- * @internal\n- * @see {Danger.dangerouslyReplaceNodeWithMarkup}\n- *\/\n- dangerouslyReplaceNodeWithMarkupByID: function(id, markup) {\n- var node = ReactMount.getNode(id);\n- DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup(node, markup);\n- },\n-\n \/**\n * Updates a component's children by processing a series of updates.\n *\n@@ -92,7 +79,6 @@ var ReactDOMIDOperations = {\n };\n \n ReactPerf.measureMethods(ReactDOMIDOperations, 'ReactDOMIDOperations', {\n- dangerouslyReplaceNodeWithMarkupByID: 'dangerouslyReplaceNodeWithMarkupByID',\n dangerouslyProcessChildrenUpdates: 'dangerouslyProcessChildrenUpdates',\n });\n \ndiff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 2a231a420b..8ab20475fe 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -100,7 +100,7 @@ function getReactRootElementInContainer(container) {\n *\/\n function getReactRootID(container) {\n var rootElement = getReactRootElementInContainer(container);\n- return rootElement && ReactMount.getID(rootElement);\n+ return rootElement && internalGetID(rootElement);\n }\n \n \/**\n@@ -116,20 +116,12 @@ function getReactRootID(container) {\n function getID(node) {\n var id = internalGetID(node);\n if (id) {\n- if (nodeCache.hasOwnProperty(id)) {\n- var cached = nodeCache[id];\n- if (cached !== node) {\n- invariant(\n- !isValid(cached, id),\n- 'ReactMount: Two valid but unequal nodes with the same `%s`: %s',\n- ATTR_NAME, id\n- );\n-\n- nodeCache[id] = node;\n- }\n- } else {\n- nodeCache[id] = node;\n- }\n+ invariant(\n+ !nodeCache.hasOwnProperty(id) || nodeCache[id] === node,\n+ 'ReactMount: Two unequal nodes with the same `%s`: %s',\n+ ATTR_NAME, id\n+ );\n+ nodeCache[id] = node;\n }\n \n return id;\n@@ -157,6 +149,25 @@ function setID(node, 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: Since this \"isValid\" business is now just a sanity check, we can\n+ \/\/ probably drop it with no consequences.\n+ invariant(\n+ !node || isValid(node, id),\n+ 'ReactMount: Cached node with `%s`: %s is missing from the document. ' +\n+ 'This probably means the DOM was unexpectedly mutated -- when removing ' +\n+ 'React-rendered children from the DOM, rerender without those children ' +\n+ 'or call ReactDOM.unmountComponentAtNode on the container to unmount an ' +\n+ 'entire subtree.',\n+ ATTR_NAME, id\n+ );\n+ return node;\n+}\n+\n \/**\n * Finds the node with the supplied React-generated DOM ID.\n *\n@@ -165,10 +176,12 @@ function setID(node, id) {\n * @internal\n *\/\n function getNode(id) {\n- if (!nodeCache.hasOwnProperty(id) || !isValid(nodeCache[id], id)) {\n- nodeCache[id] = ReactMount.findReactNodeByID(id);\n+ var node = getNodeIfCached(id);\n+ if (node) {\n+ return node;\n+ } else {\n+ return nodeCache[id] = ReactMount.findReactNodeByID(id);\n }\n- return nodeCache[id];\n }\n \n \/**\n@@ -183,10 +196,7 @@ function getNodeFromInstance(instance) {\n if (ReactEmptyComponentRegistry.isNullComponentID(id)) {\n return null;\n }\n- if (!nodeCache.hasOwnProperty(id) || !isValid(nodeCache[id], id)) {\n- nodeCache[id] = ReactMount.findReactNodeByID(id);\n- }\n- return nodeCache[id];\n+ return getNode(id);\n }\n \n \/**\n@@ -227,8 +237,8 @@ function purgeID(id) {\n \n var deepestNodeSoFar = null;\n function findDeepestCachedAncestorImpl(ancestorID) {\n- var ancestor = nodeCache[ancestorID];\n- if (ancestor && isValid(ancestor, 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@@ -724,19 +734,16 @@ var ReactMount = {\n * @return {string} The \"reactRoot\" ID of elements rendered within.\n *\/\n registerContainer: function(container) {\n- var reactRootID = getReactRootID(container);\n- if (reactRootID) {\n- \/\/ If one exists, make sure it is a valid \"reactRoot\" ID.\n- reactRootID = ReactInstanceHandles.getReactRootIDFromNodeID(reactRootID);\n- }\n- if (!reactRootID) {\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- reactRootID = ReactInstanceHandles.createReactRootID(\n+ id = ReactInstanceHandles.createReactRootID(\n ClientReactRootIndex.createReactRootIndex()\n );\n }\n- containersByReactRootID[reactRootID] = container;\n- return reactRootID;\n+ containersByReactRootID[id] = container;\n+ return id;\n },\n \n \/**\ndiff --git a\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js b\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\nindex e1ee6fc66b..3f31a52a21 100644\n--- a\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\n+++ b\/src\/renderers\/dom\/shared\/ReactComponentBrowserEnvironment.js\n@@ -11,8 +11,10 @@\n \n 'use strict';\n \n+var DOMChildrenOperations = require('DOMChildrenOperations');\n var ReactDOMIDOperations = require('ReactDOMIDOperations');\n var ReactMount = require('ReactMount');\n+var ReactPerf = require('ReactPerf');\n \n \/**\n * Abstracts away all functionality of the reconciler that requires knowledge of\n@@ -24,8 +26,8 @@ var ReactComponentBrowserEnvironment = {\n processChildrenUpdates:\n ReactDOMIDOperations.dangerouslyProcessChildrenUpdates,\n \n- replaceNodeWithMarkupByID:\n- ReactDOMIDOperations.dangerouslyReplaceNodeWithMarkupByID,\n+ replaceNodeWithMarkup:\n+ DOMChildrenOperations.dangerouslyReplaceNodeWithMarkup,\n \n \/**\n * If a particular environment requires that some resources be cleaned up,\n@@ -40,4 +42,12 @@ var ReactComponentBrowserEnvironment = {\n \n };\n \n+ReactPerf.measureMethods(\n+ ReactComponentBrowserEnvironment,\n+ 'ReactComponentBrowserEnvironment',\n+ {\n+ replaceNodeWithMarkup: 'replaceNodeWithMarkup',\n+ }\n+);\n+\n module.exports = ReactComponentBrowserEnvironment;\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\nindex 4e30c5f699..827f06d945 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMComponent.js\n@@ -357,7 +357,7 @@ function trapBubbledEventsLocal() {\n \/\/ If a component renders to null or if another component fatals and causes\n \/\/ the state of the tree to be corrupted, `node` here can be null.\n invariant(inst._rootNodeID, 'Must be mounted to trap events');\n- var node = ReactMount.getNode(inst._rootNodeID);\n+ var node = getNode(inst);\n invariant(\n node,\n 'trapBubbledEvent(...): Requires node to be rendered.'\n@@ -493,6 +493,14 @@ function isCustomComponent(tagName, props) {\n return tagName.indexOf('-') >= 0 || props.is != null;\n }\n \n+function getNode(inst) {\n+ if (inst._nativeNode) {\n+ return inst._nativeNode;\n+ } else {\n+ return inst._nativeNode = ReactMount.getNode(inst._rootNodeID);\n+ }\n+}\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@@ -513,10 +521,11 @@ function ReactDOMComponent(tag) {\n this._renderedChildren = null;\n this._previousStyle = null;\n this._previousStyleCopy = null;\n+ this._nativeNode = null;\n this._rootNodeID = null;\n this._wrapperState = null;\n this._topLevelWrapper = null;\n- this._nodeWithLegacyProperties = null;\n+ this._nodeHasLegacyProperties = false;\n if (__DEV__) {\n this._unprocessedContextDev = null;\n this._processedContextDev = null;\n@@ -600,10 +609,11 @@ ReactDOMComponent.Mixin = {\n if (transaction.useCreateElement) {\n var ownerDocument = context[ReactMount.ownerDocumentContextKey];\n var el = ownerDocument.createElement(this._currentElement.type);\n+ this._nativeNode = el;\n DOMPropertyOperations.setAttributeForID(el, this._rootNodeID);\n \/\/ Populate node cache\n ReactMount.getID(el);\n- this._updateDOMProperties({}, props, transaction, el);\n+ this._updateDOMProperties({}, props, transaction);\n this._createInitialChildren(transaction, props, context, el);\n mountImage = el;\n } else {\n@@ -844,7 +854,7 @@ ReactDOMComponent.Mixin = {\n \n \n assertValidProps(this, nextProps);\n- this._updateDOMProperties(lastProps, nextProps, transaction, null);\n+ this._updateDOMProperties(lastProps, nextProps, transaction);\n this._updateDOMChildren(\n lastProps,\n nextProps,\n@@ -852,8 +862,8 @@ ReactDOMComponent.Mixin = {\n context\n );\n \n- if (!canDefineProperty && this._nodeWithLegacyProperties) {\n- this._nodeWithLegacyProperties.props = nextProps;\n+ if (!canDefineProperty && this._nodeHasLegacyProperties) {\n+ this._nativeNode.props = nextProps;\n }\n \n if (this._tag === 'select') {\n@@ -877,10 +887,9 @@ ReactDOMComponent.Mixin = {\n * @private\n * @param {object} lastProps\n * @param {object} nextProps\n- * @param {ReactReconcileTransaction} transaction\n * @param {?DOMElement} node\n *\/\n- _updateDOMProperties: function(lastProps, nextProps, transaction, node) {\n+ _updateDOMProperties: function(lastProps, nextProps, transaction) {\n var propKey;\n var styleName;\n var styleUpdates;\n@@ -908,10 +917,7 @@ ReactDOMComponent.Mixin = {\n } else if (\n DOMProperty.properties[propKey] ||\n DOMProperty.isCustomAttribute(propKey)) {\n- if (!node) {\n- node = ReactMount.getNode(this._rootNodeID);\n- }\n- DOMPropertyOperations.deleteValueForProperty(node, propKey);\n+ DOMPropertyOperations.deleteValueForProperty(getNode(this), propKey);\n }\n }\n for (propKey in nextProps) {\n@@ -964,20 +970,15 @@ ReactDOMComponent.Mixin = {\n deleteListener(this._rootNodeID, propKey);\n }\n } else if (isCustomComponent(this._tag, nextProps)) {\n- if (!node) {\n- node = ReactMount.getNode(this._rootNodeID);\n- }\n DOMPropertyOperations.setValueForAttribute(\n- node,\n+ getNode(this),\n propKey,\n nextProp\n );\n } else if (\n DOMProperty.properties[propKey] ||\n DOMProperty.isCustomAttribute(propKey)) {\n- if (!node) {\n- node = ReactMount.getNode(this._rootNodeID);\n- }\n+ var node = getNode(this);\n \/\/ If we're updating to null or undefined, we should remove the property\n \/\/ from the DOM node instead of inadvertantly setting to a string. This\n \/\/ brings us in line with the same behavior we have on initial render.\n@@ -989,10 +990,7 @@ ReactDOMComponent.Mixin = {\n }\n }\n if (styleUpdates) {\n- if (!node) {\n- node = ReactMount.getNode(this._rootNodeID);\n- }\n- CSSPropertyOperations.setValueForStyles(node, styleUpdates);\n+ CSSPropertyOperations.setValueForStyles(getNode(this), styleUpdates);\n }\n },\n \n@@ -1089,21 +1087,26 @@ ReactDOMComponent.Mixin = {\n break;\n }\n \n+ var nativeNode = getNode(this);\n+ this._nativeNode = null;\n+ if (this._nodeHasLegacyProperties) {\n+ nativeNode._reactInternalComponent = null;\n+ }\n+\n this.unmountChildren();\n ReactBrowserEventEmitter.deleteAllListeners(this._rootNodeID);\n ReactComponentBrowserEnvironment.unmountIDFromEnvironment(this._rootNodeID);\n this._rootNodeID = null;\n this._wrapperState = null;\n- if (this._nodeWithLegacyProperties) {\n- var node = this._nodeWithLegacyProperties;\n- node._reactInternalComponent = null;\n- this._nodeWithLegacyProperties = null;\n- }\n+\n+ return nativeNode;\n },\n \n getPublicInstance: function() {\n- if (!this._nodeWithLegacyProperties) {\n- var node = ReactMount.getNode(this._rootNodeID);\n+ if (this._nodeHasLegacyProperties) {\n+ return this._nativeNode;\n+ } else {\n+ var node = getNode(this);\n \n node._reactInternalComponent = this;\n node.getDOMNode = legacyGetDOMNode;\n@@ -1126,9 +1129,9 @@ ReactDOMComponent.Mixin = {\n node.props = this._currentElement.props;\n }\n \n- this._nodeWithLegacyProperties = node;\n+ this._nodeHasLegacyProperties = true;\n+ return node;\n }\n- return this._nodeWithLegacyProperties;\n },\n \n };\ndiff --git a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\nindex 7212058905..9aab346986 100644\n--- a\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n+++ b\/src\/renderers\/dom\/shared\/ReactDOMTextComponent.js\n@@ -52,6 +52,7 @@ assign(ReactDOMTextComponent.prototype, {\n \/\/ TODO: This is really a ReactText (ReactNode), not a ReactElement\n this._currentElement = text;\n this._stringText = '' + text;\n+ this._nativeNode = null;\n \n \/\/ Properties\n this._rootNodeID = null;\n@@ -82,6 +83,7 @@ assign(ReactDOMTextComponent.prototype, {\n if (transaction.useCreateElement) {\n var ownerDocument = context[ReactMount.ownerDocumentContextKey];\n var el = ownerDocument.createElement('span');\n+ this._nativeNode = el;\n DOMPropertyOperations.setAttributeForID(el, rootID);\n \/\/ Populate node cache\n ReactMount.getID(el);\n@@ -121,14 +123,20 @@ assign(ReactDOMTextComponent.prototype, {\n \/\/ and\/or updateComponent to do the actual update for consistency with\n \/\/ other component types?\n this._stringText = nextStringText;\n- var node = ReactMount.getNode(this._rootNodeID);\n+ var node = this._nativeNode;\n+ if (!node) {\n+ node = this._nativeNode = ReactMount.getNode(this._rootNodeID);\n+ }\n DOMChildrenOperations.updateTextContent(node, nextStringText);\n }\n }\n },\n \n unmountComponent: function() {\n+ var node = this._nativeNode || ReactMount.getNode(this._rootNodeID);\n+ this._nativeNode = null;\n ReactComponentBrowserEnvironment.unmountIDFromEnvironment(this._rootNodeID);\n+ return node;\n },\n \n });\ndiff --git a\/src\/renderers\/shared\/reconciler\/ReactComponentEnvironment.js b\/src\/renderers\/shared\/reconciler\/ReactComponentEnvironment.js\nindex 91359f2bbe..274f53f3b4 100644\n--- a\/src\/renderers\/shared\/reconciler\/ReactComponentEnvironment.js\n+++ b\/src\/renderers\/shared\/reconciler\/ReactComponentEnvironment.js\n@@ -28,7 +28,7 @@ var ReactComponentEnvironment = {\n * Optionally injectable hook for swapping out mount images in the middle of\n * the tree.\n *\/\n- replaceNodeWithMarkupByID: null,\n+ replaceNodeWithMarkup: null,\n \n \/**\n * Optionally injectable hook for processing a queue of child updates. Will\n@@ -44,8 +44,8 @@ var ReactComponentEnvironment = {\n );\n ReactComponentEnvironment.unmountIDFromEnvironment =\n environment.unmountIDFromEnvironment;\n- ReactComponentEnvironment.replaceNodeWithMarkupByID =\n- environment.replaceNodeWithMarkupByID;\n+ ReactComponentEnvironment.replaceNodeWithMarkup =\n+ environment.replaceNodeWithMarkup;\n ReactComponentEnvironment.processChildrenUpdates =\n environment.processChildrenUpdates;\n injected = true;\ndiff --git a\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js b\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js\nindex fb570f7fe3..c7c9a8c354 100644\n--- a\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js\n+++ b\/src\/renderers\/shared\/reconciler\/ReactCompositeComponent.js\n@@ -310,7 +310,8 @@ var ReactCompositeComponentMixin = {\n inst.componentWillUnmount();\n }\n \n- ReactReconciler.unmountComponent(this._renderedComponent);\n+ var unmountedNativeNode =\n+ ReactReconciler.unmountComponent(this._renderedComponent);\n this._renderedComponent = null;\n this._instance = null;\n \n@@ -339,6 +340,7 @@ var ReactCompositeComponentMixin = {\n \/\/ TODO: inst.props = null;\n \/\/ TODO: inst.state = null;\n \/\/ TODO: inst.context = null;\n+ return unmountedNativeNode;\n },\n \n \/**\n@@ -727,30 +729,30 @@ var ReactCompositeComponentMixin = {\n this._processChildContext(context)\n );\n } else {\n- \/\/ These two IDs are actually the same! But nothing should rely on that.\n- var thisID = this._rootNodeID;\n- var prevComponentID = prevComponentInstance._rootNodeID;\n- ReactReconciler.unmountComponent(prevComponentInstance);\n+ var oldNativeNode =\n+ ReactReconciler.unmountComponent(prevComponentInstance);\n \n this._renderedComponent = this._instantiateReactComponent(\n nextRenderedElement\n );\n var nextMarkup = ReactReconciler.mountComponent(\n this._renderedComponent,\n- thisID,\n+ this._rootNodeID,\n transaction,\n this._processChildContext(context)\n );\n- this._replaceNodeWithMarkupByID(prevComponentID, nextMarkup);\n+ this._replaceNodeWithMarkup(oldNativeNode, nextMarkup);\n }\n },\n \n \/**\n+ * Overridden in shallow rendering.\n+ *\n * @protected\n *\/\n- _replaceNodeWithMarkupByID: function(prevComponentID, nextMarkup) {\n- ReactComponentEnvironment.replaceNodeWithMarkupByID(\n- prevComponentID,\n+ _replaceNodeWithMarkup: function(oldNativeNode, nextMarkup) {\n+ ReactComponentEnvironment.replaceNodeWithMarkup(\n+ oldNativeNode,\n nextMarkup\n );\n },\ndiff --git a\/src\/renderers\/shared\/reconciler\/ReactEmptyComponent.js b\/src\/renderers\/shared\/reconciler\/ReactEmptyComponent.js\nindex 715dece5f1..1829265b9c 100644\n--- a\/src\/renderers\/shared\/reconciler\/ReactEmptyComponent.js\n+++ b\/src\/renderers\/shared\/reconciler\/ReactEmptyComponent.js\n@@ -46,10 +46,11 @@ assign(ReactEmptyComponent.prototype, {\n receiveComponent: function() {\n },\n unmountComponent: function(rootID, transaction, context) {\n- ReactReconciler.unmountComponent(this._renderedComponent);\n+ var nativeNode = ReactReconciler.unmountComponent(this._renderedComponent);\n ReactEmptyComponentRegistry.deregisterNullComponentID(this._rootNodeID);\n this._rootNodeID = null;\n this._renderedComponent = null;\n+ return nativeNode;\n },\n });\n \ndiff --git a\/src\/renderers\/shared\/reconciler\/ReactReconciler.js b\/src\/renderers\/shared\/reconciler\/ReactReconciler.js\nindex ab3fbb0f6c..4e50d387b3 100644\n--- a\/src\/renderers\/shared\/reconciler\/ReactReconciler.js\n+++ b\/src\/renderers\/shared\/reconciler\/ReactReconciler.js\n@@ -50,7 +50,7 @@ var ReactReconciler = {\n *\/\n unmountComponent: function(internalInstance) {\n ReactRef.detachRefs(internalInstance, internalInstance._currentElement);\n- internalInstance.unmountComponent();\n+ return internalInstance.unmountComponent();\n },\n \n \/**\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\nindex f5dbc051ff..7cb1ba9d95 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactInstanceHandles-test.js\n@@ -76,72 +76,84 @@ describe('ReactInstanceHandles', function() {\n \n describe('findComponentRoot', function() {\n it('should find the correct node with prefix sibling IDs', function() {\n- var parentNode = document.createElement('div');\n- var childNodeA = document.createElement('div');\n- var childNodeB = document.createElement('div');\n- parentNode.appendChild(childNodeA);\n- parentNode.appendChild(childNodeB);\n-\n- ReactMount.setID(parentNode, '.0');\n- ReactMount.setID(childNodeA, '.0.0');\n- ReactMount.setID(childNodeB, '.0.0:1');\n+ var parentNode = ReactTestUtils.renderIntoDocument(\n+

\n+

\n+ {[

]}\n+ <\/div>\n+ );\n+ var childNodeB = parentNode.childNodes[1];\n \n expect(\n- ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB)\n+ ReactMount.getNode(\n+ getNodeID(childNodeB)\n )\n ).toBe(childNodeB);\n });\n \n it('should work around unidentified nodes', function() {\n- var parentNode = document.createElement('div');\n- var childNodeA = document.createElement('div');\n- var childNodeB = document.createElement('div');\n- parentNode.appendChild(childNodeA);\n- parentNode.appendChild(childNodeB);\n+ var parentNode = ReactTestUtils.renderIntoDocument(\n+

\n+ {[

]}\n+ <\/div>\n+ );\n+ var childNodeB = parentNode.childNodes[0];\n \n- ReactMount.setID(parentNode, '.0');\n \/\/ No ID on `childNodeA`.\n- ReactMount.setID(childNodeB, '.0.0:1');\n+ var childNodeA = document.createElement('div');\n+ parentNode.insertBefore(childNodeA, childNodeB);\n \n expect(\n- ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB)\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- var parentNode = document.createElement('table');\n- var childNodeA = document.createElement('tbody');\n- var childNodeB = document.createElement('tr');\n- parentNode.appendChild(childNodeA);\n- childNodeA.appendChild(childNodeB);\n-\n- ReactMount.setID(parentNode, '.0');\n- \/\/ No ID on `childNodeA`, it was \"rendered by the browser\".\n- ReactMount.setID(childNodeB, '.0.1:0');\n+ spyOn(console, 'error');\n+ var parentNode = ReactTestUtils.renderIntoDocument(\n+ \n+ \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(ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB)\n- )).toBe(childNodeB);\n+ expect(\n+ ReactMount.getNode(\n+ getNodeID(childNodeB)\n+ )\n+ ).toBe(childNodeB);\n \n+ var junkID = getNodeID(childNodeB) + ':junk';\n expect(function() {\n- ReactMount.findComponentRoot(\n- parentNode,\n- ReactMount.getID(childNodeB) + ':junk'\n+ ReactMount.getNode(\n+ junkID\n );\n }).toThrow(\n- 'Invariant Violation: findComponentRoot(..., .0.1:0:junk): ' +\n+ 'Invariant Violation: findComponentRoot(..., ' + junkID + '): ' +\n 'Unable to find element. This probably means the DOM was ' +\n 'unexpectedly mutated (e.g., by the browser), usually due to ' +\n 'forgetting a when using tables, nesting tags ' +\n 'like ,

, or , or using non-SVG elements in an

dillon1000/react

Files changed