Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent null reference access when unsetting styles

Browse Source
This commit is contained in:
Daniel Gasienica
2014-06-10 13:33:32 -07:00
parent 2f61996ec3
commit 7c2dec5bd3
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser/ui/ReactDOMComponent.js
+1 -1
View File
@@ -307,7 +307,7 @@ ReactDOMComponent.Mixin = {
// Unset styles on `lastProp` but not on `nextProp`.
for (styleName in lastProp) {
if (lastProp.hasOwnProperty(styleName) &&
!nextProp.hasOwnProperty(styleName)) {
(!nextProp || !nextProp.hasOwnProperty(styleName))) {
styleUpdates = styleUpdates || {};
styleUpdates[styleName] = '';
}
src/browser/ui/__tests__/ReactDOMComponent-test.js
+5
View File
@@ -97,6 +97,11 @@ describe('ReactDOMComponent', function() {
expect(stubStyle.display).toEqual('block');
expect(stubStyle.fontFamily).toEqual('Helvetica');
expect(stubStyle.lineHeight).toEqual('0.5');
stub.receiveComponent({props: { style: undefined }}, transaction);
expect(stubStyle.display).toBe('');
expect(stubStyle.fontFamily).toBe('');
expect(stubStyle.lineHeight).toBe('');
});
it("should update styles if initially null", function() {