Skip to content
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

Jump to bottom

Improve DEV performance in Chrome #7483

Merged
merged 2 commits into from
Aug 12, 2016
Merged

Improve DEV performance in Chrome #7483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
638eb22
Ensure this._domID is always a number
gaearon Aug 12, 2016
cf6be84
Ensure this._rootNodeID is always a number
gaearon Aug 12, 2016
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: 1 addition & 1 deletion src/renderers/dom/client/ReactDOMComponentTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ function precacheChildNodes(inst, node) {
}
var childInst = children[name];
var childID = getRenderedHostOrTextFromComponent(childInst)._domID;
if (childID == null) {
if (childID === 0) {
// We're currently unmounting this child in ReactMultiChild; skip it.
continue;
}
Expand Down
8 changes: 4 additions & 4 deletions src/renderers/dom/shared/ReactDOMComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,8 @@ function ReactDOMComponent(element) {
this._previousStyleCopy = null;
this._hostNode = null;
this._hostParent = null;
this._rootNodeID = null;
this._domID = null;
this._rootNodeID = 0;
this._domID = 0;
this._hostContainerInfo = null;
this._wrapperState = null;
this._topLevelWrapper = null;
Expand Down Expand Up @@ -1190,8 +1190,8 @@ ReactDOMComponent.Mixin = {
this.unmountChildren(safely);
ReactDOMComponentTree.uncacheNode(this);
EventPluginHub.deleteAllListeners(this);
this._rootNodeID = null;
this._domID = null;
this._rootNodeID = 0;
this._domID = 0;
this._wrapperState = null;

if (__DEV__) {
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/dom/shared/ReactDOMEmptyComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var ReactDOMEmptyComponent = function(instantiate) {
this._hostNode = null;
this._hostParent = null;
this._hostContainerInfo = null;
this._domID = null;
this._domID = 0;
};
Object.assign(ReactDOMEmptyComponent.prototype, {
mountComponent: function(
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/dom/shared/ReactDOMTextComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var ReactDOMTextComponent = function(text) {
this._hostParent = null;

// Properties
this._domID = null;
this._domID = 0;
this._mountIndex = 0;
this._closingComment = null;
this._commentNodes = null;
Expand Down
4 changes: 2 additions & 2 deletions src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ describe('ReactDOMComponent', function() {

var NodeStub = function(initialProps) {
this._currentElement = {props: initialProps};
this._rootNodeID = 'test';
this._rootNodeID = 1;
};
Object.assign(NodeStub.prototype, ReactDOMComponent.Mixin);

Expand Down Expand Up @@ -690,7 +690,7 @@ describe('ReactDOMComponent', function() {

var NodeStub = function(initialProps) {
this._currentElement = {props: initialProps};
this._rootNodeID = 'test';
this._rootNodeID = 1;
};
Object.assign(NodeStub.prototype, ReactDOMComponent.Mixin);

Expand Down
2 changes: 1 addition & 1 deletion src/renderers/native/ReactNativeBaseComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ ReactNativeBaseComponent.Mixin = {
ReactNativeComponentTree.uncacheNode(this);
deleteAllListeners(this);
this.unmountChildren();
this._rootNodeID = null;
this._rootNodeID = 0;
},

/**
Expand Down
4 changes: 2 additions & 2 deletions src/renderers/native/ReactNativeTextComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var ReactNativeTextComponent = function(text) {
this._currentElement = text;
this._stringText = '' + text;
this._hostParent = null;
this._rootNodeID = null;
this._rootNodeID = 0;
};

Object.assign(ReactNativeTextComponent.prototype, {
Expand Down Expand Up @@ -73,7 +73,7 @@ Object.assign(ReactNativeTextComponent.prototype, {
ReactNativeComponentTree.uncacheNode(this);
this._currentElement = null;
this._stringText = null;
this._rootNodeID = null;
this._rootNodeID = 0;
},

});
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/native/createReactNativeComponentClass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ var createReactNativeComponentClass = function(
this._topLevelWrapper = null;
this._hostParent = null;
this._hostContainerInfo = null;
this._rootNodeID = null;
this._rootNodeID = 0;
this._renderedChildren = null;
};
Constructor.displayName = viewConfig.uiViewClassName;
Expand Down
4 changes: 2 additions & 2 deletions src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ var ReactCompositeComponentMixin = {
*/
construct: function(element) {
this._currentElement = element;
this._rootNodeID = null;
this._rootNodeID = 0;
this._compositeType = null;
this._instance = null;
this._hostParent = null;
Expand Down Expand Up @@ -612,7 +612,7 @@ var ReactCompositeComponentMixin = {
// These fields do not really need to be reset since this object is no
// longer accessible.
this._context = null;
this._rootNodeID = null;
this._rootNodeID = 0;
this._topLevelWrapper = null;

// Delete the reference from the instance to this internal representation
Expand Down