Skip to content

Commit

Permalink
Only treat updates to lazy as a new mount in legacy mode (#24530)
Browse files Browse the repository at this point in the history
* Only treat updates to lazy as a new mount in legacy mode

* Update name and swap current check

* Flip order back
  • Loading branch information
rickhanlonii authored May 12, 2022
1 parent 7d9e17a commit 34da5aa
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 80 deletions.
60 changes: 20 additions & 40 deletions packages/react-reconciler/src/ReactFiberBeginWork.new.js
Original file line number Diff line number Diff line change
Expand Up @@ -1110,16 +1110,8 @@ function updateClassComponent(
const instance = workInProgress.stateNode;
let shouldUpdate;
if (instance === null) {
if (current !== null) {
// A class component without an instance only mounts if it suspended
// inside a non-concurrent tree, in an inconsistent state. We want to
// treat it like a new mount, even though an empty version of it already
// committed. Disconnect the alternate pointers.
current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(current, workInProgress);

// In the initial pass we might need to construct the instance.
constructClassInstance(workInProgress, Component, nextProps);
mountClassInstance(workInProgress, Component, nextProps, renderLanes);
Expand Down Expand Up @@ -1469,16 +1461,7 @@ function mountLazyComponent(
elementType,
renderLanes,
) {
if (_current !== null) {
// A lazy component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
_current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(_current, workInProgress);

const props = workInProgress.pendingProps;
const lazyComponent: LazyComponentType<any, any> = elementType;
Expand Down Expand Up @@ -1588,16 +1571,7 @@ function mountIncompleteClassComponent(
nextProps,
renderLanes,
) {
if (_current !== null) {
// An incomplete component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
_current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(_current, workInProgress);

// Promote the fiber to a class and try rendering again.
workInProgress.tag = ClassComponent;
Expand Down Expand Up @@ -1635,16 +1609,7 @@ function mountIndeterminateComponent(
Component,
renderLanes,
) {
if (_current !== null) {
// An indeterminate component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
_current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(_current, workInProgress);

const props = workInProgress.pendingProps;
let context;
Expand Down Expand Up @@ -3376,6 +3341,21 @@ export function checkIfWorkInProgressReceivedUpdate() {
return didReceiveUpdate;
}

function resetSuspendedCurrentOnMountInLegacyMode(current, workInProgress) {
if ((workInProgress.mode & ConcurrentMode) === NoMode) {
if (current !== null) {
// A lazy component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
}
}

function bailoutOnAlreadyFinishedWork(
current: Fiber | null,
workInProgress: Fiber,
Expand Down
60 changes: 20 additions & 40 deletions packages/react-reconciler/src/ReactFiberBeginWork.old.js
Original file line number Diff line number Diff line change
Expand Up @@ -1110,16 +1110,8 @@ function updateClassComponent(
const instance = workInProgress.stateNode;
let shouldUpdate;
if (instance === null) {
if (current !== null) {
// A class component without an instance only mounts if it suspended
// inside a non-concurrent tree, in an inconsistent state. We want to
// treat it like a new mount, even though an empty version of it already
// committed. Disconnect the alternate pointers.
current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(current, workInProgress);

// In the initial pass we might need to construct the instance.
constructClassInstance(workInProgress, Component, nextProps);
mountClassInstance(workInProgress, Component, nextProps, renderLanes);
Expand Down Expand Up @@ -1469,16 +1461,7 @@ function mountLazyComponent(
elementType,
renderLanes,
) {
if (_current !== null) {
// A lazy component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
_current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(_current, workInProgress);

const props = workInProgress.pendingProps;
const lazyComponent: LazyComponentType<any, any> = elementType;
Expand Down Expand Up @@ -1588,16 +1571,7 @@ function mountIncompleteClassComponent(
nextProps,
renderLanes,
) {
if (_current !== null) {
// An incomplete component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
_current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(_current, workInProgress);

// Promote the fiber to a class and try rendering again.
workInProgress.tag = ClassComponent;
Expand Down Expand Up @@ -1635,16 +1609,7 @@ function mountIndeterminateComponent(
Component,
renderLanes,
) {
if (_current !== null) {
// An indeterminate component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
_current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
resetSuspendedCurrentOnMountInLegacyMode(_current, workInProgress);

const props = workInProgress.pendingProps;
let context;
Expand Down Expand Up @@ -3376,6 +3341,21 @@ export function checkIfWorkInProgressReceivedUpdate() {
return didReceiveUpdate;
}

function resetSuspendedCurrentOnMountInLegacyMode(current, workInProgress) {
if ((workInProgress.mode & ConcurrentMode) === NoMode) {
if (current !== null) {
// A lazy component only mounts if it suspended inside a non-
// concurrent tree, in an inconsistent state. We want to treat it like
// a new mount, even though an empty version of it already committed.
// Disconnect the alternate pointers.
current.alternate = null;
workInProgress.alternate = null;
// Since this is conceptually a new fiber, schedule a Placement effect
workInProgress.flags |= Placement;
}
}
}

function bailoutOnAlreadyFinishedWork(
current: Fiber | null,
workInProgress: Fiber,
Expand Down

0 comments on commit 34da5aa

Please sign in to comment.