From 44d39c4d76c4ea4b26a2160ae6ba861babfb2b14 Mon Sep 17 00:00:00 2001 From: Brian Vaughn Date: Mon, 5 Oct 2020 15:49:44 -0400 Subject: [PATCH] Removed skip-error-boundaries modifications from old fork (#19961) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Technically this change is unnecessary, since the feature is controlled by a flag, but since we decided not to ship this in v17– I'm going to remove it for now entirely. --- .../src/ReactFiberCommitWork.old.js | 95 +++++-------------- .../src/ReactFiberWorkLoop.old.js | 41 +++----- 2 files changed, 35 insertions(+), 101 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js index 45483b460bd06..e094e5bd9b5a8 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.old.js @@ -153,11 +153,7 @@ const callComponentWillUnmountWithTimer = function(current, instance) { }; // Capture errors so they don't interrupt unmounting. -function safelyCallComponentWillUnmount( - current: Fiber, - instance: any, - nearestMountedAncestor: Fiber | null, -) { +function safelyCallComponentWillUnmount(current: Fiber, instance: any) { if (__DEV__) { invokeGuardedCallback( null, @@ -168,18 +164,18 @@ function safelyCallComponentWillUnmount( ); if (hasCaughtError()) { const unmountError = clearCaughtError(); - captureCommitPhaseError(current, nearestMountedAncestor, unmountError); + captureCommitPhaseError(current, unmountError); } } else { try { callComponentWillUnmountWithTimer(current, instance); } catch (unmountError) { - captureCommitPhaseError(current, nearestMountedAncestor, unmountError); + captureCommitPhaseError(current, unmountError); } } } -function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) { +function safelyDetachRef(current: Fiber) { const ref = current.ref; if (ref !== null) { if (typeof ref === 'function') { @@ -187,13 +183,13 @@ function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) { invokeGuardedCallback(null, ref, null, null); if (hasCaughtError()) { const refError = clearCaughtError(); - captureCommitPhaseError(current, nearestMountedAncestor, refError); + captureCommitPhaseError(current, refError); } } else { try { ref(null); } catch (refError) { - captureCommitPhaseError(current, nearestMountedAncestor, refError); + captureCommitPhaseError(current, refError); } } } else { @@ -202,22 +198,18 @@ function safelyDetachRef(current: Fiber, nearestMountedAncestor: Fiber | null) { } } -function safelyCallDestroy( - current: Fiber, - nearestMountedAncestor: Fiber | null, - destroy: () => void, -) { +function safelyCallDestroy(current: Fiber, destroy: () => void) { if (__DEV__) { invokeGuardedCallback(null, destroy, null); if (hasCaughtError()) { const error = clearCaughtError(); - captureCommitPhaseError(current, nearestMountedAncestor, error); + captureCommitPhaseError(current, error); } } else { try { destroy(); } catch (error) { - captureCommitPhaseError(current, nearestMountedAncestor, error); + captureCommitPhaseError(current, error); } } } @@ -874,7 +866,6 @@ function commitDetachRef(current: Fiber) { function commitUnmount( finishedRoot: FiberRoot, current: Fiber, - nearestMountedAncestor: Fiber | null, renderPriorityLevel: ReactPriorityLevel, ): void { onCommitUnmount(current); @@ -904,10 +895,10 @@ function commitUnmount( current.mode & ProfileMode ) { startLayoutEffectTimer(); - safelyCallDestroy(current, nearestMountedAncestor, destroy); + safelyCallDestroy(current, destroy); recordLayoutEffectDuration(current); } else { - safelyCallDestroy(current, nearestMountedAncestor, destroy); + safelyCallDestroy(current, destroy); } } } @@ -918,19 +909,15 @@ function commitUnmount( return; } case ClassComponent: { - safelyDetachRef(current, nearestMountedAncestor); + safelyDetachRef(current); const instance = current.stateNode; if (typeof instance.componentWillUnmount === 'function') { - safelyCallComponentWillUnmount( - current, - instance, - nearestMountedAncestor, - ); + safelyCallComponentWillUnmount(current, instance); } return; } case HostComponent: { - safelyDetachRef(current, nearestMountedAncestor); + safelyDetachRef(current); return; } case HostPortal: { @@ -938,12 +925,7 @@ function commitUnmount( // We are also not using this parent because // the portal will get pushed immediately. if (supportsMutation) { - unmountHostComponents( - finishedRoot, - current, - nearestMountedAncestor, - renderPriorityLevel, - ); + unmountHostComponents(finishedRoot, current, renderPriorityLevel); } else if (supportsPersistence) { emptyPortalContainer(current); } @@ -973,7 +955,7 @@ function commitUnmount( } case ScopeComponent: { if (enableScopeAPI) { - safelyDetachRef(current, nearestMountedAncestor); + safelyDetachRef(current); } return; } @@ -983,7 +965,6 @@ function commitUnmount( function commitNestedUnmounts( finishedRoot: FiberRoot, root: Fiber, - nearestMountedAncestor: Fiber | null, renderPriorityLevel: ReactPriorityLevel, ): void { // While we're inside a removed host node we don't want to call @@ -993,12 +974,7 @@ function commitNestedUnmounts( // we do an inner loop while we're still inside the host node. let node: Fiber = root; while (true) { - commitUnmount( - finishedRoot, - node, - nearestMountedAncestor, - renderPriorityLevel, - ); + commitUnmount(finishedRoot, node, renderPriorityLevel); // Visit children because they may contain more composite or host nodes. // Skip portals because commitUnmount() currently visits them recursively. if ( @@ -1289,7 +1265,6 @@ function insertOrAppendPlacementNode( function unmountHostComponents( finishedRoot: FiberRoot, current: Fiber, - nearestMountedAncestor: Fiber | null, renderPriorityLevel: ReactPriorityLevel, ): void { // We only have the top Fiber that was deleted but we need to recurse down its @@ -1339,12 +1314,7 @@ function unmountHostComponents( } if (node.tag === HostComponent || node.tag === HostText) { - commitNestedUnmounts( - finishedRoot, - node, - nearestMountedAncestor, - renderPriorityLevel, - ); + commitNestedUnmounts(finishedRoot, node, renderPriorityLevel); // After all the children have unmounted, it is now safe to remove the // node from the tree. if (currentParentIsContainer) { @@ -1361,12 +1331,7 @@ function unmountHostComponents( // Don't visit children because we already visited them. } else if (enableFundamentalAPI && node.tag === FundamentalComponent) { const fundamentalNode = node.stateNode.instance; - commitNestedUnmounts( - finishedRoot, - node, - nearestMountedAncestor, - renderPriorityLevel, - ); + commitNestedUnmounts(finishedRoot, node, renderPriorityLevel); // After all the children have unmounted, it is now safe to remove the // node from the tree. if (currentParentIsContainer) { @@ -1418,12 +1383,7 @@ function unmountHostComponents( continue; } } else { - commitUnmount( - finishedRoot, - node, - nearestMountedAncestor, - renderPriorityLevel, - ); + commitUnmount(finishedRoot, node, renderPriorityLevel); // Visit children because we may find more host components below. if (node.child !== null) { node.child.return = node; @@ -1453,26 +1413,15 @@ function unmountHostComponents( function commitDeletion( finishedRoot: FiberRoot, current: Fiber, - nearestMountedAncestor: Fiber | null, renderPriorityLevel: ReactPriorityLevel, ): void { if (supportsMutation) { // Recursively delete all host nodes from the parent. // Detach refs and call componentWillUnmount() on the whole subtree. - unmountHostComponents( - finishedRoot, - current, - nearestMountedAncestor, - renderPriorityLevel, - ); + unmountHostComponents(finishedRoot, current, renderPriorityLevel); } else { // Detach refs and call componentWillUnmount() on the whole subtree. - commitNestedUnmounts( - finishedRoot, - current, - nearestMountedAncestor, - renderPriorityLevel, - ); + commitNestedUnmounts(finishedRoot, current, renderPriorityLevel); } const alternate = current.alternate; detachFiberMutation(current); diff --git a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js index 4d0ee94c82be9..c0fcb9c5c09b2 100644 --- a/packages/react-reconciler/src/ReactFiberWorkLoop.old.js +++ b/packages/react-reconciler/src/ReactFiberWorkLoop.old.js @@ -29,7 +29,6 @@ import { enableDebugTracing, enableSchedulingProfiler, enableScopeAPI, - skipUnmountedBoundaries, } from 'shared/ReactFeatureFlags'; import ReactSharedInternals from 'shared/ReactSharedInternals'; import invariant from 'shared/invariant'; @@ -2019,7 +2018,7 @@ function commitRootImpl(root, renderPriorityLevel) { if (hasCaughtError()) { invariant(nextEffect !== null, 'Should be working on an effect.'); const error = clearCaughtError(); - captureCommitPhaseError(nextEffect, nextEffect.return, error); + captureCommitPhaseError(nextEffect, error); nextEffect = nextEffect.nextEffect; } } else { @@ -2027,7 +2026,7 @@ function commitRootImpl(root, renderPriorityLevel) { commitBeforeMutationEffects(); } catch (error) { invariant(nextEffect !== null, 'Should be working on an effect.'); - captureCommitPhaseError(nextEffect, nextEffect.return, error); + captureCommitPhaseError(nextEffect, error); nextEffect = nextEffect.nextEffect; } } @@ -2056,7 +2055,7 @@ function commitRootImpl(root, renderPriorityLevel) { if (hasCaughtError()) { invariant(nextEffect !== null, 'Should be working on an effect.'); const error = clearCaughtError(); - captureCommitPhaseError(nextEffect, nextEffect.return, error); + captureCommitPhaseError(nextEffect, error); nextEffect = nextEffect.nextEffect; } } else { @@ -2064,7 +2063,7 @@ function commitRootImpl(root, renderPriorityLevel) { commitMutationEffects(root, renderPriorityLevel); } catch (error) { invariant(nextEffect !== null, 'Should be working on an effect.'); - captureCommitPhaseError(nextEffect, nextEffect.return, error); + captureCommitPhaseError(nextEffect, error); nextEffect = nextEffect.nextEffect; } } @@ -2091,7 +2090,7 @@ function commitRootImpl(root, renderPriorityLevel) { if (hasCaughtError()) { invariant(nextEffect !== null, 'Should be working on an effect.'); const error = clearCaughtError(); - captureCommitPhaseError(nextEffect, nextEffect.return, error); + captureCommitPhaseError(nextEffect, error); nextEffect = nextEffect.nextEffect; } } else { @@ -2099,7 +2098,7 @@ function commitRootImpl(root, renderPriorityLevel) { commitLayoutEffects(root, lanes); } catch (error) { invariant(nextEffect !== null, 'Should be working on an effect.'); - captureCommitPhaseError(nextEffect, nextEffect.return, error); + captureCommitPhaseError(nextEffect, error); nextEffect = nextEffect.nextEffect; } } @@ -2373,12 +2372,7 @@ function commitMutationEffects( break; } case Deletion: { - commitDeletion( - root, - nextEffect, - nextEffect.return, - renderPriorityLevel, - ); + commitDeletion(root, nextEffect, renderPriorityLevel); break; } } @@ -2589,7 +2583,7 @@ function flushPassiveEffectsImpl() { if (hasCaughtError()) { invariant(fiber !== null, 'Should be working on an effect.'); const error = clearCaughtError(); - captureCommitPhaseError(fiber, fiber.return, error); + captureCommitPhaseError(fiber, error); } resetCurrentDebugFiberInDEV(); } else { @@ -2610,7 +2604,7 @@ function flushPassiveEffectsImpl() { } } catch (error) { invariant(fiber !== null, 'Should be working on an effect.'); - captureCommitPhaseError(fiber, fiber.return, error); + captureCommitPhaseError(fiber, error); } } } @@ -2637,7 +2631,7 @@ function flushPassiveEffectsImpl() { if (hasCaughtError()) { invariant(fiber !== null, 'Should be working on an effect.'); const error = clearCaughtError(); - captureCommitPhaseError(fiber, fiber.return, error); + captureCommitPhaseError(fiber, error); } resetCurrentDebugFiberInDEV(); } else { @@ -2659,7 +2653,7 @@ function flushPassiveEffectsImpl() { } } catch (error) { invariant(fiber !== null, 'Should be working on an effect.'); - captureCommitPhaseError(fiber, fiber.return, error); + captureCommitPhaseError(fiber, error); } } } @@ -2758,11 +2752,7 @@ function captureCommitPhaseErrorOnRoot( } } -export function captureCommitPhaseError( - sourceFiber: Fiber, - nearestMountedAncestor: Fiber | null, - error: mixed, -) { +export function captureCommitPhaseError(sourceFiber: Fiber, error: mixed) { if (sourceFiber.tag === HostRoot) { // Error was thrown at the root. There is no parent, so the root // itself should capture it. @@ -2770,12 +2760,7 @@ export function captureCommitPhaseError( return; } - let fiber = null; - if (skipUnmountedBoundaries) { - fiber = nearestMountedAncestor; - } else { - fiber = sourceFiber.return; - } + let fiber = sourceFiber.return; while (fiber !== null) { if (fiber.tag === HostRoot) {