Skip to content

Add ref to Offscreen component #25254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 23, 2022
Merged

Add ref to Offscreen component #25254

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a86f80d
Expose ref to Offscreen if mode is manual
sammy-SC Sep 13, 2022
d8611ac
Prepend private fields on OffscreenInstance with underscore
sammy-SC Sep 13, 2022
a8f7a96
Schedule Ref effect unconditionally on Offscreen
sammy-SC Sep 21, 2022
1608017
Make sure Offscreen's ref is detached when unmounted
sammy-SC Sep 21, 2022
4320341
Make sure ref is mounted/unmounted in all scenarious
sammy-SC Sep 21, 2022
c7e962f
Nit: pendingProps -> memoizedProps
acdlite Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Nit: pendingProps -> memoizedProps
  • Loading branch information
@acdlite
acdlite committed Sep 23, 2022
commit c7e962ffb09e20732d2d2ec47cfeafd5b711d758
4 changes: 3 additions & 1 deletion packages/react-reconciler/src/ReactFiberCommitWork.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import type {
OffscreenState,
OffscreenInstance,
OffscreenQueue,
OffscreenProps,
} from './ReactFiberOffscreenComponent';
import type {HookFlags} from './ReactHookEffectTags';
import type {Cache} from './ReactFiberCacheComponent.new';
Expand Down Expand Up @@ -1124,7 +1125,8 @@ function commitLayoutEffectOnFiber(
);
}
if (flags & Ref) {
if (finishedWork.pendingProps.mode === 'manual') {
const props: OffscreenProps = finishedWork.memoizedProps;
if (props.mode === 'manual') {
safelyAttachRef(finishedWork, finishedWork.return);
} else {
safelyDetachRef(finishedWork, finishedWork.return);
Expand Down
4 changes: 3 additions & 1 deletion packages/react-reconciler/src/ReactFiberCommitWork.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import type {
OffscreenState,
OffscreenInstance,
OffscreenQueue,
OffscreenProps,
} from './ReactFiberOffscreenComponent';
import type {HookFlags} from './ReactHookEffectTags';
import type {Cache} from './ReactFiberCacheComponent.old';
Expand Down Expand Up @@ -1124,7 +1125,8 @@ function commitLayoutEffectOnFiber(
);
}
if (flags & Ref) {
if (finishedWork.pendingProps.mode === 'manual') {
const props: OffscreenProps = finishedWork.memoizedProps;
if (props.mode === 'manual') {
safelyAttachRef(finishedWork, finishedWork.return);
} else {
safelyDetachRef(finishedWork, finishedWork.return);
Expand Down