{"body":"Be more lenient with invalid nodes in the cache","commit":{"authorName":"Ben Alpert","revision":"4f9fdeeec1df0302ca01236acbecf08996284d1e","shortRevision":"4f9fdeeec1","authorEmail":"ben@benalpert.com","authoredAt":"2015-10-13T17:22:12-07:00","subject":"Merge pull request #5165 from spicyj\/cache-lenient"},"files":[{"status":"M","path":"src\/renderers\/dom\/client\/ReactMount.js"},{"status":"M","path":"src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js"}],"patch":"diff --git a\/src\/renderers\/dom\/client\/ReactMount.js b\/src\/renderers\/dom\/client\/ReactMount.js\nindex 676f486e74..aca81fa2b0 100644\n--- a\/src\/renderers\/dom\/client\/ReactMount.js\n+++ b\/src\/renderers\/dom\/client\/ReactMount.js\n@@ -111,9 +111,12 @@ function getReactRootID(container) {\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- !nodeCache.hasOwnProperty(id) || nodeCache[id] === node,\n- 'ReactMount: Two unequal nodes with the same `%s`: %s',\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@@ -149,18 +152,11 @@ function setID(node, id) {\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+ \/\/ 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 \/**\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\nindex bec3a3bf11..6159752454 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n@@ -275,4 +275,29 @@ describe('ReactMount', function() {\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","parents":["af99b2c2a30d926b58c22067b83a734f97b7c0a7","e89e6755082f6b690ea4aaf280716a9fc2e9e9b0"]}

dillon1000/react

Files changed