move resource acquisition to mutation phase (#25500)

This commit is contained in:
Josh Story
2022-10-17 15:21:06 -07:00
committed by GitHub
parent 500bea532d
commit 71f2c8cf15
2 changed files with 26 additions and 26 deletions
@@ -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;
}
}
@@ -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;
}
}