Skip to content

Fix for style not always reset when set to null #3614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zpao merged 1 commit into from
Apr 7, 2015
Merged

Fix for style not always reset when set to null #3614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/browser/ui/ReactDOMComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,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`.
Expand Down
21 changes: 21 additions & 0 deletions src/browser/ui/__tests__/ReactDOMComponent-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down