Removed skip-error-boundaries modifications from old fork (#19961)

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.

Author: Brian Vaughn

packages/react-reconciler/src/ReactFiberCommitWork.old.js

@@ -153,11 +153,7 @@ const callComponentWillUnmountWithTimer = function(current, instance) {
 };
 
 // Capture errors so they don't interrupt unmounting.
-functionsafelyCallComponentWillUnmount(
-current: Fiber,
-instance: any,
-nearestMountedAncestor: Fiber|null,
-){
+functionsafelyCallComponentWillUnmount(current: Fiber,instance: any){
 if(__DEV__){
 invokeGuardedCallback(
 null,
@@ -168,32 +164,32 @@ function safelyCallComponentWillUnmount(
 );
 if(hasCaughtError()){
 constunmountError=clearCaughtError();
-captureCommitPhaseError(current,nearestMountedAncestor,unmountError);
+captureCommitPhaseError(current,unmountError);
 }
 }else{
 try{
 callComponentWillUnmountWithTimer(current,instance);
 }catch(unmountError){
-captureCommitPhaseError(current,nearestMountedAncestor,unmountError);
+captureCommitPhaseError(current,unmountError);
 }
 }
 }
 
-functionsafelyDetachRef(current: Fiber,nearestMountedAncestor: Fiber|null){
+functionsafelyDetachRef(current: Fiber){
 constref=current.ref;
 if(ref!==null){
 if(typeofref==='function'){
 if(__DEV__){
 invokeGuardedCallback(null,ref,null,null);
 if(hasCaughtError()){
 constrefError=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) {
 }
 }
 
-functionsafelyCallDestroy(
-current: Fiber,
-nearestMountedAncestor: Fiber|null,
-destroy: ()=>void,
-){
+functionsafelyCallDestroy(current: Fiber,destroy: ()=>void){
 if(__DEV__){
 invokeGuardedCallback(null,destroy,null);
 if(hasCaughtError()){
 consterror=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) {
 functioncommitUnmount(
 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,32 +909,23 @@ function commitUnmount(
 return;
 }
 caseClassComponent: {
-safelyDetachRef(current,nearestMountedAncestor);
+safelyDetachRef(current);
 const instance =current.stateNode;
 if(typeofinstance.componentWillUnmount==='function'){
-safelyCallComponentWillUnmount(
-current,
-instance,
-nearestMountedAncestor,
-);
+safelyCallComponentWillUnmount(current,instance);
 }
 return;
 }
 caseHostComponent: {
-safelyDetachRef(current,nearestMountedAncestor);
+safelyDetachRef(current);
 return;
 }
 caseHostPortal: {
 // TODO: this is recursive.
 // 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);
 }elseif(supportsPersistence){
 emptyPortalContainer(current);
 }
@@ -973,7 +955,7 @@ function commitUnmount(
 }
 caseScopeComponent: {
 if(enableScopeAPI){
-safelyDetachRef(current,nearestMountedAncestor);
+safelyDetachRef(current);
 }
 return;
 }
@@ -983,7 +965,6 @@ function commitUnmount(
 functioncommitNestedUnmounts(
 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.
 letnode: 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(
 functionunmountHostComponents(
 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.
 }elseif(enableFundamentalAPI&&node.tag===FundamentalComponent){
 constfundamentalNode=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(
 functioncommitDeletion(
 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);
 }
 constalternate=current.alternate;
 detachFiberMutation(current);

packages/react-reconciler/src/ReactFiberWorkLoop.old.js

@@ -29,7 +29,6 @@ import {
 enableDebugTracing,
 enableSchedulingProfiler,
 enableScopeAPI,
-skipUnmountedBoundaries,
 }from'shared/ReactFeatureFlags';
 importReactSharedInternalsfrom'shared/ReactSharedInternals';
 importinvariantfrom'shared/invariant';
@@ -2019,15 +2018,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 if(hasCaughtError()){
 invariant(nextEffect!==null,'Should be working on an effect.');
 consterror=clearCaughtError();
-captureCommitPhaseError(nextEffect,nextEffect.return,error);
+captureCommitPhaseError(nextEffect,error);
 nextEffect=nextEffect.nextEffect;
 }
 }else{
 try{
 commitBeforeMutationEffects();
 }catch(error){
 invariant(nextEffect!==null,'Should be working on an effect.');
-captureCommitPhaseError(nextEffect,nextEffect.return,error);
+captureCommitPhaseError(nextEffect,error);
 nextEffect=nextEffect.nextEffect;
 }
 }
@@ -2056,15 +2055,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 if(hasCaughtError()){
 invariant(nextEffect!==null,'Should be working on an effect.');
 consterror=clearCaughtError();
-captureCommitPhaseError(nextEffect,nextEffect.return,error);
+captureCommitPhaseError(nextEffect,error);
 nextEffect=nextEffect.nextEffect;
 }
 }else{
 try{
 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,15 +2090,15 @@ function commitRootImpl(root, renderPriorityLevel) {
 if(hasCaughtError()){
 invariant(nextEffect!==null,'Should be working on an effect.');
 consterror=clearCaughtError();
-captureCommitPhaseError(nextEffect,nextEffect.return,error);
+captureCommitPhaseError(nextEffect,error);
 nextEffect=nextEffect.nextEffect;
 }
 }else{
 try{
 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.');
 consterror=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.');
 consterror=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,24 +2752,15 @@ function captureCommitPhaseErrorOnRoot(
 }
 }
 
-exportfunctioncaptureCommitPhaseError(
-sourceFiber: Fiber,
-nearestMountedAncestor: Fiber|null,
-error: mixed,
-){
+exportfunctioncaptureCommitPhaseError(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.
 captureCommitPhaseErrorOnRoot(sourceFiber,sourceFiber,error);
 return;
 }
 
-letfiber=null;
-if(skipUnmountedBoundaries){
-fiber=nearestMountedAncestor;
-}else{
-fiber=sourceFiber.return;
-}
+letfiber=sourceFiber.return;
 
 while(fiber!==null){
 if(fiber.tag===HostRoot){