@vived/app 2.10.0 → 2.11.0

package/lib/Entities/KeyboardInput.d.ts

@@ -1,14 +1,12 @@
-export declare type OnKeyDown = (key: string) => void;
-export declare type OnKeyUp = (key: string) => void;
+export interface KeyboardController {
+    onKeyDown?: (e: KeyboardEvent) => void;
+    onKeyUp?: (e: KeyboardEvent) => void;
+}
 export interface KeyboardInput {
     eventElement: HTMLElement | undefined;
     setEventElement: (eventElement: HTMLElement) => void;
-    removeEventElement: (eventElement: HTMLElement) => void;
     clearInputElement: () => void;
-    isKeyPressed: (key: string) => boolean;
-    addKeyDownObserver: (observer: OnKeyDown) => void;
-    removeKeyDownObserver: (observer: OnKeyDown) => void;
-    addKeyUpObserver: (observer: OnKeyUp) => void;
-    removeKeyUpObserver: (observer: OnKeyUp) => void;
+    registerController: (controller: KeyboardController) => void;
+    removeController: (controller: KeyboardController) => void;
 }
 export declare function makeKeyboardInput(): KeyboardInput;

package/lib/Entities/KeyboardInput.js

@@ -1,73 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeKeyboardInput = void 0;
-const _1 = require(".");
 function makeKeyboardInput() {
     return new KeyboardInputImp();
 }
 exports.makeKeyboardInput = makeKeyboardInput;
 class KeyboardInputImp {
     constructor() {
+        this.controllers = [];
         this._eventElement = undefined;
         this.setEventElement = (element) => {
-            if (this._eventElement) {
-                this._eventElement.onkeydown = null;
-                this._eventElement.onkeyup = null;
-            }
-            element.onkeydown = (e) => {
-                this.submitKeyDown(e.code);
-            };
-            element.onkeyup = (e) => {
-                this.submitKeyUp(e.code);
-            };
+            this.clearInputElement();
+            element.addEventListener("keydown", this.submitKeyDown, false);
+            element.addEventListener("keyup", this.submitKeyUp, false);
             this._eventElement = element;
         };
-        this.removeEventElement = (eventElement) => {
-            if (this._eventElement !== eventElement)
-                return;
-            this._eventElement.onkeydown = null;
-            this._eventElement.onkeyup = null;
-            this._eventElement = undefined;
-        };
         this.clearInputElement = () => {
             if (!this._eventElement)
                 return;
-            this._eventElement.onkeydown = null;
-            this._eventElement.onkeyup = null;
-            this._eventElement = undefined;
+            this._eventElement.removeEventListener("keydown", this.submitKeyDown);
+            this._eventElement.removeEventListener("keyup", this.submitKeyUp);
         };
-        this.downObservers = new _1.ObserverList();
-        this.upObservers = new _1.ObserverList();
         this.pressedKeys = [];
-        this.submitKeyDown = (key) => {
-            if (this.pressedKeys.includes(key))
-                return;
-            this.pressedKeys.push(key);
-            this.downObservers.notify(key);
-        };
-        this.submitKeyUp = (key) => {
-            if (!this.pressedKeys.includes(key))
-                return;
-            const index = this.pressedKeys.indexOf(key);
+        this.submitKeyDown = (e) => {
+            e.preventDefault();
+            this.controllers.forEach((c) => {
+                if (c.onKeyDown) {
+                    c.onKeyDown(e);
+                }
+            });
+        };
+        this.submitKeyUp = (e) => {
+            e.preventDefault();
+            this.controllers.forEach((c) => {
+                if (c.onKeyUp) {
+                    c.onKeyUp(e);
+                }
+            });
+        };
+        this.registerController = (controller) => {
+            this.controllers.push(controller);
+        };
+        this.removeController = (controller) => {
+            const index = this.controllers.indexOf(controller);
             if (index >= 0) {
-                this.pressedKeys.splice(index, 1);
+                this.controllers.splice(index, 1);
             }
-            this.upObservers.notify(key);
-        };
-        this.isKeyPressed = (key) => {
-            return this.pressedKeys.includes(key);
-        };
-        this.addKeyDownObserver = (observer) => {
-            this.downObservers.add(observer);
-        };
-        this.removeKeyDownObserver = (observer) => {
-            this.downObservers.remove(observer);
-        };
-        this.addKeyUpObserver = (observer) => {
-            this.upObservers.add(observer);
-        };
-        this.removeKeyUpObserver = (observer) => {
-            this.upObservers.remove(observer);
         };
     }
     get eventElement() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/app",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Public package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",