From c40a7f12f4cc6f8d62d528a9bef6237f0c6b6268 Mon Sep 17 00:00:00 2001 From: vshnosngh Date: Wed, 18 Nov 2026 11:39:06 +0530 Subject: [PATCH] fix(khira): enforce [hidden] display none rule to prevent persistent shortcuts modal overlay --- web/khira/app.js | 85 ++++++++++++++++++++++++++++++-------------- web/khira/index.html | 4 +-- web/khira/styles.css | 12 +++++++ 3 files changed, 73 insertions(+), 28 deletions(-) diff --git a/web/khira/app.js b/web/khira/app.js index cfff4ce..fa037a1 100644 --- a/web/khira/app.js +++ b/web/khira/app.js @@ -2112,47 +2112,80 @@ $('#cmdInput')?.addEventListener('keydown',e=>{ $('#cmdPalette')?.addEventListener('click',e=>{if(e.target.id==='cmdPalette')closeCmdPalette()}); /* ── Keyboard Shortcuts ── */ -window.addEventListener('keydown',e=>{ - if((e.metaKey||e.ctrlKey)&&e.key.toLowerCase()==='k'){ +window.addEventListener('keydown', e => { + // If app workspace is not active (e.g. login screen), do not trigger shortcuts + if ($('#app')?.hidden) return; + + // Global Cmd+K / Ctrl+K + if ((e.metaKey || e.ctrlKey) && e.key.toLowerCase() === 'k') { e.preventDefault(); - if($('#cmdPalette').hidden)openCmdPalette(); + if ($('#cmdPalette').hidden) openCmdPalette(); else closeCmdPalette(); return; } - if(e.key==='Escape'){ - closeCmdPalette(); - $('#shortcutsModal').hidden=true; + + // Escape key handler: close any active overlay, sheet, dialog, or modal + if (e.key === 'Escape') { + if (!$('#shortcutsModal')?.hidden) { + $('#shortcutsModal').hidden = true; + return; + } + if (!$('#cmdPalette')?.hidden) { + closeCmdPalette(); + return; + } + if ($('#dlg')?.open) { + $('#dlg').close(); + return; + } + if ($('#sheet')?.open) { + $('#sheet').close(); + return; + } return; } - const tag=document.activeElement?.tagName; - if(tag==='INPUT'||tag==='TEXTAREA'||tag==='SELECT')return; - if(e.key==='?'){ - $('#shortcutsModal').hidden=false; - }else if(e.key==='n'||e.key==='N'||e.key==='c'||e.key==='C'){ + + // Do not intercept keystrokes when typing in inputs or textareas + const tag = document.activeElement?.tagName; + if (tag === 'INPUT' || tag === 'TEXTAREA' || tag === 'SELECT' || document.activeElement?.isContentEditable) return; + + // Do not fire navigation/creation shortcuts if any modal, sheet, or overlay is active + if (!$('#shortcutsModal')?.hidden || !$('#cmdPalette')?.hidden || $('#dlg')?.open || $('#sheet')?.open) return; + + if (e.key === '?' || (e.key === '/' && e.shiftKey)) { + e.preventDefault(); + $('#shortcutsModal').hidden = !$('#shortcutsModal').hidden; + } else if (e.key === 'n' || e.key === 'N' || e.key === 'c' || e.key === 'C') { + e.preventDefault(); newTicket(); - }else if(e.key==='t'||e.key==='T'){ + } else if (e.key === 't' || e.key === 'T') { nav('tickets'); - }else if(e.key==='e'||e.key==='E'){ + } else if (e.key === 'e' || e.key === 'E') { nav('errors'); - }else if(e.key==='a'||e.key==='A'){ + } else if (e.key === 'a' || e.key === 'A') { nav('analytics'); - }else if(e.key==='b'||e.key==='B'){ - S.view='board';nav('tickets'); - }else if(e.key==='l'||e.key==='L'){ - S.view='list';nav('tickets'); - }else if(e.key==='/'){ - e.preventDefault();$('#q')?.focus(); + } else if (e.key === 'b' || e.key === 'B') { + S.view = 'board'; + nav('tickets'); + } else if (e.key === 'l' || e.key === 'L') { + S.view = 'list'; + nav('tickets'); + } else if (e.key === '/') { + e.preventDefault(); + $('#q')?.focus(); } }); -$('#btnShortcutsHelp')?.addEventListener('click',()=>{ - $('#shortcutsModal').hidden=false; +$('#btnShortcutsHelp')?.addEventListener('click', () => { + $('#shortcutsModal').hidden = false; }); -$('#btnCloseShortcuts')?.addEventListener('click',()=>{ - $('#shortcutsModal').hidden=true; +$('#btnCloseShortcuts')?.addEventListener('click', () => { + $('#shortcutsModal').hidden = true; }); -$('#shortcutsModal')?.addEventListener('click',e=>{ - if(e.target.id==='shortcutsModal')$('#shortcutsModal').hidden=true; +$('#shortcutsModal')?.addEventListener('click', e => { + if (e.target.id === 'shortcutsModal' || e.target.closest('#btnCloseShortcuts')) { + $('#shortcutsModal').hidden = true; + } }); /* ── Export CSV Triggers ── */ diff --git a/web/khira/index.html b/web/khira/index.html index 51c4bcb..9d04ee2 100644 --- a/web/khira/index.html +++ b/web/khira/index.html @@ -9,7 +9,7 @@ - + @@ -447,6 +447,6 @@
- + diff --git a/web/khira/styles.css b/web/khira/styles.css index 5ca681b..a029c8e 100644 --- a/web/khira/styles.css +++ b/web/khira/styles.css @@ -9,6 +9,14 @@ padding: 0; } +[hidden] { + display: none !important; +} + +dialog:not([open]) { + display: none !important; +} + :root { color-scheme: dark; @@ -1742,6 +1750,10 @@ button { padding: 20px; } +.cmd-palette-overlay[hidden] { + display: none !important; +} + .cmd-palette-box { width: min(600px, 95vw); background: var(--bg-surface);