diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js index 949f4f29c8..c009612e81 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.new.js @@ -2885,16 +2885,12 @@ function commitPassiveMountEffects_complete( const fiber = nextEffect; setCurrentDebugFiberInDEV(fiber); - try { - commitPassiveMountOnFiber( - root, - fiber, - committedLanes, - committedTransitions, - ); - } catch (error) { - captureCommitPhaseError(fiber, fiber.return, error); - } + commitPassiveMountOnFiber( + root, + fiber, + committedLanes, + committedTransitions, + ); resetCurrentDebugFiberInDEV(); if (fiber === subtreeRoot) { @@ -2936,11 +2932,19 @@ function commitPassiveMountOnFiber( HookPassive | HookHasEffect, finishedWork, ); - } finally { - recordPassiveEffectDuration(finishedWork); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); } + recordPassiveEffectDuration(finishedWork); } else { - commitHookEffectListMount(HookPassive | HookHasEffect, finishedWork); + try { + commitHookEffectListMount( + HookPassive | HookHasEffect, + finishedWork, + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } } } break; diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js index f5e60b1d45..9eed4a2323 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.old.js @@ -2885,16 +2885,12 @@ function commitPassiveMountEffects_complete( const fiber = nextEffect; setCurrentDebugFiberInDEV(fiber); - try { - commitPassiveMountOnFiber( - root, - fiber, - committedLanes, - committedTransitions, - ); - } catch (error) { - captureCommitPhaseError(fiber, fiber.return, error); - } + commitPassiveMountOnFiber( + root, + fiber, + committedLanes, + committedTransitions, + ); resetCurrentDebugFiberInDEV(); if (fiber === subtreeRoot) { @@ -2936,11 +2932,19 @@ function commitPassiveMountOnFiber( HookPassive | HookHasEffect, finishedWork, ); - } finally { - recordPassiveEffectDuration(finishedWork); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); } + recordPassiveEffectDuration(finishedWork); } else { - commitHookEffectListMount(HookPassive | HookHasEffect, finishedWork); + try { + commitHookEffectListMount( + HookPassive | HookHasEffect, + finishedWork, + ); + } catch (error) { + captureCommitPhaseError(finishedWork, finishedWork.return, error); + } } } break;