diff --git a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js index 1eb09237ce..f1cdc7baf9 100644 --- a/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js +++ b/src/renderers/dom/client/wrappers/__tests__/ReactDOMSelect-test.js @@ -226,7 +226,14 @@ describe('ReactDOMSelect', function() { // Changing the `value` prop should change the selected options. objectToString.animal = 'monkey'; - ReactDOM.render(el, container); + + var el2 = + ; + ReactDOM.render(el2, container); expect(node.options[0].selected).toBe(true); // monkey expect(node.options[1].selected).toBe(false); // giraffe diff --git a/src/renderers/shared/reconciler/ReactReconciler.js b/src/renderers/shared/reconciler/ReactReconciler.js index 8e4a140c68..a5af42d2a2 100644 --- a/src/renderers/shared/reconciler/ReactReconciler.js +++ b/src/renderers/shared/reconciler/ReactReconciler.js @@ -65,8 +65,8 @@ var ReactReconciler = { internalInstance, nextElement, transaction, context ) { var prevElement = internalInstance._currentElement; + if (nextElement === prevElement && - nextElement._owner != null && context === internalInstance._context ) { // Since elements are immutable after the owner is rendered,