zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 11:16:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(hotkeys): interpret shortcut in the user's locale (#6681)

Browse source
This commit is contained in:
Elian Doran 2025-08-18 23:10:59 +03:00 • committed by GitHub
commit 648aa7e3b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
apps/client/src/services/shortcuts.ts
View file

@ -14,6 +14,32 @@ interface ShortcutBinding {
// Store all active shortcut bindings for management // Store all active shortcut bindings for management
const activeBindings: Map<string, ShortcutBinding[]> = new Map(); const activeBindings: Map<string, ShortcutBinding[]> = new Map();
// Handle special key mappings and aliases
const keyMap: { [key: string]: string[] } = {
'return': ['Enter'],
'enter': ['Enter'], // alias for return
'del': ['Delete'],
'delete': ['Delete'], // alias for del
'esc': ['Escape'],
'escape': ['Escape'], // alias for esc
'space': [' ', 'Space'],
'tab': ['Tab'],
'backspace': ['Backspace'],
'home': ['Home'],
'end': ['End'],
'pageup': ['PageUp'],
'pagedown': ['PageDown'],
'up': ['ArrowUp'],
'down': ['ArrowDown'],
'left': ['ArrowLeft'],
'right': ['ArrowRight']
};
// Function keys
for (let i = 1; i <= 19; i++) {
keyMap[`f${i}`] = [`F${i}`];
}
function removeGlobalShortcut(namespace: string) { function removeGlobalShortcut(namespace: string) {
bindGlobalShortcut("", null, namespace); bindGlobalShortcut("", null, namespace);
} }
@ -124,32 +150,6 @@ export function keyMatches(e: KeyboardEvent, key: string): boolean {
return false; return false;
} }
// Handle special key mappings and aliases
const keyMap: { [key: string]: string[] } = {
'return': ['Enter'],
'enter': ['Enter'], // alias for return
'del': ['Delete'],
'delete': ['Delete'], // alias for del
'esc': ['Escape'],
'escape': ['Escape'], // alias for esc
'space': [' ', 'Space'],
'tab': ['Tab'],
'backspace': ['Backspace'],
'home': ['Home'],
'end': ['End'],
'pageup': ['PageUp'],
'pagedown': ['PageDown'],
'up': ['ArrowUp'],
'down': ['ArrowDown'],
'left': ['ArrowLeft'],
'right': ['ArrowRight']
};
// Function keys
for (let i = 1; i <= 19; i++) {
keyMap[`f${i}`] = [`F${i}`];
}
const mappedKeys = keyMap[key.toLowerCase()]; const mappedKeys = keyMap[key.toLowerCase()];
if (mappedKeys) { if (mappedKeys) {
return mappedKeys.includes(e.key) || mappedKeys.includes(e.code); return mappedKeys.includes(e.key) || mappedKeys.includes(e.code);
@ -163,7 +163,7 @@ export function keyMatches(e: KeyboardEvent, key: string): boolean {
// For letter keys, use the physical key code for consistency // For letter keys, use the physical key code for consistency
if (key.length === 1 && key >= 'a' && key <= 'z') { if (key.length === 1 && key >= 'a' && key <= 'z') {
return e.code === `Key${key.toUpperCase()}`; return e.key.toLowerCase() === key.toLowerCase();
} }
// For regular keys, check both key and code as fallback // For regular keys, check both key and code as fallback