Skip to content

[DevTools] Make Element Inspection Feel Snappy #30555

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
Aug 1, 2024
Merged

[DevTools] Make Element Inspection Feel Snappy #30555

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ee7311
Remove Suspense around InspectedElement
sebmarkbage Jul 31, 2024
c55b626
Use queueMicrotask to batch bridge messages
sebmarkbage Aug 1, 2024
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
Next Next commit
Remove Suspense around InspectedElement 
We should be just using the Transition value "inspectedElementID".

We could useDeferredValue but we already have an implementation of this
ID using a reducer but it would be more idiomatic to useDeferredValue.
  • Loading branch information
@sebmarkbage
sebmarkbage committed Aug 1, 2024
commit 8ee73115c4da895bfa313b43d6c75be7acac8cbc
11 changes: 5 additions & 6 deletions packages/react-devtools-shared/src/__tests__/inspectedElement-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,11 @@ describe('InspectedElement', () => {
<SettingsContextController>
<TreeContextController
defaultSelectedElementID={defaultSelectedElementID}
defaultSelectedElementIndex={defaultSelectedElementIndex}>
<React.Suspense fallback="Loading...">
<InspectedElementContextController>
{children}
</InspectedElementContextController>
</React.Suspense>
defaultSelectedElementIndex={defaultSelectedElementIndex}
defaultInspectedElementID={defaultSelectedElementID}>
<InspectedElementContextController>
{children}
</InspectedElementContextController>
</TreeContextController>
</SettingsContextController>
</StoreContext.Provider>
Expand Down
21 changes: 4 additions & 17 deletions packages/react-devtools-shared/src/devtools/views/Components/Components.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,7 @@
*/

import * as React from 'react';
import {
Fragment,
Suspense,
useEffect,
useLayoutEffect,
useReducer,
useRef,
} from 'react';
import {Fragment, useEffect, useLayoutEffect, useReducer, useRef} from 'react';
import Tree from './Tree';
import {OwnersListContextController} from './OwnersListContext';
import portaledContent from '../portaledContent';
Expand Down Expand Up @@ -169,11 +162,9 @@ function Components(_: {}) {
<div className={styles.InspectedElementWrapper}>
<NativeStyleContextController>
<InspectedElementErrorBoundary>
<Suspense fallback={<Loading />}>
<InspectedElementContextController>
<InspectedElement />
</InspectedElementContextController>
</Suspense>
<InspectedElementContextController>
<InspectedElement />
</InspectedElementContextController>
</InspectedElementErrorBoundary>
</NativeStyleContextController>
</div>
Expand All @@ -186,10 +177,6 @@ function Components(_: {}) {
);
}

function Loading() {
return <div className={styles.Loading}>Loading...</div>;
}

const LOCAL_STORAGE_KEY = 'React::DevTools::createResizeReducer';
const VERTICAL_MODE_MAX_WIDTH = 600;
const MINIMUM_SIZE = 50;
Expand Down
6 changes: 4 additions & 2 deletions packages/react-devtools-shared/src/devtools/views/Components/InspectedElementContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export type Props = {
export function InspectedElementContextController({
children,
}: Props): React.Node {
const {selectedElementID} = useContext(TreeStateContext);
const {inspectedElementID} = useContext(TreeStateContext);
const fetchFileWithCaching = useContext(FetchFileWithCachingContext);
const bridge = useContext(BridgeContext);
const store = useContext(StoreContext);
Expand All @@ -93,7 +93,9 @@ export function InspectedElementContextController({
});

const element =
selectedElementID !== null ? store.getElementByID(selectedElementID) : null;
inspectedElementID !== null
? store.getElementByID(inspectedElementID)
: null;

const alreadyLoadedHookNames =
element != null && hasAlreadyLoadedHookNames(element);
Expand Down
4 changes: 2 additions & 2 deletions ...ages/react-devtools-shared/src/devtools/views/Components/InspectedElementErrorBoundary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default function InspectedElementErrorBoundaryWrapper({
}: WrapperProps): React.Node {
// Key on the selected element ID so that changing the selected element automatically hides the boundary.
// This seems best since an error inspecting one element isn't likely to be relevant to another element.
const {selectedElementID} = useContext(TreeStateContext);
const {inspectedElementID} = useContext(TreeStateContext);

const refresh = useCacheRefresh();
const handleDsmiss = useCallback(() => {
Expand All @@ -37,7 +37,7 @@ export default function InspectedElementErrorBoundaryWrapper({
return (
<div className={styles.Wrapper}>
<ErrorBoundary
key={selectedElementID}
key={inspectedElementID}
canDismiss={true}
onBeforeDismissCallback={handleDsmiss}>
{children}
Expand Down