Skip to content

[pull] main from facebook:main #318

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
Oct 5, 2025
Merged

[pull] main from facebook:main #318

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
0e79784
[DevTools] Use documentElement to override cmd+F (#34734)
sebmarkbage Oct 5, 2025
62ff1e6
Revert "[DevTools] Always include the root in the timeline and select…
hoxyq Oct 5, 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: 10 additions & 5 deletions packages/react-devtools-shared/src/devtools/views/SearchInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ export default function SearchInput({
const handleKeyDown = (event: KeyboardEvent) => {
const {key, metaKey} = event;
if (key === 'f' && metaKey) {
if (inputRef.current !== null) {
inputRef.current.focus();
const inputElement = inputRef.current;
if (inputElement !== null) {
inputElement.focus();
event.preventDefault();
event.stopPropagation();
}
Expand All @@ -75,10 +76,14 @@ export default function SearchInput({
// It's important to listen to the ownerDocument to support the browser extension.
// Here we use portals to render individual tabs (e.g. Profiler),
// and the root document might belong to a different window.
const ownerDocument = inputRef.current.ownerDocument;
ownerDocument.addEventListener('keydown', handleKeyDown);
const ownerDocumentElement = inputRef.current.ownerDocument.documentElement;
if (ownerDocumentElement === null) {
return;
}
ownerDocumentElement.addEventListener('keydown', handleKeyDown);

return () => ownerDocument.removeEventListener('keydown', handleKeyDown);
return () =>
ownerDocumentElement.removeEventListener('keydown', handleKeyDown);
}, []);

return (
Expand Down
16 changes: 0 additions & 16 deletions packages/react-devtools-shared/src/devtools/views/SuspenseTab/SuspenseTab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ import {
SuspenseTreeStateContext,
} from './SuspenseTreeContext';
import {StoreContext, OptionsContext} from '../context';
import {
TreeDispatcherContext,
TreeStateContext,
} from '../Components/TreeContext';
import Button from '../Button';
import Toggle from '../Toggle';
import typeof {SyntheticPointerEvent} from 'react-dom-bindings/src/events/SyntheticEvent';
Expand Down Expand Up @@ -185,18 +181,6 @@ function SuspenseTab(_: {}) {
treeListHorizontalFraction,
} = state;

const {inspectedElementID} = useContext(TreeStateContext);
const {timeline} = useContext(SuspenseTreeStateContext);
const treeDispatch = useContext(TreeDispatcherContext);
useLayoutEffect(() => {
// If the inspected element is still null and we've loaded a timeline, we can set the initial selection.
// TODO: This tab should use its own source of truth instead so we only show suspense boundaries.
if (inspectedElementID === null && timeline.length > 0) {
const milestone = timeline[timeline.length - 1];
treeDispatch({type: 'SELECT_ELEMENT_BY_ID', payload: milestone});
}
}, [timeline, inspectedElementID]);

useLayoutEffect(() => {
const wrapperElement = wrapperTreeRef.current;

Expand Down
Loading