From 4544c98a431828adbfdb9455bbad77ca664574a2 Mon Sep 17 00:00:00 2001 From: Josh Story Date: Mon, 17 Oct 2022 15:21:06 -0700 Subject: [PATCH] move resource acquisition to mutation phase (#25500) --- .../src/ReactFiberCommitWork.new.js | 26 +++++++++---------- .../src/ReactFiberCommitWork.old.js | 26 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js index 0d2cb1da6b4d7..a879f457aaf0f 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.new.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.new.js @@ -1089,19 +1089,6 @@ function commitLayoutEffectOnFiber( committedLanes, ); - if (flags & Update) { - const newResource = finishedWork.memoizedState; - if (current !== null) { - const currentResource = current.memoizedState; - if (currentResource !== newResource) { - releaseResource(currentResource); - } - } - finishedWork.stateNode = newResource - ? acquireResource(newResource) - : null; - } - if (flags & Ref) { safelyAttachRef(finishedWork, finishedWork.return); } @@ -2617,6 +2604,19 @@ function commitMutationEffectsOnFiber( safelyDetachRef(current, current.return); } } + + if (flags & Update) { + const newResource = finishedWork.memoizedState; + if (current !== null) { + const currentResource = current.memoizedState; + if (currentResource !== newResource) { + releaseResource(currentResource); + } + } + finishedWork.stateNode = newResource + ? acquireResource(newResource) + : null; + } return; } } diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.old.js b/packages/react-reconciler/src/ReactFiberCommitWork.old.js index 0751cd7d2e6cb..0b772d65077fe 100644 --- a/packages/react-reconciler/src/ReactFiberCommitWork.old.js +++ b/packages/react-reconciler/src/ReactFiberCommitWork.old.js @@ -1089,19 +1089,6 @@ function commitLayoutEffectOnFiber( committedLanes, ); - if (flags & Update) { - const newResource = finishedWork.memoizedState; - if (current !== null) { - const currentResource = current.memoizedState; - if (currentResource !== newResource) { - releaseResource(currentResource); - } - } - finishedWork.stateNode = newResource - ? acquireResource(newResource) - : null; - } - if (flags & Ref) { safelyAttachRef(finishedWork, finishedWork.return); } @@ -2617,6 +2604,19 @@ function commitMutationEffectsOnFiber( safelyDetachRef(current, current.return); } } + + if (flags & Update) { + const newResource = finishedWork.memoizedState; + if (current !== null) { + const currentResource = current.memoizedState; + if (currentResource !== newResource) { + releaseResource(currentResource); + } + } + finishedWork.stateNode = newResource + ? acquireResource(newResource) + : null; + } return; } }