rusefi
/
hyper-tuner-cloud
mirror of https://github.com/rusefi/hyper-tuner-cloud.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove CMD+SHIFT+P command, update dependencies, update extensions.json

This commit is contained in:
Piotr Rogowski 2022-03-12 12:00:13 +01:00
parent 5440561ac8
commit 1d446b9c56
No known key found for this signature in database
GPG Key ID: 4A842D702D9C6F8F
5 changed files with 362 additions and 371 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/extensions.json vendored
View File

@ -4,6 +4,7 @@
"recommendations": [ "recommendations": [
"editorconfig.editorconfig", "editorconfig.editorconfig",
"dbaeumer.vscode-eslint", "dbaeumer.vscode-eslint",
"davidanson.vscode-markdownlint" "davidanson.vscode-markdownlint",
"streetsidesoftware.code-spell-checker"
] ]
} }

695
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

32
src/components/TopBar.tsx
View File

@ -47,14 +47,8 @@ import {
} from '@ant-design/icons'; } from '@ant-design/icons';
import { useKBar } from 'kbar'; import { useKBar } from 'kbar';
import store from '../store'; import store from '../store';
import { import { isMac } from '../utils/env';
isMac, import { isToggleSidebar } from '../utils/keyboard/shortcuts';
isFirefox,
} from '../utils/env';
import {
isCommand,
isToggleSidebar,
} from '../utils/keyboard/shortcuts';
import { Routes } from '../routes'; import { Routes } from '../routes';
import { useAuth } from '../contexts/AuthContext'; import { useAuth } from '../contexts/AuthContext';
import { import {
@ -93,16 +87,11 @@ const TopBar = ({ tuneId }: { tuneId: string | null }) => {
const toggleCommandPalette = useCallback(() => query.toggle(), [query]); const toggleCommandPalette = useCallback(() => query.toggle(), [query]);
const handleGlobalKeyboard = useCallback((e: KeyboardEvent) => { const handleGlobalKeyboard = useCallback((e: KeyboardEvent) => {
if (isCommand(e)) {
e.preventDefault();
toggleCommandPalette();
}
if (isToggleSidebar(e)) { if (isToggleSidebar(e)) {
e.preventDefault(); e.preventDefault();
store.dispatch({ type: 'ui/toggleSidebar' }); store.dispatch({ type: 'ui/toggleSidebar' });
} }
}, [toggleCommandPalette]); }, []);
useEffect(() => { useEffect(() => {
document.addEventListener('keydown', handleGlobalKeyboard); document.addEventListener('keydown', handleGlobalKeyboard);
@ -190,17 +179,10 @@ const TopBar = ({ tuneId }: { tuneId: string | null }) => {
<Col {...rightMenuColProps} style={{ textAlign: 'right' }}> <Col {...rightMenuColProps} style={{ textAlign: 'right' }}>
<Space> <Space>
{sm && <Tooltip title={ {sm && <Tooltip title={
isFirefox ? <>
(<> <Typography.Text keyboard>{isMac ? '⌘' : 'CTRL'}</Typography.Text>
<Typography.Text keyboard>{isMac ? '⌘' : 'CTRL'}</Typography.Text> <Typography.Text keyboard>K</Typography.Text>
<Typography.Text keyboard>K</Typography.Text> </>
</>)
:
(<>
<Typography.Text keyboard>{isMac ? '⌘' : 'CTRL'}</Typography.Text>
<Typography.Text keyboard>SHIFT</Typography.Text>
<Typography.Text keyboard>P</Typography.Text>
</>)
}> }>
<Button icon={<SearchOutlined />} onClick={toggleCommandPalette} /> <Button icon={<SearchOutlined />} onClick={toggleCommandPalette} />
</Tooltip>} </Tooltip>}

1
src/utils/env.ts
View File

@ -1,5 +1,4 @@
export const isMac = `${window.navigator.platform}`.includes('Mac'); export const isMac = `${window.navigator.platform}`.includes('Mac');
export const isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
export const environment = import.meta.env.NODE_ENV || 'development'; export const environment = import.meta.env.NODE_ENV || 'development';
export const isProduction = environment === 'production'; export const isProduction = environment === 'production';
export const sentryDsn = import.meta.env.VITE_SENTRY_DSN; export const sentryDsn = import.meta.env.VITE_SENTRY_DSN;

2
src/utils/keyboard/shortcuts.ts
View File

@ -3,11 +3,9 @@ import React from 'react';
type KeyEvent = KeyboardEvent | React.KeyboardEvent<HTMLInputElement>; type KeyEvent = KeyboardEvent | React.KeyboardEvent<HTMLInputElement>;
enum Keys { enum Keys {
COMMAND = 'p',
SIDEBAR = '\\', SIDEBAR = '\\',
ESCAPE = 'Escape', ESCAPE = 'Escape',
} }
export const isCommand = (e: KeyEvent) => (e.metaKey || e.ctrlKey) && e.shiftKey && e.key === Keys.COMMAND;
export const isToggleSidebar = (e: KeyEvent) => (e.metaKey || e.ctrlKey) && e.key === Keys.SIDEBAR; export const isToggleSidebar = (e: KeyEvent) => (e.metaKey || e.ctrlKey) && e.key === Keys.SIDEBAR;
export const isEscape = (e: KeyEvent) => e.key === Keys.ESCAPE; export const isEscape = (e: KeyEvent) => e.key === Keys.ESCAPE;