diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx index ac5376b5b80..88040db921f 100644 --- a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/GroupStrip.tsx @@ -5,7 +5,6 @@ import { DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, - DropdownMenuShortcut, DropdownMenuTrigger, } from "@superset/ui/dropdown-menu"; import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip"; @@ -24,8 +23,6 @@ import { } from "renderer/assets/app-icons/preset-icons"; import { HotkeyTooltipContent } from "renderer/components/HotkeyTooltipContent"; import { usePresets } from "renderer/react-query/presets"; -import { useHotkeyText } from "renderer/stores/hotkeys"; -import { PRESET_HOTKEY_IDS } from "renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/hooks/usePresetHotkeys"; import { useTabsStore } from "renderer/stores/tabs/store"; import { useTabsWithPresets } from "renderer/stores/tabs/useTabsWithPresets"; import { @@ -33,20 +30,10 @@ import { resolveActiveTabIdForWorkspace, } from "renderer/stores/tabs/utils"; import { type ActivePaneStatus, pickHigherStatus } from "shared/tabs-types"; +import { PresetMenuItemShortcut } from "./components/PresetMenuItemShortcut"; import { GroupItem } from "./GroupItem"; import { NewTabDropZone } from "./NewTabDropZone"; -function PresetMenuItemShortcut({ index }: { index: number }) { - const hotkeyId = PRESET_HOTKEY_IDS[index]; - const hotkeyText = useHotkeyText(hotkeyId); - - if (!hotkeyId || hotkeyText === "Unassigned") { - return null; - } - - return {hotkeyText}; -} - export function GroupStrip() { const { workspaceId: activeWorkspaceId } = useParams({ strict: false }); diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/components/PresetMenuItemShortcut/PresetMenuItemShortcut.tsx b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/components/PresetMenuItemShortcut/PresetMenuItemShortcut.tsx new file mode 100644 index 00000000000..daac749f10b --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/components/PresetMenuItemShortcut/PresetMenuItemShortcut.tsx @@ -0,0 +1,24 @@ +import { DropdownMenuShortcut } from "@superset/ui/dropdown-menu"; +import { PRESET_HOTKEY_IDS } from "renderer/routes/_authenticated/_dashboard/workspace/$workspaceId/hooks/usePresetHotkeys"; +import { useHotkeyText } from "renderer/stores/hotkeys"; +import type { HotkeyId } from "shared/hotkeys"; + +function PresetMenuItemShortcutInner({ hotkeyId }: { hotkeyId: HotkeyId }) { + const hotkeyText = useHotkeyText(hotkeyId); + + if (hotkeyText === "Unassigned") { + return null; + } + + return {hotkeyText}; +} + +export function PresetMenuItemShortcut({ index }: { index: number }) { + const hotkeyId = PRESET_HOTKEY_IDS[index]; + + if (!hotkeyId) { + return null; + } + + return ; +} diff --git a/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/components/PresetMenuItemShortcut/index.ts b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/components/PresetMenuItemShortcut/index.ts new file mode 100644 index 00000000000..5b93ed3229d --- /dev/null +++ b/apps/desktop/src/renderer/screens/main/components/WorkspaceView/ContentView/TabsContent/GroupStrip/components/PresetMenuItemShortcut/index.ts @@ -0,0 +1 @@ +export { PresetMenuItemShortcut } from "./PresetMenuItemShortcut"; diff --git a/apps/desktop/src/shared/hotkeys.ts b/apps/desktop/src/shared/hotkeys.ts index b79d48c8b11..5e5c4957d7d 100644 --- a/apps/desktop/src/shared/hotkeys.ts +++ b/apps/desktop/src/shared/hotkeys.ts @@ -512,47 +512,47 @@ export const HOTKEYS = { description: "Focus the next pane in the current tab", }), OPEN_PRESET_1: defineHotkey({ - keys: "meta+shift+1", + keys: "ctrl+1", label: "Open Preset 1", category: "Terminal", }), OPEN_PRESET_2: defineHotkey({ - keys: "meta+shift+2", + keys: "ctrl+2", label: "Open Preset 2", category: "Terminal", }), OPEN_PRESET_3: defineHotkey({ - keys: "meta+shift+3", + keys: "ctrl+3", label: "Open Preset 3", category: "Terminal", }), OPEN_PRESET_4: defineHotkey({ - keys: "meta+shift+4", + keys: "ctrl+4", label: "Open Preset 4", category: "Terminal", }), OPEN_PRESET_5: defineHotkey({ - keys: "meta+shift+5", + keys: "ctrl+5", label: "Open Preset 5", category: "Terminal", }), OPEN_PRESET_6: defineHotkey({ - keys: "meta+shift+6", + keys: "ctrl+6", label: "Open Preset 6", category: "Terminal", }), OPEN_PRESET_7: defineHotkey({ - keys: "meta+shift+7", + keys: "ctrl+7", label: "Open Preset 7", category: "Terminal", }), OPEN_PRESET_8: defineHotkey({ - keys: "meta+shift+8", + keys: "ctrl+8", label: "Open Preset 8", category: "Terminal", }), OPEN_PRESET_9: defineHotkey({ - keys: "meta+shift+9", + keys: "ctrl+9", label: "Open Preset 9", category: "Terminal", }),