move resource acquisition to mutation phase (#25500)

gnoff · web-flow · commit 71f2c8cf1583 · 2022-10-17T15:21:06.000-07:00
diff --git 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
@@ -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;
       }
     }
