Facebook/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2025-11-01 09:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move offscreen action attachment to separate function

Browse Source
This commit is contained in:
Samuel Susla
2022-09-11 10:17:04 +01:00
parent eb6dc4d43f
commit a0213dee8a
2 changed files with 50 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-reconciler/src/ReactFiberCommitWork.new.js
+25 -32
View File
@@ -1122,38 +1122,6 @@ function commitLayoutEffectOnFiber(
offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden;
}
// TODO: figure out the proper place for this.
finishedWork.stateNode.detach = () => {
const executionContext = getExecutionContext();
if (
(executionContext & (RenderContext | CommitContext)) !==
NoContext
) {
scheduleMicrotask(() => {
finishedWork.stateNode._isDetached = true;
disappearLayoutEffects(finishedWork);
disconnectPassiveEffect(finishedWork);
});
} else {
finishedWork.stateNode._isDetached = true;
disappearLayoutEffects(finishedWork);
disconnectPassiveEffect(finishedWork);
}
};
finishedWork.stateNode.attach = () => {
// TODO: does not handle when attach is called from effect or when tree is rendered.
finishedWork.stateNode._isDetached = false;
reappearLayoutEffects(finishedRoot, null, finishedWork, false);
reconnectPassiveEffects(
finishedRoot,
finishedWork,
NoLanes,
null,
false,
);
};
if (finishedWork.pendingProps.mode === null) {
if (flags & Ref) {
safelyAttachRef(finishedWork, finishedWork.return);
@@ -2292,6 +2260,30 @@ function getRetryCache(finishedWork) {
}
}
function attachOffscreenActions(offscreenFiber: Fiber, root: FiberRoot) {
offscreenFiber.stateNode.detach = () => {
const executionContext = getExecutionContext();
if ((executionContext & (RenderContext | CommitContext)) !== NoContext) {
scheduleMicrotask(() => {
offscreenFiber.stateNode._isDetached = true;
disappearLayoutEffects(offscreenFiber);
disconnectPassiveEffect(offscreenFiber);
});
} else {
offscreenFiber.stateNode._isDetached = true;
disappearLayoutEffects(offscreenFiber);
disconnectPassiveEffect(offscreenFiber);
}
};
offscreenFiber.stateNode.attach = () => {
// TODO: does not handle when attach is called from effect or when tree is rendered.
offscreenFiber.stateNode._isDetached = false;
reappearLayoutEffects(root, null, offscreenFiber, false);
reconnectPassiveEffects(root, offscreenFiber, NoLanes, null, false);
};
}
function attachSuspenseRetryListeners(
finishedWork: Fiber,
wakeables: Set<Wakeable>,
@@ -2670,6 +2662,7 @@ function commitMutationEffectsOnFiber(
}
commitReconciliationEffects(finishedWork);
attachOffscreenActions(finishedWork, root);
if (flags & Visibility) {
const offscreenInstance: OffscreenInstance = finishedWork.stateNode;
packages/react-reconciler/src/ReactFiberCommitWork.old.js
+25 -32
View File
@@ -1122,38 +1122,6 @@ function commitLayoutEffectOnFiber(
offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden;
}
// TODO: figure out the proper place for this.
finishedWork.stateNode.detach = () => {
const executionContext = getExecutionContext();
if (
(executionContext & (RenderContext | CommitContext)) !==
NoContext
) {
scheduleMicrotask(() => {
finishedWork.stateNode._isDetached = true;
disappearLayoutEffects(finishedWork);
disconnectPassiveEffect(finishedWork);
});
} else {
finishedWork.stateNode._isDetached = true;
disappearLayoutEffects(finishedWork);
disconnectPassiveEffect(finishedWork);
}
};
finishedWork.stateNode.attach = () => {
// TODO: does not handle when attach is called from effect or when tree is rendered.
finishedWork.stateNode._isDetached = false;
reappearLayoutEffects(finishedRoot, null, finishedWork, false);
reconnectPassiveEffects(
finishedRoot,
finishedWork,
NoLanes,
null,
false,
);
};
if (finishedWork.pendingProps.mode === null) {
if (flags & Ref) {
safelyAttachRef(finishedWork, finishedWork.return);
@@ -2292,6 +2260,30 @@ function getRetryCache(finishedWork) {
}
}
function attachOffscreenActions(offscreenFiber: Fiber, root: FiberRoot) {
offscreenFiber.stateNode.detach = () => {
const executionContext = getExecutionContext();
if ((executionContext & (RenderContext | CommitContext)) !== NoContext) {
scheduleMicrotask(() => {
offscreenFiber.stateNode._isDetached = true;
disappearLayoutEffects(offscreenFiber);
disconnectPassiveEffect(offscreenFiber);
});
} else {
offscreenFiber.stateNode._isDetached = true;
disappearLayoutEffects(offscreenFiber);
disconnectPassiveEffect(offscreenFiber);
}
};
offscreenFiber.stateNode.attach = () => {
// TODO: does not handle when attach is called from effect or when tree is rendered.
offscreenFiber.stateNode._isDetached = false;
reappearLayoutEffects(root, null, offscreenFiber, false);
reconnectPassiveEffects(root, offscreenFiber, NoLanes, null, false);
};
}
function attachSuspenseRetryListeners(
finishedWork: Fiber,
wakeables: Set<Wakeable>,
@@ -2670,6 +2662,7 @@ function commitMutationEffectsOnFiber(
}
commitReconciliationEffects(finishedWork);
attachOffscreenActions(finishedWork, root);
if (flags & Visibility) {
const offscreenInstance: OffscreenInstance = finishedWork.stateNode;