Fix non-standard keyboard layour support for hot keys

evilmartians · Jun 1, 2024 · 31f58ec · 31f58ec
1 parent 35e564c
commit 31f58ec
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -4,6 +4,11 @@ import loguxTsConfig from '@logux/eslint-config/ts'
 export default [
   { ignores: ['dist/'] },
   ...loguxTsConfig,
+  {
+    rules: {
+      'no-control-regex': 'off'
+    }
+  },
   {
     files: ['**/worker.ts'],
     rules: {

diff --git a/view/field/index.ts b/view/field/index.ts
@@ -62,10 +62,25 @@ function isSpecial(e: KeyboardEvent): boolean {
   return e.ctrlKey || e.shiftKey || e.altKey || e.metaKey
 }
 
+function pressHotkey(code: string): boolean {
+  let input = hotkeys[code]
+  if (input) {
+    input.focus()
+    return true
+  } else {
+    return false
+  }
+}
+
+const NON_ENGLISH_LAYOUT = /^[^\x00-\x7F]$/
+
 function onKeyDown(e: KeyboardEvent): void {
-  if (hotkeys[e.code] && !isSpecial(e)) {
-    e.preventDefault()
-    hotkeys[e.code]?.focus()
+  if (isSpecial(e)) return
+  if (!pressHotkey(e.key.toLowerCase())) {
+    if (NON_ENGLISH_LAYOUT.test(e.key) && /^Key.$/.test(e.code)) {
+      let enKey = e.code.replace(/^Key/, '').toLowerCase()
+      pressHotkey(enKey)
+    }
   }
 }
 

diff --git a/view/field/mixin.pug b/view/field/mixin.pug
@@ -1,6 +1,6 @@
 mixin field(label, hotkey, opts = {})
-  .field( class=opts.options ? 'is-options' : '' )
-    kbd.field_hotkey= hotkey
+  .field( class=opts.options ? 'is-options' : '' aria-keyshortcuts=hotkey )
+    kbd.field_hotkey( aria-hidden )= hotkey
     input.field_input( aria-label=label )&attributes({ type: 'text', ...opts })
     if (opts.role === 'spinbutton')
       button.field_control.is-increase( tabindex="-1" aria-hidden="true" )