Skip to content
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

Jump to bottom

[DevTools] Add shortcut keys for tab switching #18248

Merged
merged 3 commits into from Mar 18, 2020
Merged

[DevTools] Add shortcut keys for tab switching #18248

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a68ee9c
[DevTools] Add shortcut keys for tab switching
kerolloz Mar 8, 2020
8ce4530
Use LocalStorage to remember most recently selected tab
bvaughn Mar 18, 2020
64a3a20
Make overrideTab override more explicit
bvaughn Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 45 additions & 5 deletions packages/react-devtools-shared/src/devtools/views/DevTools.js
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ import '@reach/menu-button/styles.css';
import '@reach/tooltip/styles.css';

import * as React from 'react';
import {useEffect, useMemo, useState} from 'react';
import {useEffect, useMemo, useRef} from 'react';
import Store from '../store';
import {BridgeContext, ContextMenuContext, StoreContext} from './context';
import Components from './Components/Components';
Expand All @@ -27,6 +27,7 @@ import {ModalDialogContextController} from './ModalDialog';
import ReactLogo from './ReactLogo';
import UnsupportedVersionDialog from './UnsupportedVersionDialog';
import WarnIfLegacyBackendDetected from './WarnIfLegacyBackendDetected';
import {useLocalStorage} from './hooks';

import styles from './DevTools.css';

Expand Down Expand Up @@ -106,9 +107,13 @@ export default function DevTools({
viewAttributeSourceFunction,
viewElementSourceFunction,
}: Props) {
const [tab, setTab] = useState(defaultTab);
if (overrideTab != null && overrideTab !== tab) {
setTab(overrideTab);
let [tab, setTab] = useLocalStorage<TabID>(
'React::DevTools::defaultTab',
defaultTab,
);

if (overrideTab != null) {
tab = overrideTab;
}

const viewElementSource = useMemo(
Expand All @@ -127,6 +132,41 @@ export default function DevTools({
[enabledInspectedElementContextMenu, viewAttributeSourceFunction],
);

const devToolsRef = useRef<HTMLElement | null>(null);

useEffect(() => {
if (!showTabBar) {
return;
}

const div = devToolsRef.current;
if (div === null) {
return;
}
kerolloz marked this conversation as resolved.
Show resolved Hide resolved

const ownerWindow = div.ownerDocument.defaultView;
const handleKeyDown = (event: KeyboardEvent) => {
if (event.ctrlKey || event.metaKey) {
switch (event.key) {
case '1':
setTab(tabs[0].id);
event.preventDefault();
event.stopPropagation();
break;
case '2':
setTab(tabs[1].id);
event.preventDefault();
event.stopPropagation();
break;
}
}
};
ownerWindow.addEventListener('keydown', handleKeyDown);
return () => {
ownerWindow.removeEventListener('keydown', handleKeyDown);
};
}, [showTabBar]);

useEffect(() => {
return () => {
try {
Expand All @@ -149,7 +189,7 @@ export default function DevTools({
<ViewElementSourceContext.Provider value={viewElementSource}>
<TreeContextController>
<ProfilerContextController>
<div className={styles.DevTools}>
<div className={styles.DevTools} ref={devToolsRef}>
{showTabBar && (
<div className={styles.TabBar}>
<ReactLogo />
Expand Down