Skip to content

[pull] main from facebook:main #265

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 2 commits into from
Sep 4, 2025
Merged

[pull] main from facebook:main #265

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
e2cc315
[DevTools] Don't suspend shell while retrieving original source for "…
eps1lon Sep 4, 2025
b9a0453
[DevTools] Allow inspecting root when navigating Suspense timeline (#…
eps1lon Sep 4, 2025
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
15 changes: 14 additions & 1 deletion packages/react-devtools-shared/src/devtools/views/Components/OpenInEditorButton.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ type Props = {
symbolicatedSourcePromise: Promise<SourceMappedLocation | null>,
};

function OpenInEditorButton({
function OpenSymbolicatedSourceInEditorButton({
editorURL,
source,
symbolicatedSourcePromise,
Expand All @@ -45,4 +45,17 @@ function OpenInEditorButton({
);
}

function OpenInEditorButton(props: Props): React.Node {
return (
<React.Suspense
fallback={
<Button disabled={true} title="retrieving original source…">
<ButtonIcon type="editor" />
</Button>
}>
<OpenSymbolicatedSourceInEditorButton {...props} />
</React.Suspense>
);
}

export default OpenInEditorButton;
9 changes: 4 additions & 5 deletions packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseTimeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ function getSuspendableDocumentOrderSuspense(
if (current === undefined) {
continue;
}
// Don't include the root. It's currently not supported to suspend the shell.
if (current !== suspense) {
suspenseTreeList.push(current);
}
// Include the root even if we won't suspend it.
// You should be able to see what suspended the shell.
suspenseTreeList.push(current);
// Add children in reverse order to maintain document order
for (let j = current.children.length - 1; j >= 0; j--) {
const childSuspense = store.getSuspenseByID(current.children[j]);
Expand Down Expand Up @@ -139,7 +138,7 @@ function SuspenseTimelineInput({rootID}: {rootID: Element['id'] | void}) {

const pendingValue = +event.currentTarget.value;
const suspendedSet = timeline
.slice(pendingValue + 1)
.slice(pendingValue)
.map(suspense => suspense.id);

bridge.send('overrideSuspenseMilestone', {
Expand Down
Loading