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

Meant to commit these changes with #8206... oops.

Browse Source
This commit is contained in:
Andrew Clark
2016-11-08 13:47:31 -08:00
parent 3a09f4bf30
commit f829e2f1f1
5 changed files with 146 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/fiber/tests-failing.txt
-3
View File
@@ -72,9 +72,6 @@ src/renderers/art/__tests__/ReactART-test.js
* resolves refs before componentDidMount
* resolves refs before componentDidUpdate
src/renderers/dom/__tests__/ReactDOMProduction-test.js
* should throw with an error code in production
src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
* should set style attribute when styles exist
* should warn when using hyphenated style names
scripts/fiber/tests-passing.txt
+3 -1
View File
@@ -453,6 +453,7 @@ src/renderers/dom/__tests__/ReactDOMProduction-test.js
* should use prod React
* should handle a simple flow
* should call lifecycle methods
* should throw with an error code in production
src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
* should render strings as children
@@ -842,6 +843,8 @@ src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
* splits deferred work on multiple roots
* works on deferred roots in the order they were scheduled
* handles interleaved deferred and animation work
* schedules sync updates when inside componentDidMount/Update
* can opt-in to deferred/animation scheduling inside componentDidMount/Update
src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
* can update child nodes of a host instance
@@ -862,7 +865,6 @@ src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
* calls setState callback even if component bails out
* calls componentWillUnmount after a deletion, even if nested
* calls componentDidMount/Update after insertion/update
* schedules sync updates when inside componentDidMount/Update
* invokes ref callbacks after insertion/update/unmount
* supports string refs
src/renderers/shared/fiber/ReactFiberScheduler.js
+5 -2
View File
@@ -211,8 +211,11 @@ module.exports = function<T, P, I, TI, C>(config : HostConfig<T, P, I, TI, C>) {
const current = effectfulFiber.alternate;
const previousPriorityContext = priorityContext;
priorityContext = TaskPriority;
commitLifeCycles(current, effectfulFiber);
priorityContext = previousPriorityContext;
try {
commitLifeCycles(current, effectfulFiber);
} finally {
priorityContext = previousPriorityContext;
}
}
const next = effectfulFiber.nextEffect;
// Ensure that we clean these up so that we don't accidentally keep them.
src/renderers/shared/fiber/__tests__/ReactIncrementalScheduling-test.js
+138
View File
@@ -449,4 +449,142 @@ describe('ReactIncrementalScheduling', () => {
expect(ReactNoop.getChildren('b')).toEqual([span('b:3')]);
expect(ReactNoop.getChildren('c')).toEqual([span('c:3')]);
});
it('schedules sync updates when inside componentDidMount/Update', () => {
var instance;
var ops = [];
class Foo extends React.Component {
state = { tick: 0 };
componentDidMount() {
ops.push('componentDidMount (before setState): ' + this.state.tick);
this.setState({ tick: 1 });
// We're in a batch. Update hasn't flushed yet.
ops.push('componentDidMount (after setState): ' + this.state.tick);
}
componentDidUpdate() {
ops.push('componentDidUpdate: ' + this.state.tick);
if (this.state.tick === 2) {
ops.push('componentDidUpdate (before setState): ' + this.state.tick);
this.setState({ tick: 3 });
ops.push('componentDidUpdate (after setState): ' + this.state.tick);
// We're in a batch. Update hasn't flushed yet.
}
}
render() {
ops.push('render: ' + this.state.tick);
instance = this;
return <span prop={this.state.tick} />;
}
}
ReactNoop.render(<Foo />);
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual([
'render: 0',
'componentDidMount (before setState): 0',
'componentDidMount (after setState): 0',
// If the setState inside componentDidMount were deferred, there would be
// no more ops. Because it has Task priority, we get these ops, too:
'render: 1',
'componentDidUpdate: 1',
]);
ops = [];
instance.setState({ tick: 2 });
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual([
'render: 2',
'componentDidUpdate: 2',
'componentDidUpdate (before setState): 2',
'componentDidUpdate (after setState): 2',
// If the setState inside componentDidUpdate were deferred, there would be
// no more ops. Because it has Task priority, we get these ops, too:
'render: 3',
'componentDidUpdate: 3',
]);
});
it('can opt-in to deferred/animation scheduling inside componentDidMount/Update', () => {
var instance;
var ops = [];
class Foo extends React.Component {
state = { tick: 0 };
componentDidMount() {
ReactNoop.performAnimationWork(() => {
ops.push('componentDidMount (before setState): ' + this.state.tick);
this.setState({ tick: 1 });
ops.push('componentDidMount (after setState): ' + this.state.tick);
});
}
componentDidUpdate() {
ReactNoop.performAnimationWork(() => {
ops.push('componentDidUpdate: ' + this.state.tick);
if (this.state.tick === 2) {
ops.push('componentDidUpdate (before setState): ' + this.state.tick);
this.setState({ tick: 3 });
ops.push('componentDidUpdate (after setState): ' + this.state.tick);
}
});
}
render() {
ops.push('render: ' + this.state.tick);
instance = this;
return <span prop={this.state.tick} />;
}
}
ReactNoop.render(<Foo />);
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual([
'render: 0',
'componentDidMount (before setState): 0',
'componentDidMount (after setState): 0',
// Following items shouldn't appear because they are the result of an
// update scheduled with animation priority
// 'render: 1',
// 'componentDidUpdate: 1',
]);
ops = [];
ReactNoop.flushAnimationPri();
expect(ops).toEqual([
'render: 1',
'componentDidUpdate: 1',
]);
ops = [];
instance.setState({ tick: 2 });
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual([
'render: 2',
'componentDidUpdate: 2',
'componentDidUpdate (before setState): 2',
'componentDidUpdate (after setState): 2',
// Following items shouldn't appear because they are the result of an
// update scheduled with animation priority
// 'render: 3',
// 'componentDidUpdate: 3',
]);
ops = [];
ReactNoop.flushAnimationPri();
expect(ops).toEqual([
'render: 3',
'componentDidUpdate: 3',
]);
});
});
src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
-60
View File
@@ -1036,66 +1036,6 @@ describe('ReactIncrementalSideEffects', () => {
});
it('schedules sync updates when inside componentDidMount/Update', () => {
var instance;
var ops = [];
class Foo extends React.Component {
state = { tick: 0 };
componentDidMount() {
ops.push('componentDidMount (before setState): ' + this.state.tick);
this.setState({ tick: 1 });
// We're in a batch. Update hasn't flushed yet.
ops.push('componentDidMount (after setState): ' + this.state.tick);
}
componentDidUpdate() {
ops.push('componentDidUpdate: ' + this.state.tick);
if (this.state.tick === 2) {
ops.push('componentDidUpdate (before setState): ' + this.state.tick);
this.setState({ tick: 3 });
ops.push('componentDidUpdate (after setState): ' + this.state.tick);
// We're in a batch. Update hasn't flushed yet.
}
}
render() {
ops.push('render: ' + this.state.tick);
instance = this;
return <span prop={this.state.tick} />;
}
}
ReactNoop.render(<Foo />);
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual([
'render: 0',
'componentDidMount (before setState): 0',
'componentDidMount (after setState): 0',
// If the setState inside componentDidMount were deferred, there would be
// no more ops. Because it has Task priority, we get these ops, too:
'render: 1',
'componentDidUpdate: 1',
]);
ops = [];
instance.setState({ tick: 2 });
ReactNoop.flushDeferredPri(20);
expect(ops).toEqual([
'render: 2',
'componentDidUpdate: 2',
'componentDidUpdate (before setState): 2',
'componentDidUpdate (after setState): 2',
// If the setState inside componentDidUpdate were deferred, there would be
// no more ops. Because it has Task priority, we get these ops, too:
'render: 3',
'componentDidUpdate: 3',
]);
});
it('invokes ref callbacks after insertion/update/unmount', () => {
var classInstance = null;