diff --git a/apps/desktop/src/App.vue b/apps/desktop/src/App.vue index 2c03116ab0..de17e3f8d1 100644 --- a/apps/desktop/src/App.vue +++ b/apps/desktop/src/App.vue @@ -106,6 +106,7 @@ import { activeDesktopAiRuns, blockingDesktopAiRunsForQuit } from "@/lib/ai/desk import { isBrowserReloadShortcut, + isBrowserTaskManagerShortcut, isCloseOtherTabsShortcut, isCloseTabShortcut, isExecuteSqlInNewResultTabShortcut, @@ -3707,6 +3708,11 @@ const tabSwitcherKeyboard = createTabSwitcherKeyboardController({ }); function handleNativeSelectAll(e: KeyboardEvent) { + if (isBrowserTaskManagerShortcut(e)) { + e.preventDefault(); + e.stopPropagation(); + return; + } if (shouldBlockAppNativeSelectAll(e)) e.preventDefault(); } @@ -4000,6 +4006,11 @@ async function handleKeydown(e: KeyboardEvent) { return; } } + if (isBrowserTaskManagerShortcut(e)) { + e.preventDefault(); + e.stopPropagation(); + return; + } if (isDesktop && isBrowserReloadShortcut(e)) { e.preventDefault(); e.stopPropagation(); @@ -4174,6 +4185,7 @@ watch(appReady, (ready) => void syncConnectionLivenessSubscription(ready), { imm onMounted(async () => { clearStartupPreloadRetry(); markStartupPhase("app-mounted"); + window.addEventListener("keydown", handleNativeSelectAll, true); console.log("[STARTUP] onMounted begin"); const mountStart = performance.now(); if (isDetachedWindowContext) { @@ -4195,7 +4207,6 @@ onMounted(async () => { }); applyTheme(); void applyUiScale(settingsStore.editorSettings.uiScale); - window.addEventListener("keydown", handleNativeSelectAll, true); window.addEventListener("keydown", handleGlobalSearchKeydownCapture, true); window.addEventListener("keydown", handleTabSwitcherKeydownCapture, true); window.addEventListener("keydown", handleAuxiliarySearchKeydownCapture, true); diff --git a/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts b/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts index f34a01c140..ac34ee1bf9 100644 --- a/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts +++ b/apps/desktop/src/lib/__tests__/editor/keyboardShortcuts.spec.ts @@ -2,6 +2,7 @@ import { describe, expect, it } from "vitest"; import { eventToModifierOnlyShortcut, eventToShortcut, + isBrowserTaskManagerShortcut, isConvertNamingStyleShortcut, isEditTableStructureShortcut, isExecuteSqlInNewResultTabShortcut, @@ -264,3 +265,19 @@ describe("tabSwitcherDirectionFromShortcut", () => { expect(tabSwitcherDirectionFromShortcut({ key: "Tab", ctrlKey: true }, { tabSwitcher: "Shift+Ctrl+Tab" })).toBeNull(); }); }); + +describe("isBrowserTaskManagerShortcut", () => { + it("matches Shift+Escape combinations and rejects regular Escape or extra modifiers", () => { + expect(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true })).toBe(true); + expect(isBrowserTaskManagerShortcut({ key: "Esc", shiftKey: true })).toBe(true); + expect(isBrowserTaskManagerShortcut({ code: "Escape", shiftKey: true, key: "Unidentified" })).toBe(true); + + expect(isBrowserTaskManagerShortcut({ key: "Escape" })).toBe(false); + expect(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: false })).toBe(false); + expect(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, ctrlKey: true })).toBe(false); + expect(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, metaKey: true })).toBe(false); + expect(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, altKey: true })).toBe(false); + expect(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, isComposing: true })).toBe(false); + expect(isBrowserTaskManagerShortcut({ key: "x", shiftKey: true })).toBe(false); + }); +}); diff --git a/apps/desktop/src/lib/editor/keyboardShortcuts.ts b/apps/desktop/src/lib/editor/keyboardShortcuts.ts index dd4653b916..34de62f538 100644 --- a/apps/desktop/src/lib/editor/keyboardShortcuts.ts +++ b/apps/desktop/src/lib/editor/keyboardShortcuts.ts @@ -383,3 +383,9 @@ export function isBrowserReloadShortcut(event: ShortcutLikeEvent): boolean { if (key === "F5") return true; return key === "r" && (!!event.metaKey || !!event.ctrlKey); } + +export function isBrowserTaskManagerShortcut(event: ShortcutLikeEvent): boolean { + if (event.isComposing || event.altKey || event.ctrlKey || event.metaKey) return false; + if (!event.shiftKey) return false; + return event.key === "Escape" || event.key === "Esc" || event.code === "Escape"; +} diff --git a/packages/app-tests/keyboardShortcuts.test.ts b/packages/app-tests/keyboardShortcuts.test.ts index 19147269ed..1c0645ee1d 100644 --- a/packages/app-tests/keyboardShortcuts.test.ts +++ b/packages/app-tests/keyboardShortcuts.test.ts @@ -4,6 +4,7 @@ import { eventToShortcut, handleTabHistoryNavigationShortcut, isBrowserReloadShortcut, + isBrowserTaskManagerShortcut, isCancelSearchShortcut, isCloseOtherTabsShortcut, isCloseTabShortcut, @@ -368,6 +369,19 @@ test("detects browser reload shortcuts for desktop suppression", () => { assert.equal(isBrowserReloadShortcut({ key: "r", ctrlKey: true, isComposing: true }), false); }); +test("detects browser task manager shortcut (Shift+Escape) for suppression", () => { + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true }), true); + assert.equal(isBrowserTaskManagerShortcut({ key: "Esc", shiftKey: true }), true); + assert.equal(isBrowserTaskManagerShortcut({ code: "Escape", shiftKey: true, key: "Unidentified" }), true); + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape" }), false); + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: false }), false); + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, ctrlKey: true }), false); + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, metaKey: true }), false); + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, altKey: true }), false); + assert.equal(isBrowserTaskManagerShortcut({ key: "Escape", shiftKey: true, isComposing: true }), false); + assert.equal(isBrowserTaskManagerShortcut({ key: "Tab", shiftKey: true }), false); +}); + test("matches Mod-R without shift or alt for scoped refresh and replace", () => { assert.equal(isModRShortcut({ key: "r", ctrlKey: true }), true); assert.equal(isModRShortcut({ key: "R", metaKey: true }), true);