{"patch":"diff --git a\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js b\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js\nindex 255e634688..02faac4dad 100644\n--- a\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js\n+++ b\/src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js\n@@ -83,7 +83,7 @@ var DOMChildrenOperations = {\n update.type === ReactMultiChildUpdateTypes.REMOVE_NODE) {\n var updatedIndex = update.fromIndex;\n var updatedChild = update.parentNode.childNodes[updatedIndex];\n- var parentID = update.parentID;\n+ var parentID = update.parentInst._rootNodeID;\n \n invariant(\n updatedChild,\n@@ -143,7 +143,7 @@ var DOMChildrenOperations = {\n case ReactMultiChildUpdateTypes.MOVE_EXISTING:\n insertChildAt(\n update.parentNode,\n- initialChildren[update.parentID][update.fromIndex],\n+ initialChildren[update.parentInst._rootNodeID][update.fromIndex],\n update.toIndex\n );\n break;\ndiff --git a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\nindex 9f6528c35b..f29f2f3c85 100644\n--- a\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n+++ b\/src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js\n@@ -454,6 +454,40 @@ describe('ReactDOMComponent', function() {\n ReactDOM.render(

, container);\n expect(setter.mock.calls.length).toBe(1);\n });\n+\n+ it('handles multiple child updates without interference', function() {\n+ \/\/ This test might look like it's just testing ReactMultiChild but the\n+ \/\/ last bug in this was actually in DOMChildrenOperations so this test\n+ \/\/ needs to be in some DOM-specific test file.\n+ var container = document.createElement('div');\n+\n+ \/\/ ABCD\n+ ReactDOM.render(\n+

\n+

A<\/div>

B<\/div>\n+ <\/div>\n+

\n+

C<\/div>

D<\/div>\n+ <\/div>\n+ <\/div>,\n+ container\n+ );\n+ \/\/ BADC\n+ ReactDOM.render(\n+

\n+

B<\/div>

A<\/div>\n+ <\/div>\n+

\n+

D<\/div>

C<\/div>\n+ <\/div>\n+ <\/div>,\n+ container\n+ );\n+\n+ expect(container.textContent).toBe('BADC');\n+ });\n });\n \n describe('createOpenTagMarkup', function() {\n","body":"This test failed before! How embarrassing.","commit":{"shortRevision":"f9a8bdcafe","revision":"f9a8bdcafe2900902c9912eee8aeec2a0c1fb557","subject":"Handle multiple DOM updates without interference","authorName":"Ben Alpert","authorEmail":"balpert@fb.com","authoredAt":"2015-11-09T15:22:23-08:00"},"parents":["80af7c7be49a9deca127c6dc3094831645558f8f"],"files":[{"path":"src\/renderers\/dom\/client\/utils\/DOMChildrenOperations.js","status":"M"},{"path":"src\/renderers\/dom\/shared\/__tests__\/ReactDOMComponent-test.js","status":"M"}]}

dillon1000/react

Files changed