From 7221e1b2e9369f3655fc68586f59cb67cf0f3d0e Mon Sep 17 00:00:00 2001 From: Ben Alpert Date: Fri, 23 Oct 2015 11:51:49 -0700 Subject: [PATCH] Don't set DOM props when switching between unset/undefined/null --- src/renderers/dom/shared/ReactDOMComponent.js | 7 +++++-- .../shared/__tests__/ReactDOMComponent-test.js | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) 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(