From b12f422db64afaef5e33bc0582c9e00a22cc0ce1 Mon Sep 17 00:00:00 2001 From: Enrico Ros Date: Thu, 20 Feb 2025 12:24:11 -0800 Subject: [PATCH] Shortcuts: Esc comes first --- src/apps/chat/components/StatusBar.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/apps/chat/components/StatusBar.tsx b/src/apps/chat/components/StatusBar.tsx index 114fe0ef9..a7716c3d7 100644 --- a/src/apps/chat/components/StatusBar.tsx +++ b/src/apps/chat/components/StatusBar.tsx @@ -6,7 +6,7 @@ import ExpandLessIcon from '@mui/icons-material/ExpandLess'; import MinimizeIcon from '@mui/icons-material/Minimize'; // import { isMacUser } from '~/common/util/pwaUtils'; -import type { ShortcutObject } from '~/common/components/shortcuts/useGlobalShortcuts'; +import { ShortcutKey, ShortcutObject } from '~/common/components/shortcuts/useGlobalShortcuts'; import { ConfirmationModal } from '~/common/components/modals/ConfirmationModal'; import { GoodTooltip } from '~/common/components/GoodTooltip'; import { useGlobalShortcutsStore } from '~/common/components/shortcuts/store-global-shortcuts'; @@ -181,6 +181,10 @@ export function StatusBar(props: { toggleMinimized?: () => void, isMinimized?: b if (aModifiers !== bModifiers) return aModifiers - bModifiers; + // 3a. Special case for ShortcutKey.Esc, at the beginning + if (a.key === ShortcutKey.Esc) return -1; + if (b.key === ShortcutKey.Esc) return 1; + // 3. Special case for 'Beam Edit' if (a.description === 'Beam Edit') return 1; if (b.description === 'Beam Edit') return -1;