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

fix(hotkeys): shortcuts with number keys not working

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

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

@ -40,7 +40,7 @@ function bindElShortcut($el: JQuery<ElementType | Element>, keyboardShortcut: st
if (evt.type !== 'keydown' || !(evt instanceof KeyboardEvent)) { if (evt.type !== 'keydown' || !(evt instanceof KeyboardEvent)) {
return; return;
} }
const e = evt as KeyboardEvent; const e = evt as KeyboardEvent;
if (matchesShortcut(e, keyboardShortcut)) { if (matchesShortcut(e, keyboardShortcut)) {
e.preventDefault(); e.preventDefault();
@ -83,7 +83,7 @@ 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 // Ensure we have a proper KeyboardEvent with key property
if (!e || typeof e.key !== 'string') { if (!e || typeof e.key !== 'string') {
console.warn('matchesShortcut called with invalid event:', e); console.warn('matchesShortcut called with invalid event:', e);
@ -155,7 +155,18 @@ function keyMatches(e: KeyboardEvent, key: string): boolean {
return mappedKeys.includes(e.key) || mappedKeys.includes(e.code); return mappedKeys.includes(e.key) || mappedKeys.includes(e.code);
} }
// For regular keys, check both key and code // For number keys, use the physical key code regardless of modifiers
// This works across all keyboard layouts
if (key >= '0' && key <= '9') {
return e.code === `Digit${key}`;
}
// For letter keys, use the physical key code for consistency
if (key.length === 1 && key >= 'a' && key <= 'z') {
return e.code === `Key${key.toUpperCase()}`;
}
// For regular keys, check both key and code as fallback
return e.key.toLowerCase() === key.toLowerCase() || return e.key.toLowerCase() === key.toLowerCase() ||
e.code.toLowerCase() === key.toLowerCase(); e.code.toLowerCase() === key.toLowerCase();
} }
@ -169,12 +180,12 @@ function normalizeShortcut(shortcut: string): string {
} }
const normalized = shortcut.toLowerCase().trim().replace(/\s+/g, ''); const normalized = shortcut.toLowerCase().trim().replace(/\s+/g, '');
// Warn about potentially problematic shortcuts // Warn about potentially problematic shortcuts
if (normalized.endsWith('+') || normalized.startsWith('+') || normalized.includes('++')) { if (normalized.endsWith('+') || normalized.startsWith('+') || normalized.includes('++')) {
console.warn('Potentially malformed shortcut:', shortcut, '-> normalized to:', normalized); console.warn('Potentially malformed shortcut:', shortcut, '-> normalized to:', normalized);
} }
return normalized; return normalized;
} }