Merge pull request facebook#3614 from kassens/set_style_null

Fix for style not always reset when set to null
zpao · Apr 13, 2015 · 0e70730 · 0e70730
1 parent 631887d
commit 0e70730
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
@@ -373,6 +373,8 @@ ReactDOMComponent.Mixin = {
       if (propKey === STYLE) {
         if (nextProp) {
           nextProp = this._previousStyleCopy = assign({}, nextProp);
+        } else {
+          this._previousStyleCopy = null;
         }
         if (lastProp) {
           // Unset styles on `lastProp` but not on `nextProp`.

diff --git a/src/browser/ui/__tests__/ReactDOMComponent-test.js b/src/browser/ui/__tests__/ReactDOMComponent-test.js
@@ -109,6 +109,27 @@ describe('ReactDOMComponent', function() {
       expect(stubStyle.display).toEqual('block');
     });
 
+    it("should update styles if updated to null multiple times", function() {
+      var styles = null;
+      var container = document.createElement('div');
+      React.render(<div style={styles} />, container);
+
+      styles = {display: 'block'};
+      var stubStyle = container.firstChild.style;
+
+      React.render(<div style={styles} />, container);
+      expect(stubStyle.display).toEqual('block');
+
+      React.render(<div style={null} />, container);
+      expect(stubStyle.display).toEqual('');
+
+      React.render(<div style={styles} />, container);
+      expect(stubStyle.display).toEqual('block');
+
+      React.render(<div style={null} />, container);
+      expect(stubStyle.display).toEqual('');
+    });
+
     it("should remove attributes", function() {
       var container = document.createElement('div');
       React.render(<img height='17' />, container);