Updates from inside componentDidMount/Update should have Task priority.

This is only observable in incremental mode.

Author: acdlite

scripts/fiber/tests-passing.txt

@@ -820,18 +820,6 @@ 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
-* performs animation work in animation callback
-* schedules deferred work in animation callback
-* schedules deferred work and performs animation work in animation callback
-* performs animation work and schedules deferred work in animation callback
-* performs deferred work in deferred callback if it has time
-* schedules deferred work in deferred callback if it runs out of time
-* performs animated work in deferred callback if it has time
-* performs animated work and deferred work in deferred callback if it has time
-* performs deferred and animated work work in deferred callback if it has time
-* schedules animated work in deferred callback if it runs out of time
-* schedules animated work and deferred work in deferred callback if it runs out of time
-* schedules deferred work and animated work in deferred callback if it runs out of time
 
 src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
 * can update child nodes of a host instance
@@ -852,6 +840,7 @@ 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

@@ -208,7 +208,13 @@ module.exports = function<T, P, I, TI, C>(config : HostConfig<T, P, I, TI, C>) {
     while (effectfulFiber) {
       if (effectfulFiber.effectTag & (Update | Callback)) {
         const current = effectfulFiber.alternate;
-        commitLifeCycles(current, effectfulFiber);
+        const previousPriorityContext = priorityContext;
+        priorityContext = TaskPriority;
+        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

@@ -450,7 +450,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('c')).toEqual([span('c:3')]);
   });
 
-  it('performs animation work in animation callback', () => {
+  xit('performs animation work in animation callback', () => {
     class Foo extends React.Component {
       componentDidMount() {
         // Animation work that will get performed during animation callback
@@ -474,7 +474,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
-  it('schedules deferred work in animation callback', () => {
+  xit('schedules deferred work in animation callback', () => {
     class Foo extends React.Component {
       componentDidMount() {
         // Deferred work that will get scheduled during animation callback
@@ -501,7 +501,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
-  it('schedules deferred work and performs animation work in animation callback', () => {
+  xit('schedules deferred work and performs animation work in animation callback', () => {
     let hasScheduled = false;
     class Foo extends React.Component {
       componentDidMount() {
@@ -541,7 +541,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('d')).toEqual([span('d:1')]);
   });
 
-  it('performs animation work and schedules deferred work in animation callback', () => {
+  xit('performs animation work and schedules deferred work in animation callback', () => {
     let hasScheduled = false;
     class Foo extends React.Component {
       componentDidMount() {
@@ -583,7 +583,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('d')).toEqual([span('d:1')]);
   });
 
-  it('performs deferred work in deferred callback if it has time', () => {
+  xit('performs deferred work in deferred callback if it has time', () => {
     class Foo extends React.Component {
       componentDidMount() {
         // Deferred work that will get performed during deferred callback
@@ -603,7 +603,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
-  it('schedules deferred work in deferred callback if it runs out of time', () => {
+  xit('schedules deferred work in deferred callback if it runs out of time', () => {
     let hasScheduled = false;
     class Foo extends React.Component {
       componentDidMount() {
@@ -631,7 +631,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
-  it('performs animated work in deferred callback if it has time', () => {
+  xit('performs animated work in deferred callback if it has time', () => {
     class Foo extends React.Component {
       componentDidMount() {
         // Animated work that will get performed during deferred callback
@@ -653,7 +653,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
-  it('performs animated work and deferred work in deferred callback if it has time', () => {
+  xit('performs animated work and deferred work in deferred callback if it has time', () => {
     class Foo extends React.Component {
       componentDidMount() {
         // Deferred work that will get performed during deferred callback
@@ -681,7 +681,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('d')).toEqual([span('d:1')]);
   });
 
-  it('performs deferred and animated work work in deferred callback if it has time', () => {
+  xit('performs deferred and animated work work in deferred callback if it has time', () => {
     class Foo extends React.Component {
       componentDidMount() {
         // Animation work that will get performed during deferred callback
@@ -711,7 +711,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('d')).toEqual([span('d:1')]);
   });
 
-  it('schedules animated work in deferred callback if it runs out of time', () => {
+  xit('schedules animated work in deferred callback if it runs out of time', () => {
     let hasScheduled = false;
     class Foo extends React.Component {
       componentDidMount() {
@@ -741,7 +741,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('b')).toEqual([span('b:1')]);
   });
 
-  it('schedules animated work and deferred work in deferred callback if it runs out of time', () => {
+  xit('schedules animated work and deferred work in deferred callback if it runs out of time', () => {
     let isScheduled = false;
     class Foo extends React.Component {
       componentDidMount() {
@@ -779,7 +779,7 @@ describe('ReactIncrementalScheduling', () => {
     expect(ReactNoop.getChildren('d')).toEqual([span('d:1')]);
   });
 
-  it('schedules deferred work and animated work in deferred callback if it runs out of time', () => {
+  xit('schedules deferred work and animated work in deferred callback if it runs out of time', () => {
     let isScheduled = false;
     class Foo extends React.Component {
       componentDidMount() {

src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js

@@ -1036,6 +1036,66 @@ 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;