move resource acquisition to mutation phase (#25500)

facebook · Oct 17, 2022 · 71f2c8c · 71f2c8c · YEL-59 · Oct 18, 2022
1 parent 500bea5
commit 71f2c8c
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
@@ -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;
  }
  }