gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-20 15:19:01 +02:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

fix(hotkeys): errors on mouse clicks

Browse Source
This commit is contained in:
Elian Doran 2025-07-30 14:29:59 +03:00
parent 5d00630452
commit 030178cad2
No known key found for this signature in database
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
apps/client/src/services/shortcuts.ts
View File

@ -36,6 +36,11 @@ function bindElShortcut($el: JQuery<ElementType | Element>, keyboardShortcut: st
const element = $el.length > 0 ? $el[0] as (HTMLElement | Document) : document; const element = $el.length > 0 ? $el[0] as (HTMLElement | Document) : document;
const listener = (evt: Event) => { const listener = (evt: Event) => {
// Only handle keyboard events
if (evt.type !== 'keydown' || !(evt instanceof KeyboardEvent)) {
return;
}
const e = evt as KeyboardEvent; const e = evt as KeyboardEvent;
if (matchesShortcut(e, keyboardShortcut)) { if (matchesShortcut(e, keyboardShortcut)) {
e.preventDefault(); e.preventDefault();
@ -78,11 +83,23 @@ function removeNamespaceBindings(namespace: string) {
function matchesShortcut(e: KeyboardEvent, shortcut: string): boolean { function matchesShortcut(e: KeyboardEvent, shortcut: string): boolean {
if (!shortcut) return false; if (!shortcut) return false;
// Ensure we have a proper KeyboardEvent with key property
if (!e || typeof e.key !== 'string') {
console.warn('matchesShortcut called with invalid event:', e);
return false;
}
const parts = shortcut.toLowerCase().split('+'); const parts = shortcut.toLowerCase().split('+');
const key = parts[parts.length - 1]; // Last part is the actual key const key = parts[parts.length - 1]; // Last part is the actual key
const modifiers = parts.slice(0, -1); // Everything before is modifiers const modifiers = parts.slice(0, -1); // Everything before is modifiers
// Defensive check - ensure we have a valid key
if (!key || key.trim() === '') {
console.warn('Invalid shortcut format:', shortcut);
return false;
}
// Check if the main key matches // Check if the main key matches
if (!keyMatches(e, key)) { if (!keyMatches(e, key)) {
return false; return false;
@ -101,6 +118,12 @@ function matchesShortcut(e: KeyboardEvent, shortcut: string): boolean {
} }
function keyMatches(e: KeyboardEvent, key: string): boolean { function keyMatches(e: KeyboardEvent, key: string): boolean {
// Defensive check for undefined/null key
if (!key) {
console.warn('keyMatches called with undefined/null key');
return false;
}
// Handle special key mappings and aliases // Handle special key mappings and aliases
const keyMap: { [key: string]: string[] } = { const keyMap: { [key: string]: string[] } = {
'return': ['Enter'], 'return': ['Enter'],
@ -145,7 +168,14 @@ function normalizeShortcut(shortcut: string): string {
return shortcut; return shortcut;
} }
return shortcut.toLowerCase().trim().replace(/\s+/g, ''); const normalized = shortcut.toLowerCase().trim().replace(/\s+/g, '');
// Warn about potentially problematic shortcuts
if (normalized.endsWith('+') || normalized.startsWith('+') || normalized.includes('++')) {
console.warn('Potentially malformed shortcut:', shortcut, '-> normalized to:', normalized);
}
return normalized;
} }
export default { export default {