arthur/ui
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/ui.git synced 2026-01-25 01:10:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(defineShortcuts): allow extra keys to be combined with shift (#4456)

Browse Source
This commit is contained in:
Sylvain Marroufin
2025-07-03 15:51:50 +02:00
committed by GitHub
parent d7aefa53b2
commit 772631cde9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/composables/defineShortcuts.ts
View File

@@ -36,6 +36,8 @@ interface Shortcut {
const chainedShortcutRegex = /^[^-]+.*-.*[^-]+$/ const chainedShortcutRegex = /^[^-]+.*-.*[^-]+$/
const combinedShortcutRegex = /^[^_]+.*_.*[^_]+$/ const combinedShortcutRegex = /^[^_]+.*_.*[^_]+$/
// keyboard keys which can be combined with Shift modifier (in addition to alphabet keys)
const shiftableKeys = ['arrowleft', 'arrowright', 'arrowup', 'arrowright', 'tab', 'escape', 'enter', 'backspace']
export function extractShortcuts(items: any[] | any[][]) { export function extractShortcuts(items: any[] | any[][]) {
const shortcuts: Record<string, Handler> = {} const shortcuts: Record<string, Handler> = {}
@@ -76,7 +78,8 @@ export function defineShortcuts(config: MaybeRef<ShortcutsConfig>, options: Shor
return return
} }
const alphabeticalKey = /^[a-z]{1}$/i.test(e.key) const alphabetKey = /^[a-z]{1}$/i.test(e.key)
const shiftableKey = shiftableKeys.includes(e.key.toLowerCase())
let chainedKey let chainedKey
chainedInputs.value.push(e.key) chainedInputs.value.push(e.key)
@@ -109,9 +112,9 @@ export function defineShortcuts(config: MaybeRef<ShortcutsConfig>, options: Shor
if (e.ctrlKey !== shortcut.ctrlKey) { if (e.ctrlKey !== shortcut.ctrlKey) {
continue continue
} }
// shift modifier is only checked in combination with alphabetical keys // shift modifier is only checked in combination with alphabet keys and some extra keys
// (shift with non-alphabetical keys would change the key) // (shift with special characters would change the key)
if (alphabeticalKey && e.shiftKey !== shortcut.shiftKey) { if ((alphabetKey || shiftableKey) && e.shiftKey !== shortcut.shiftKey) {
continue continue
} }
// alt modifier changes the combined key anyways // alt modifier changes the combined key anyways