diff --git a/.oxlintrc.json b/.oxlintrc.json index 1a068966ea6..5c73f89fa19 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -134,7 +134,8 @@ "allowInterfaces": "always" } ], - "vue/no-import-compiler-macros": "error" + "vue/no-import-compiler-macros": "error", + "no-debugger": "error" }, "overrides": [ { diff --git a/playwright.config.ts b/playwright.config.ts index f7675fc06a2..de7b4a1259d 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -16,7 +16,7 @@ Object.assign(globalThis, { const maybeLocalOptions: PlaywrightTestConfig = process.env.PLAYWRIGHT_LOCAL ? { - timeout: 30_000, + timeout: 31_000, retries: 0, workers: 1, use: { diff --git a/src/platform/keybindings/keybindingService.ts b/src/platform/keybindings/keybindingService.ts index 9028b834692..275e1cf8028 100644 --- a/src/platform/keybindings/keybindingService.ts +++ b/src/platform/keybindings/keybindingService.ts @@ -23,7 +23,10 @@ export function useKeybindingService() { const target = event.composedPath()[0] as HTMLElement // Let the active menu own Escape without also triggering the global shortcut. - if (event.key === 'Escape' && target.closest('[role="menu"]')) { + if ( + event.key === 'Escape' && + target.closest('[role="menu"], [role="menubar"]') + ) { return }