Past nodes fixed, codestyle

js/input/KeyboardShortcut.js

@@ -1,46 +1,41 @@
 import Context from "./Context"
-import Utility from "../Utility"
 
 export default class KeyboardShortcut extends Context {
 
     constructor(target, blueprint, options) {
+        options.wantsFocusCallback = true
         super(target, blueprint, options)
-        /** @type {String[]} */
-        this.keys = this.options?.keys ?? []
-        /** @type Numeric */
-        this.currentKey = 0
 
+        /** @type {String[]} */
+        this.key = this.options.key
+        this.ctrlKey = options.ctrlKey ?? false
+        this.shiftKey = options.shiftKey ?? false
+        this.altKey = options.altKey ?? false
+        this.metaKey = options.metaKey ?? false
 
         let self = this
         this.keyDownHandler = e => {
             e.preventDefault()
-            if (Utility.equals(e.keys[self.currentKey], e.key)) {
-                if (++self.currentKey == this.keys.length) {
-                    self.fire()
-                }
+            if (
+                e.code == self.key
+                && e.ctrlKey === self.ctrlKey
+                && e.shiftKey === self.shiftKey
+                && e.altKey === self.altKey
+                && e.metaKey === self.metaKey
+            ) {
+                self.fire()
             }
         }
-        this.keyUpHandler = e => {
-            e.preventDefault()
-            for (let i = 0; i < self.currentKey; ++i) {
-                if (Utility.equals(e.keys[self.currentKey], e.key)) {
-                    self.currentKey = i
-                    break
-                }
-            }
-        }
-        if (this.keys.length > 0) {
-            this.target.addEventListener("keydown", this.keyDownHandler)
-            this.target.addEventListener("keyup", this.keyUpHandler)
-        }
     }
 
-    unlistenDOMElement() {
-        this.target.removeEventListener('keydown', this.keyDownHandler)
-        this.target.removeEventListener('keyup', this.keyUpHandler)
+    blueprintFocused() {
+        document.addEventListener('keydown', this.keyDownHandler)
+    }
+
+    blueprintUnfocused() {
+        document.removeEventListener('keydown', this.keyDownHandler)
     }
 
     fire() {
     }
-
 }