mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Fix componentWillUnmount() not counted by ReactPerf (#6858)
* Fix componentWillUnmount() not counted by ReactPerf
* Test that functional component render() time shows up in ReactPerf
* Test for setState() code path updates being included
(cherry picked from commit 9ba5668d18)
This commit is contained in:
1 parent
3cf363384e
commit
c1a9d1c0e0
2 files changed
+81
-2
No files matched your search
@@ -169,7 +169,13 @@ function batchedMountComponentIntoNode(
|
||||
* @see {ReactMount.unmountComponentAtNode}
|
||||
*/
|
||||
function unmountComponentFromNode(instance, container, safely) {
|
||||
if (__DEV__) {
|
||||
ReactInstrumentation.debugTool.onBeginFlush();
|
||||
}
|
||||
ReactReconciler.unmountComponent(instance, safely);
|
||||
if (__DEV__) {
|
||||
ReactInstrumentation.debugTool.onEndFlush();
|
||||
}
|
||||
|
||||
if (container.nodeType === DOC_NODE_TYPE) {
|
||||
container = container.documentElement;
|
||||
|
||||
@@ -16,10 +16,12 @@ describe('ReactPerf', function() {
|
||||
var ReactDOM;
|
||||
var ReactPerf;
|
||||
var ReactTestUtils;
|
||||
var emptyFunction;
|
||||
|
||||
var App;
|
||||
var Box;
|
||||
var Div;
|
||||
var LifeCycle;
|
||||
|
||||
beforeEach(function() {
|
||||
var now = 0;
|
||||
@@ -36,6 +38,7 @@ describe('ReactPerf', function() {
|
||||
ReactDOM = require('ReactDOM');
|
||||
ReactPerf = require('ReactPerf');
|
||||
ReactTestUtils = require('ReactTestUtils');
|
||||
emptyFunction = require('emptyFunction');
|
||||
|
||||
App = React.createClass({
|
||||
render: function() {
|
||||
@@ -55,6 +58,17 @@ describe('ReactPerf', function() {
|
||||
return <div {...this.props} />;
|
||||
},
|
||||
});
|
||||
|
||||
LifeCycle = React.createClass({
|
||||
shouldComponentUpdate: emptyFunction.thatReturnsTrue,
|
||||
componentWillMount: emptyFunction,
|
||||
componentDidMount: emptyFunction,
|
||||
componentWillReceiveProps: emptyFunction,
|
||||
componentWillUpdate: emptyFunction,
|
||||
componentDidUpdate: emptyFunction,
|
||||
componentWillUnmount: emptyFunction,
|
||||
render: emptyFunction.thatReturnsNull,
|
||||
});
|
||||
});
|
||||
|
||||
afterEach(function() {
|
||||
@@ -215,7 +229,7 @@ describe('ReactPerf', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('should not count replacing null with a native as waste', function() {
|
||||
it('should not count replacing null with a host as waste', function() {
|
||||
var element = null;
|
||||
function Foo() {
|
||||
return element;
|
||||
@@ -228,7 +242,7 @@ describe('ReactPerf', function() {
|
||||
});
|
||||
});
|
||||
|
||||
it('should not count replacing a native with null as waste', function() {
|
||||
it('should not count replacing a host with null as waste', function() {
|
||||
var element = <div />;
|
||||
function Foo() {
|
||||
return element;
|
||||
@@ -256,6 +270,65 @@ describe('ReactPerf', function() {
|
||||
}]);
|
||||
});
|
||||
|
||||
it('should include lifecycle methods in measurements', function() {
|
||||
var container = document.createElement('div');
|
||||
var measurements = measure(() => {
|
||||
var instance = ReactDOM.render(<LifeCycle />, container);
|
||||
ReactDOM.render(<LifeCycle />, container);
|
||||
instance.setState({});
|
||||
ReactDOM.unmountComponentAtNode(container);
|
||||
});
|
||||
expect(ReactPerf.getExclusive(measurements)).toEqual([{
|
||||
key: 'LifeCycle',
|
||||
instanceCount: 1,
|
||||
totalDuration: 14,
|
||||
counts: {
|
||||
ctor: 1,
|
||||
shouldComponentUpdate: 2,
|
||||
componentWillMount: 1,
|
||||
componentDidMount: 1,
|
||||
componentWillReceiveProps: 1,
|
||||
componentWillUpdate: 2,
|
||||
componentDidUpdate: 2,
|
||||
componentWillUnmount: 1,
|
||||
render: 3,
|
||||
},
|
||||
durations: {
|
||||
ctor: 1,
|
||||
shouldComponentUpdate: 2,
|
||||
componentWillMount: 1,
|
||||
componentDidMount: 1,
|
||||
componentWillReceiveProps: 1,
|
||||
componentWillUpdate: 2,
|
||||
componentDidUpdate: 2,
|
||||
componentWillUnmount: 1,
|
||||
render: 3,
|
||||
},
|
||||
}]);
|
||||
});
|
||||
|
||||
it('should include render time of functional components', function() {
|
||||
function Foo() {
|
||||
return null;
|
||||
}
|
||||
|
||||
var container = document.createElement('div');
|
||||
var measurements = measure(() => {
|
||||
ReactDOM.render(<Foo />, container);
|
||||
});
|
||||
expect(ReactPerf.getExclusive(measurements)).toEqual([{
|
||||
key: 'Foo',
|
||||
instanceCount: 1,
|
||||
totalDuration: 1,
|
||||
counts: {
|
||||
render: 1,
|
||||
},
|
||||
durations: {
|
||||
render: 1,
|
||||
},
|
||||
}]);
|
||||
});
|
||||
|
||||
it('warns once when using getMeasurementsSummaryMap', function() {
|
||||
var measurements = measure(() => {});
|
||||
spyOn(console, 'error');
|
||||
|
||||
Reference in new issue
Block a user