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

fix(defineShortcuts): support minus - key (#962)

Browse Source
This commit is contained in:
Sylvain Marroufin
2023-11-14 14:24:46 +01:00
committed by GitHub
parent a3046aa256
commit de38afd97b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,9 @@ interface Shortcut {
// keyCode?: number // keyCode?: number
} }
const chainedShortcutRegex = /^[^-]+.*-.*[^-]+$/
const combinedShortcutRegex = /^[^_]+.*_.*[^_]+$/
export const defineShortcuts = (config: ShortcutsConfig, options: ShortcutsOptions = {}) => { export const defineShortcuts = (config: ShortcutsConfig, options: ShortcutsOptions = {}) => {
const { macOS, usingInput } = useShortcuts() const { macOS, usingInput } = useShortcuts()
@@ -98,12 +101,15 @@ export const defineShortcuts = (config: ShortcutsConfig, options: ShortcutsOptio
// Parse key and modifiers // Parse key and modifiers
let shortcut: Partial<Shortcut> let shortcut: Partial<Shortcut>
if (key.includes('-') && key.includes('_')) { if (key.includes('-') && key !== '-' && !key.match(chainedShortcutRegex)?.length) {
console.trace('[Shortcut] Invalid key') console.trace(`[Shortcut] Invalid key: "${key}"`)
return null
} }
const chained = key.includes('-') if (key.includes('_') && key !== '_' && !key.match(combinedShortcutRegex)?.length) {
console.trace(`[Shortcut] Invalid key: "${key}"`)
}
const chained = key.includes('-') && key !== '-'
if (chained) { if (chained) {
shortcut = { shortcut = {
key: key.toLowerCase(), key: key.toLowerCase(),