Skip to content

[DevTools] Gray out Suspense boundaries with no unique suspenders #35925

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

Open
devjiwonchoi wants to merge 2 commits into
base: main
Choose a base branch
from
+33 −2
Open

[DevTools] Gray out Suspense boundaries with no unique suspenders #35925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4f67cf
[DevTools] Gray out non-suspended Suspense boundaries in Suspense tab
devjiwonchoi Feb 27, 2026
465e778
[DevTools] Compute root step hasUniqueSuspenders as union of all roots
devjiwonchoi Feb 28, 2026
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
7 changes: 7 additions & 0 deletions packages/react-devtools-shared/src/devtools/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,7 @@ export default class Store extends EventEmitter<{
id: suspense.id,
environment: environmentName,
endTime: suspense.endTime,
hasUniqueSuspenders: suspense.hasUniqueSuspenders,
};
target.push(rootStep);
} else {
Expand All @@ -983,6 +984,10 @@ export default class Store extends EventEmitter<{
// If any root has a higher end time, let's use that.
rootStep.endTime = suspense.endTime;
}
if (!rootStep.hasUniqueSuspenders) {
// If any root has unique suspenders, the merged root should too.
rootStep.hasUniqueSuspenders = suspense.hasUniqueSuspenders;
}
}
this.pushTimelineStepsInDocumentOrder(
suspense.children,
Expand Down Expand Up @@ -1051,6 +1056,7 @@ export default class Store extends EventEmitter<{
// TODO: Get environment for Activity
environment: null,
endTime: 0,
hasUniqueSuspenders: true,
});

const transitionChildren = this.getSuspenseChildren(focusedTransitionID);
Expand Down Expand Up @@ -1106,6 +1112,7 @@ export default class Store extends EventEmitter<{
id: child.id,
environment: environmentName,
endTime: maxEndTime,
hasUniqueSuspenders: child.hasUniqueSuspenders,
});
}
this.pushTimelineStepsInDocumentOrder(
Expand Down
4 changes: 4 additions & 0 deletions packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseRects.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,7 @@
.SuspenseRectsBoundary[data-selected='true'] > .SuspenseRectsRect {
box-shadow: none;
}

.SuspenseRectsBoundaryNotSuspended {
--color-suspense: var(--color-dim);
}
12 changes: 10 additions & 2 deletions packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseRects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,10 @@ function SuspenseRects({
className={
styles.SuspenseRectsBoundary +
' ' +
getClassNameForEnvironment(environment)
getClassNameForEnvironment(environment) +
(!suspense.hasUniqueSuspenders
? ' ' + styles.SuspenseRectsBoundaryNotSuspended
: '')
}
visible={visible}
selected={selected}
Expand Down Expand Up @@ -550,6 +553,7 @@ function SuspenseRectsContainer({

let selectedBoundingBox = null;
let selectedEnvironment = null;
let selectedHasUniqueSuspenders = true;
if (isRootSelected) {
selectedEnvironment = rootEnvironment;
} else if (
Expand All @@ -563,6 +567,7 @@ function SuspenseRectsContainer({
(selectedSuspenseNode.hasUniqueSuspenders || !uniqueSuspendersOnly)
) {
selectedBoundingBox = getBoundingBox(selectedSuspenseNode.rects);
selectedHasUniqueSuspenders = selectedSuspenseNode.hasUniqueSuspenders;
for (let i = 0; i < timeline.length; i++) {
const timelineStep = timeline[i];
if (timelineStep.id === inspectedElementID) {
Expand Down Expand Up @@ -605,7 +610,10 @@ function SuspenseRectsContainer({
className={
styles.SuspenseRectOutline +
' ' +
getClassNameForEnvironment(selectedEnvironment)
getClassNameForEnvironment(selectedEnvironment) +
(!selectedHasUniqueSuspenders
? ' ' + styles.SuspenseRectsBoundaryNotSuspended
: '')
}
rect={selectedBoundingBox}
adjust={true}
Expand Down
8 changes: 8 additions & 0 deletions packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseScrubber.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
background: var(--color-transition);
}

.SuspenseScrubberBeadNotSuspended {
background: color-mix(in srgb, var(--color-dim) 25%, transparent);
}

.SuspenseScrubberBeadNotSuspended.SuspenseScrubberBeadSelected {
background: var(--color-dim);
}

.SuspenseScrubberStepHighlight > .SuspenseScrubberBead {
height: 0.75rem;
transition: all 0.3s ease-out;
Expand Down
3 changes: 3 additions & 0 deletions packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseScrubber.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ export default function SuspenseScrubber({
? // The first step in the timeline is always a Transition (Initial Paint).
' ' + styles.SuspenseScrubberBeadTransition
: '') +
(!step.hasUniqueSuspenders
? ' ' + styles.SuspenseScrubberBeadNotSuspended
: '') +
' ' +
getClassNameForEnvironment(environment) +
(index <= value ? ' ' + styles.SuspenseScrubberBeadSelected : '')
Expand Down
1 change: 1 addition & 0 deletions packages/react-devtools-shared/src/frontend/types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ export type SuspenseTimelineStep = {
id: SuspenseNode['id'] | Element['id'], // TODO: Will become a group.
environment: null | string,
endTime: number,
hasUniqueSuspenders: boolean,
};

export type SuspenseNode = {
Expand Down