Skip to content

Traverse down an updated tree even if it has no passive effects in profiling mode #34667

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 1 commit into from
Oct 1, 2025
+20 −3
Merged

Traverse down an updated tree even if it has no passive effects in profiling mode #34667

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions packages/react-reconciler/src/ReactFiberCommitWork.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3935,7 +3935,12 @@ function commitPassiveMountOnFiber(
instance._visibility |= OffscreenPassiveEffectsConnected;

const includeWorkInProgressEffects =
(finishedWork.subtreeFlags & PassiveMask) !== NoFlags;
(finishedWork.subtreeFlags & PassiveMask) !== NoFlags ||
(enableProfilerTimer &&
enableComponentPerformanceTrack &&
finishedWork.actualDuration !== 0 &&
(finishedWork.alternate === null ||
finishedWork.alternate.child !== finishedWork.child));
recursivelyTraverseReconnectPassiveEffects(
finishedRoot,
finishedWork,
Expand Down Expand Up @@ -4102,7 +4107,12 @@ function recursivelyTraverseReconnectPassiveEffects(
// node was reused.
const childShouldIncludeWorkInProgressEffects =
includeWorkInProgressEffects &&
(parentFiber.subtreeFlags & PassiveMask) !== NoFlags;
((parentFiber.subtreeFlags & PassiveMask) !== NoFlags ||
(enableProfilerTimer &&
enableComponentPerformanceTrack &&
parentFiber.actualDuration !== 0 &&
(parentFiber.alternate === null ||
parentFiber.alternate.child !== parentFiber.child)));

// TODO (Offscreen) Check: flags & (RefStatic | LayoutStatic)
let child = parentFiber.child;
Expand Down Expand Up @@ -4366,7 +4376,14 @@ function recursivelyTraverseAtomicPassiveEffects(
// pre-rendering. We call this function when traversing a hidden tree whose
// regular effects are currently disconnected.
// TODO: Add special flag for atomic effects
if (parentFiber.subtreeFlags & PassiveMask) {
if (
parentFiber.subtreeFlags & PassiveMask ||
(enableProfilerTimer &&
enableComponentPerformanceTrack &&
parentFiber.actualDuration !== 0 &&
(parentFiber.alternate === null ||
parentFiber.alternate.child !== parentFiber.child))
) {
let child = parentFiber.child;
while (child !== null) {
if (enableProfilerTimer && enableComponentPerformanceTrack) {
Expand Down
Loading