From 8b395a11ac426eab1d5abc35852aebd55ec93332 Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Sat, 2 Dec 2023 18:54:11 +0000 Subject: [PATCH 1/3] Prevent hotkeys used when our dialog is open --- src/cmd-dialog.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cmd-dialog.ts b/src/cmd-dialog.ts index 9d267c8..f9eabca 100644 --- a/src/cmd-dialog.ts +++ b/src/cmd-dialog.ts @@ -121,8 +121,13 @@ export class CmdDialog extends LitElement { // Prevent hotkeys used when our dialog is open hotkeys.filter = function (event) { - return !document.querySelector('cmd-dialog').dialog.open; - }; + return (!((event.target || event.srcElement).tagName === 'CMD-DIALOG' + && ( + event.key !== 'ArrowUp' + && event.key !== 'ArrowDown' + && event.key !== 'Tab' + ))); + } } override disconnectedCallback() { From 8309c927bba52fc0aff97623a47eff56e682c3fe Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Sat, 2 Dec 2023 18:57:30 +0000 Subject: [PATCH 2/3] Enforce CodeStyle typescript-eslint/prefer-nullish-coalescing --- src/cmd-dialog.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd-dialog.ts b/src/cmd-dialog.ts index f9eabca..27b0f72 100644 --- a/src/cmd-dialog.ts +++ b/src/cmd-dialog.ts @@ -121,7 +121,7 @@ export class CmdDialog extends LitElement { // Prevent hotkeys used when our dialog is open hotkeys.filter = function (event) { - return (!((event.target || event.srcElement).tagName === 'CMD-DIALOG' + return (!((event.target ?? event.srcElement).tagName === 'CMD-DIALOG' && ( event.key !== 'ArrowUp' && event.key !== 'ArrowDown' From 3ca42fb27067240d94b2ee3507b2267d7c0cef80 Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Sat, 2 Dec 2023 18:58:31 +0000 Subject: [PATCH 3/3] Missing semicolon. (@typescript-eslint/semi) --- src/cmd-dialog.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cmd-dialog.ts b/src/cmd-dialog.ts index 27b0f72..3f5ad64 100644 --- a/src/cmd-dialog.ts +++ b/src/cmd-dialog.ts @@ -127,7 +127,7 @@ export class CmdDialog extends LitElement { && event.key !== 'ArrowDown' && event.key !== 'Tab' ))); - } + }; } override disconnectedCallback() {