diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js index c5b061dd19..bcdfafd953 100644 --- a/src/renderers/dom/shared/ReactDOMComponent.js +++ b/src/renderers/dom/shared/ReactDOMComponent.js @@ -936,7 +936,8 @@ ReactDOMComponent.Mixin = { var styleUpdates; for (propKey in lastProps) { if (nextProps.hasOwnProperty(propKey) || - !lastProps.hasOwnProperty(propKey)) { + !lastProps.hasOwnProperty(propKey) || + lastProps[propKey] == null) { continue; } if (propKey === STYLE) { @@ -966,7 +967,9 @@ ReactDOMComponent.Mixin = { var lastProp = propKey === STYLE ? this._previousStyleCopy : lastProps[propKey]; - if (!nextProps.hasOwnProperty(propKey) || nextProp === lastProp) { + if (!nextProps.hasOwnProperty(propKey) || + nextProp === lastProp || + nextProp == null && lastProp == null) { continue; } if (propKey === STYLE) { diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js index ac042eaa4d..7e6c78b9ce 100644 --- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js +++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js @@ -426,6 +426,24 @@ describe('ReactDOMComponent', function() { ReactDOM.render(, container); expect(container.firstChild.hasAttribute('cowabunga')).toBe(true); }); + + it('should not update when switching between null/undefined', function() { + var container = document.createElement('div'); + var node = ReactDOM.render(
, container); + + var setter = mocks.getMockFunction(); + Object.defineProperty(node, 'dir', { + get: function() {}, + set: setter, + }); + + ReactDOM.render(, container); + ReactDOM.render(, container); + ReactDOM.render(, container); + expect(setter.mock.calls.length).toBe(0); + ReactDOM.render(, container); + expect(setter.mock.calls.length).toBe(1); + }); }); describe('createOpenTagMarkup', function() {