Skip to content

[DevTools] Wrap each tab in <Activity> if available #34426

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+136 −92
Open

[DevTools] Wrap each tab in <Activity> if available #34426

Show file tree
Hide file tree
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
226 changes: 135 additions & 91 deletions packages/react-devtools-shared/src/devtools/views/DevTools.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@ import '@reach/menu-button/styles.css';
import '@reach/tooltip/styles.css';

import * as React from 'react';
import {useCallback, useEffect, useLayoutEffect, useMemo, useRef} from 'react';
import {
StrictMode,
useCallback,
useEffect,
useLayoutEffect,
useMemo,
useRef,
} from 'react';
import Store from '../store';
import {
BridgeContext,
Expand Down Expand Up @@ -56,6 +63,38 @@ import type {BrowserTheme} from 'react-devtools-shared/src/frontend/types';
import type {ReactFunctionLocation, ReactCallSite} from 'shared/ReactTypes';
import type {SourceSelection} from './Editor/EditorPane';

const MaybeActivity: any =
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how to type this. Flow treats React.Activity as a Symbol not a ElementType with certain props.

React.Activity ||
(React as any).unstable_Activity ||
function AlwaysVisibleActivity({
children,
}: {
children: React.Node,
mode: string,
}) {
return children;
};

function TabContent({
children,
activeTab,
name,
}: {
children: React.Node,
activeTab: string,
name: string,
}) {
const hidden = activeTab !== name;
const mode = hidden ? 'hidden' : 'visible';
return (
<MaybeActivity mode={mode} name={name + '-tab'}>
<div className={styles.TabContent} hidden={hidden}>
{children}
</div>
</MaybeActivity>
);
}

export type TabID = 'components' | 'profiler' | 'suspense';

export type ViewElementSource = (
Expand Down Expand Up @@ -289,6 +328,7 @@ export default function DevTools({
useLayoutEffect(() => {
return () => {
try {
// TODO: <DevTools> can't be put int <Activity> without being able to resume listening
// Shut the Bridge down synchronously (during unmount).
bridge.shutdown();
} catch (error) {
Expand All @@ -302,98 +342,102 @@ export default function DevTools({
}, []);

return (
<BridgeContext.Provider value={bridge}>
<StoreContext.Provider value={store}>
<OptionsContext.Provider value={options}>
<ContextMenuContext.Provider value={contextMenu}>
<ModalDialogContextController>
<SettingsContextController
browserTheme={browserTheme}
componentsPortalContainer={componentsPortalContainer}
profilerPortalContainer={profilerPortalContainer}>
<ViewElementSourceContext.Provider value={viewElementSource}>
<HookNamesModuleLoaderContext.Provider
value={hookNamesModuleLoaderFunction || null}>
<FetchFileWithCachingContext.Provider
value={fetchFileWithCaching || null}>
<TreeContextController>
<ProfilerContextController>
<TimelineContextController>
<InspectedElementContextController>
<SuspenseTreeContextController>
<ThemeProvider>
<div
className={styles.DevTools}
ref={devToolsRef}
data-react-devtools-portal-root={true}>
{showTabBar && (
<div className={styles.TabBar}>
<ReactLogo />
<span
className={styles.DevToolsVersion}>
{process.env.DEVTOOLS_VERSION}
</span>
<div className={styles.Spacer} />
<TabBar
currentTab={tab}
id="DevTools"
selectTab={selectTab}
tabs={tabs}
type="navigation"
/>
</div>
)}
<div
className={styles.TabContent}
hidden={tab !== 'components'}>
<Components
portalContainer={
componentsPortalContainer
}
/>
</div>
<StrictMode>
<BridgeContext.Provider value={bridge}>
<StoreContext.Provider value={store}>
<OptionsContext.Provider value={options}>
<ContextMenuContext.Provider value={contextMenu}>
<ModalDialogContextController>
<SettingsContextController
browserTheme={browserTheme}
componentsPortalContainer={componentsPortalContainer}
profilerPortalContainer={profilerPortalContainer}>
<ViewElementSourceContext.Provider value={viewElementSource}>
<HookNamesModuleLoaderContext.Provider
value={hookNamesModuleLoaderFunction || null}>
<FetchFileWithCachingContext.Provider
value={fetchFileWithCaching || null}>
<TreeContextController>
<ProfilerContextController>
<TimelineContextController>
<InspectedElementContextController>
<SuspenseTreeContextController>
<ThemeProvider>
<div
className={styles.TabContent}
hidden={tab !== 'profiler'}>
<Profiler
portalContainer={
profilerPortalContainer
}
/>
className={styles.DevTools}
ref={devToolsRef}
data-react-devtools-portal-root={true}>
{showTabBar && (
<div className={styles.TabBar}>
<ReactLogo />
<span
className={styles.DevToolsVersion}>
{process.env.DEVTOOLS_VERSION}
</span>
<div className={styles.Spacer} />
<TabBar
currentTab={tab}
id="DevTools"
selectTab={selectTab}
tabs={tabs}
type="navigation"
/>
</div>
)}
<TabContent
name="components"
activeTab={tab}>
<Components
portalContainer={
componentsPortalContainer
}
/>
</TabContent>
<TabContent
name="profiler"
activeTab={tab}>
<Profiler
portalContainer={
profilerPortalContainer
}
/>
</TabContent>
<TabContent
name="suspense"
activeTab={tab}>
<SuspenseTab
portalContainer={
suspensePortalContainer
}
/>
</TabContent>
</div>
<div
className={styles.TabContent}
hidden={tab !== 'suspense'}>
<SuspenseTab
portalContainer={
suspensePortalContainer
}
{editorPortalContainer ? (
<EditorPane
selectedSource={currentSelectedSource}
portalContainer={editorPortalContainer}
/>
</div>
</div>
{editorPortalContainer ? (
<EditorPane
selectedSource={currentSelectedSource}
portalContainer={editorPortalContainer}
/>
) : null}
</ThemeProvider>
</SuspenseTreeContextController>
</InspectedElementContextController>
</TimelineContextController>
</ProfilerContextController>
</TreeContextController>
</FetchFileWithCachingContext.Provider>
</HookNamesModuleLoaderContext.Provider>
</ViewElementSourceContext.Provider>
</SettingsContextController>
<UnsupportedBridgeProtocolDialog />
{warnIfLegacyBackendDetected && <WarnIfLegacyBackendDetected />}
{warnIfUnsupportedVersionDetected && <UnsupportedVersionDialog />}
</ModalDialogContextController>
</ContextMenuContext.Provider>
</OptionsContext.Provider>
</StoreContext.Provider>
</BridgeContext.Provider>
) : null}
</ThemeProvider>
</SuspenseTreeContextController>
</InspectedElementContextController>
</TimelineContextController>
</ProfilerContextController>
</TreeContextController>
</FetchFileWithCachingContext.Provider>
</HookNamesModuleLoaderContext.Provider>
</ViewElementSourceContext.Provider>
</SettingsContextController>
<UnsupportedBridgeProtocolDialog />
{warnIfLegacyBackendDetected && <WarnIfLegacyBackendDetected />}
{warnIfUnsupportedVersionDetected && (
<UnsupportedVersionDialog />
)}
</ModalDialogContextController>
</ContextMenuContext.Provider>
</OptionsContext.Provider>
</StoreContext.Provider>
</BridgeContext.Provider>
</StrictMode>
);
}
2 changes: 1 addition & 1 deletion packages/react-devtools-shell/src/app/InspectableElements/UseEffectEvent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function useCustomHook() {
}

function HookTreeCase() {
const onClick = useCustomHook();
const [, , onClick] = useCustomHook();
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drive-by fix for noisy shell errors.


return <div onClick={onClick} />;
}
Loading