From acb48996373ee0cbf1b2462972cd7644862d770e Mon Sep 17 00:00:00 2001 From: Andrew Clark Date: Tue, 23 Oct 2018 00:41:22 -0700 Subject: [PATCH] Clear effect tags from a fiber that suspends in non-concurrent mode Even though we commit the fiber in an incomplete state, we shouldn't fire any lifecycles or effects. We already did this for classes, but now with useEffect, the same is needed for other types of work, too. --- .../src/ReactFiberUnwindWork.js | 11 +++-- .../__tests__/ReactSuspense-test.internal.js | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberUnwindWork.js b/packages/react-reconciler/src/ReactFiberUnwindWork.js index 40c814a37d..26ab5bea0f 100644 --- a/packages/react-reconciler/src/ReactFiberUnwindWork.js +++ b/packages/react-reconciler/src/ReactFiberUnwindWork.js @@ -248,15 +248,16 @@ function throwException( ); sourceFiber.effectTag &= ~Incomplete; + // We're going to commit this fiber even though it didn't complete. + // But we shouldn't call any lifecycle methods or callbacks. Remove + // all lifecycle effect tags. + sourceFiber.effectTag &= ~LifecycleEffectMask; + if (sourceFiber.tag === ClassComponent) { - // We're going to commit this fiber even though it didn't complete. - // But we shouldn't call any lifecycle methods or callbacks. Remove - // all lifecycle effect tags. - sourceFiber.effectTag &= ~LifecycleEffectMask; const current = sourceFiber.alternate; if (current === null) { // This is a new mount. Change the tag so it's not mistaken for a - // completed component. For example, we should not call + // completed class component. For example, we should not call // componentWillUnmount if it is deleted. sourceFiber.tag = IncompleteClassComponent; } diff --git a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js index 693c5d301e..c0803a610d 100644 --- a/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js +++ b/packages/react-reconciler/src/__tests__/ReactSuspense-test.internal.js @@ -17,6 +17,7 @@ describe('ReactSuspense', () => { ReactFeatureFlags = require('shared/ReactFeatureFlags'); ReactFeatureFlags.debugRenderPhaseSideEffectsForStrictMode = false; ReactFeatureFlags.replayFailedUnitOfWorkWithInvokeGuardedCallback = false; + ReactFeatureFlags.enableHooks = true; React = require('react'); ReactTestRenderer = require('react-test-renderer'); // JestReact = require('jest-react'); @@ -526,6 +527,51 @@ describe('ReactSuspense', () => { expect(root).toMatchRenderedOutput('B'); }); + it('suspends in a component that also contains useEffect', () => { + const {useLayoutEffect} = React; + + function AsyncTextWithEffect(props) { + const text = props.text; + + useLayoutEffect( + () => { + ReactTestRenderer.unstable_yield('Did commit: ' + text); + }, + [text], + ); + + try { + TextResource.read([props.text, props.ms]); + ReactTestRenderer.unstable_yield(text); + return text; + } catch (promise) { + if (typeof promise.then === 'function') { + ReactTestRenderer.unstable_yield(`Suspend! [${text}]`); + } else { + ReactTestRenderer.unstable_yield(`Error! [${text}]`); + } + throw promise; + } + } + + function App({text}) { + return ( + }> + + + ); + } + + ReactTestRenderer.create(); + expect(ReactTestRenderer).toHaveYielded(['Suspend! [A]', 'Loading...']); + jest.advanceTimersByTime(500); + expect(ReactTestRenderer).toHaveYielded([ + 'Promise resolved [A]', + 'A', + 'Did commit: A', + ]); + }); + it('retries when an update is scheduled on a timed out tree', () => { let instance; class Stateful extends React.Component {