diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js index fb6040109518..d1bbdcdde156 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.new.js @@ -136,6 +136,7 @@ import { restorePendingUpdaters, addTransitionStartCallbackToPendingTransition, addTransitionCompleteCallbackToPendingTransition, + setIsRunningInsertionEffect, } from './ReactFiberWorkLoop.new'; import { NoFlags as NoHookEffect, @@ -536,7 +537,17 @@ function commitHookEffectListUnmount( } } + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(true); + } + } safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy); + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(false); + } + } if (enableSchedulingProfiler) { if ((flags & HookPassive) !== NoHookEffect) { @@ -570,7 +581,17 @@ function commitHookEffectListMount(flags: HookFlags, finishedWork: Fiber) { // Mount const create = effect.create; + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(true); + } + } effect.destroy = create(); + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(false); + } + } if (enableSchedulingProfiler) { if ((flags & HookPassive) !== NoHookEffect) { diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js index e962039d9ca9..bff8b2781310 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.old.js @@ -136,6 +136,7 @@ import { restorePendingUpdaters, addTransitionStartCallbackToPendingTransition, addTransitionCompleteCallbackToPendingTransition, + setIsRunningInsertionEffect, } from './ReactFiberWorkLoop.old'; import { NoFlags as NoHookEffect, @@ -536,7 +537,17 @@ function commitHookEffectListUnmount( } } + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(true); + } + } safelyCallDestroy(finishedWork, nearestMountedAncestor, destroy); + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(false); + } + } if (enableSchedulingProfiler) { if ((flags & HookPassive) !== NoHookEffect) { @@ -570,7 +581,17 @@ function commitHookEffectListMount(flags: HookFlags, finishedWork: Fiber) { // Mount const create = effect.create; + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(true); + } + } effect.destroy = create(); + if (__DEV__) { + if ((flags & HookInsertion) !== NoHookEffect) { + setIsRunningInsertionEffect(false); + } + } if (enableSchedulingProfiler) { if ((flags & HookPassive) !== NoHookEffect) { diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js index 3f4071164df5..75d9c76b55d1 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.new.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.new.js @@ -409,6 +409,8 @@ let rootWithPassiveNestedUpdates: FiberRoot | null = null; let currentEventTime: number = NoTimestamp; let currentEventTransitionLane: Lanes = NoLanes; +let isRunningInsertionEffect = false; + export function getWorkInProgressRoot(): FiberRoot | null { return workInProgressRoot; } @@ -520,6 +522,12 @@ export function scheduleUpdateOnFiber( ): FiberRoot | null { checkForNestedUpdates(); + if (__DEV__) { + if (isRunningInsertionEffect) { + console.error('useInsertionEffect must not schedule updates.'); + } + } + const root = markUpdateLaneFromFiberToRoot(fiber, lane); if (root === null) { return null; @@ -2551,6 +2559,9 @@ export function captureCommitPhaseError( nearestMountedAncestor: Fiber | null, error: mixed, ) { + if (__DEV__) { + setIsRunningInsertionEffect(false); + } if (sourceFiber.tag === HostRoot) { // Error was thrown at the root. There is no parent, so the root // itself should capture it. @@ -3162,3 +3173,9 @@ function warnIfSuspenseResolutionNotWrappedWithActDEV(root: FiberRoot): void { } } } + +export function setIsRunningInsertionEffect(isRunning: boolean): void { + if (__DEV__) { + isRunningInsertionEffect = isRunning; + } +} diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js index 604a585406ae..17bfc935bc90 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js @@ -409,6 +409,8 @@ let rootWithPassiveNestedUpdates: FiberRoot | null = null; let currentEventTime: number = NoTimestamp; let currentEventTransitionLane: Lanes = NoLanes; +let isRunningInsertionEffect = false; + export function getWorkInProgressRoot(): FiberRoot | null { return workInProgressRoot; } @@ -520,6 +522,12 @@ export function scheduleUpdateOnFiber( ): FiberRoot | null { checkForNestedUpdates(); + if (__DEV__) { + if (isRunningInsertionEffect) { + console.error('useInsertionEffect must not schedule updates.'); + } + } + const root = markUpdateLaneFromFiberToRoot(fiber, lane); if (root === null) { return null; @@ -2551,6 +2559,9 @@ export function captureCommitPhaseError( nearestMountedAncestor: Fiber | null, error: mixed, ) { + if (__DEV__) { + setIsRunningInsertionEffect(false); + } if (sourceFiber.tag === HostRoot) { // Error was thrown at the root. There is no parent, so the root // itself should capture it. @@ -3162,3 +3173,9 @@ function warnIfSuspenseResolutionNotWrappedWithActDEV(root: FiberRoot): void { } } } + +export function setIsRunningInsertionEffect(isRunning: boolean): void { + if (__DEV__) { + isRunningInsertionEffect = isRunning; + } +} diff --git a/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js b/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js index 811be0963915..bacf9da7029a 100644 --- a/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js +++ b/packages/react-reconciler/src/__tests__/ReactHooksWithNoopRenderer-test.js @@ -3090,6 +3090,87 @@ describe('ReactHooksWithNoopRenderer', () => { }), ).toThrow('is not a function'); }); + + it('warns when setState is called from insertion effect setup', () => { + function App(props) { + const [, setX] = useState(0); + useInsertionEffect(() => { + setX(1); + if (props.throw) { + throw Error('No'); + } + }, [props.throw]); + return null; + } + + const root = ReactNoop.createRoot(); + expect(() => + act(() => { + root.render(); + }), + ).toErrorDev(['Warning: useInsertionEffect must not schedule updates.']); + + expect(() => { + act(() => { + root.render(); + }); + }).toThrow('No'); + + // Should not warn for regular effects after throw. + function NotInsertion() { + const [, setX] = useState(0); + useEffect(() => { + setX(1); + }, []); + return null; + } + act(() => { + root.render(); + }); + }); + + it('warns when setState is called from insertion effect cleanup', () => { + function App(props) { + const [, setX] = useState(0); + useInsertionEffect(() => { + if (props.throw) { + throw Error('No'); + } + return () => { + setX(1); + }; + }, [props.throw, props.foo]); + return null; + } + + const root = ReactNoop.createRoot(); + act(() => { + root.render(); + }); + expect(() => { + act(() => { + root.render(); + }); + }).toErrorDev(['Warning: useInsertionEffect must not schedule updates.']); + + expect(() => { + act(() => { + root.render(); + }); + }).toThrow('No'); + + // Should not warn for regular effects after throw. + function NotInsertion() { + const [, setX] = useState(0); + useEffect(() => { + setX(1); + }, []); + return null; + } + act(() => { + root.render(); + }); + }); }); describe('useLayoutEffect', () => {