move resource acquisition to mutation phase (facebook#25500)

mofeiZ · Dec 5, 2022 · a8c497e · a8c497e
1 parent 9b13c7e
commit a8c497e
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/packages/react-reconciler/src/ReactFiberCommitWork.new.js b/packages/react-reconciler/src/ReactFiberCommitWork.new.js
@@ -1086,19 +1086,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);
         }
@@ -2614,6 +2601,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
@@ -1086,19 +1086,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);
         }
@@ -2614,6 +2601,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;
       }
     }