Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@
"allowInterfaces": "always"
}
],
"vue/no-import-compiler-macros": "error"
"vue/no-import-compiler-macros": "error",
"no-debugger": "error"
},
"overrides": [
{
Expand Down
2 changes: 1 addition & 1 deletion playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion src/platform/keybindings/keybindingService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Loading