interaction-system 1.0.0 → 1.0.1

package/dist/common/TypedEmitter.d.ts

@@ -0,0 +1,20 @@
+export type EventMap = Record<string, any>;
+export type EventKey<T extends EventMap> = string & keyof T;
+export type EventReceiver<T> = (params: T) => void;
+interface Emitter<T extends EventMap> {
+    on<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    off<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    emit<K extends EventKey<T>>(eventName: K, params: T[K]): void;
+}
+export declare class TypedEmitter<T extends EventMap> implements Emitter<T> {
+    private emitter;
+    addEventListener<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    removeEventListener<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    dispatchEvent(event: Event): boolean;
+    on<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    once<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    off<K extends EventKey<T>>(eventName: K, fn: EventReceiver<T[K]>): void;
+    emit<K extends EventKey<T>>(eventName: K, params: T[K]): boolean;
+}
+export {};
+//# sourceMappingURL=TypedEmitter.d.ts.map

package/dist/common/TypedEmitter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TypedEmitter.d.ts","sourceRoot":"","sources":["../../src/common/TypedEmitter.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAC3C,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,QAAQ,IAAI,MAAM,GAAG,MAAM,CAAC,CAAC;AAC5D,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,KAAK,IAAI,CAAC;AAEnD,UAAU,OAAO,CAAC,CAAC,SAAS,QAAQ;IAChC,EAAE,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACvE,GAAG,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IACxE,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;CACjE;AAED,qBAAa,YAAY,CAAC,CAAC,SAAS,QAAQ,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;IAC/D,OAAO,CAAC,OAAO,CAAsB;IACrC,gBAAgB,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIpF,mBAAmB,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIvF,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAIpC,EAAE,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAItE,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIxE,GAAG,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI;IAIvE,IAAI,CAAC,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO;CAGnE"}

package/dist/index.cjs.js

@@ -56,6 +56,7 @@ const _TouchControlMessage = class _TouchControlMessage extends ControlMessage {
   toBuffer() {
     const buffer$1 = buffer.Buffer.alloc(_TouchControlMessage.PAYLOAD_LENGTH + 1);
     let offset = 0;
+    offset = buffer$1.writeUInt8(0, offset);
     offset = buffer$1.writeUInt8(this.type, offset);
     offset = buffer$1.writeUInt8(this.action, offset);
     offset = buffer$1.writeUInt32BE(0, offset);
@@ -65,6 +66,7 @@ const _TouchControlMessage = class _TouchControlMessage extends ControlMessage {
     offset = buffer$1.writeUInt16BE(this.position.screenSize.width, offset);
     offset = buffer$1.writeUInt16BE(this.position.screenSize.height, offset);
     offset = buffer$1.writeUInt16BE(this.pressure * _TouchControlMessage.MAX_PRESSURE_VALUE, offset);
+    offset = buffer$1.writeUInt32BE(0, offset);
     buffer$1.writeUInt32BE(this.buttons, offset);
     return buffer$1;
   }
@@ -82,7 +84,7 @@ const _TouchControlMessage = class _TouchControlMessage extends ControlMessage {
     };
   }
 };
-_TouchControlMessage.PAYLOAD_LENGTH = 28;
+_TouchControlMessage.PAYLOAD_LENGTH = 28 + 4;
 _TouchControlMessage.MAX_PRESSURE_VALUE = 65535;
 let TouchControlMessage = _TouchControlMessage;
 class Size {
@@ -686,14 +688,6 @@ const _InteractionHandler = class _InteractionHandler {
         }
       }
     });
-    if (this.multiTouchActive) {
-      if (this.multiTouchCenter) {
-        this.drawCenter(this.multiTouchCenter);
-      }
-      points.forEach((point) => {
-        this.drawPointer(point);
-      });
-    }
     const hasActionUp = messages.find((message) => {
       return message.action === MotionEvent.ACTION_UP;
     });
@@ -749,6 +743,7 @@ _InteractionHandler.onKeyEvent = (event) => {
 };
 let InteractionHandler = _InteractionHandler;
 const _ScrollControlMessage = class _ScrollControlMessage extends ControlMessage {
+  //  1字节代表群控还是单控，后面4字节为底层需要填充
   constructor(position, hScroll, vScroll) {
     super(ControlMessage.TYPE_SCROLL);
     this.position = position;
@@ -761,13 +756,15 @@ const _ScrollControlMessage = class _ScrollControlMessage extends ControlMessage
   toBuffer() {
     const buffer$1 = buffer.Buffer.alloc(_ScrollControlMessage.PAYLOAD_LENGTH + 1);
     let offset = 0;
+    offset = buffer$1.writeUInt8(0, offset);
     offset = buffer$1.writeUInt8(this.type, offset);
     offset = buffer$1.writeUInt32BE(this.position.point.x, offset);
     offset = buffer$1.writeUInt32BE(this.position.point.y, offset);
     offset = buffer$1.writeUInt16BE(this.position.screenSize.width, offset);
     offset = buffer$1.writeUInt16BE(this.position.screenSize.height, offset);
-    offset = buffer$1.writeInt32BE(this.hScroll, offset);
-    buffer$1.writeInt32BE(this.vScroll, offset);
+    offset = buffer$1.writeInt16BE(this.hScroll, offset);
+    offset = buffer$1.writeInt16BE(this.vScroll, offset);
+    buffer$1.writeInt32BE(0, offset);
     return buffer$1;
   }
   toString() {
@@ -782,7 +779,7 @@ const _ScrollControlMessage = class _ScrollControlMessage extends ControlMessage
     };
   }
 };
-_ScrollControlMessage.PAYLOAD_LENGTH = 20;
+_ScrollControlMessage.PAYLOAD_LENGTH = 21;
 let ScrollControlMessage = _ScrollControlMessage;
 const TAG$1 = "[FeaturedTouchHandler]";
 const _FeaturedInteractionHandler = class _FeaturedInteractionHandler extends InteractionHandler {
@@ -810,8 +807,8 @@ const _FeaturedInteractionHandler = class _FeaturedInteractionHandler extends In
     const messages = [];
     const touchOnClient = InteractionHandler.buildTouchOnClient(event, screenInfo);
     if (touchOnClient) {
-      const hScroll = event.deltaX > 0 ? -1 : event.deltaX < -0 ? 1 : 0;
-      const vScroll = event.deltaY > 0 ? -1 : event.deltaY < -0 ? 1 : 0;
+      const hScroll = event.deltaX > 0 ? -1e3 : event.deltaX < -0 ? 1e3 : 0;
+      const vScroll = event.deltaY > 0 ? -1e3 : event.deltaY < -0 ? 1e3 : 0;
       const time = Date.now();
       if (!this.lastScrollEvent || time - this.lastScrollEvent.time > _FeaturedInteractionHandler.SCROLL_EVENT_THROTTLING_TIME || this.lastScrollEvent.vScroll !== vScroll || this.lastScrollEvent.hScroll !== hScroll) {
         this.lastScrollEvent = { time, hScroll, vScroll };
@@ -978,6 +975,7 @@ const _KeyCodeControlMessage = class _KeyCodeControlMessage extends ControlMessa
   toBuffer() {
     const buffer$1 = buffer.Buffer.alloc(_KeyCodeControlMessage.PAYLOAD_LENGTH + 1);
     let offset = 0;
+    offset = buffer$1.writeInt8(0, offset);
     offset = buffer$1.writeInt8(this.type, offset);
     offset = buffer$1.writeInt8(this.action, offset);
     offset = buffer$1.writeInt32BE(this.keycode, offset);
@@ -998,7 +996,7 @@ const _KeyCodeControlMessage = class _KeyCodeControlMessage extends ControlMessa
     };
   }
 };
-_KeyCodeControlMessage.PAYLOAD_LENGTH = 13;
+_KeyCodeControlMessage.PAYLOAD_LENGTH = 13 + 1;
 let KeyCodeControlMessage = _KeyCodeControlMessage;
 const _TextControlMessage = class _TextControlMessage extends ControlMessage {
   constructor(text) {
@@ -1843,6 +1841,10 @@ const _KeyInputHandler = class _KeyInputHandler {
 _KeyInputHandler.repeatCounter = /* @__PURE__ */ new Map();
 _KeyInputHandler.listeners = /* @__PURE__ */ new Set();
 _KeyInputHandler.handler = (event) => {
+  const target = event.target;
+  if (target instanceof HTMLElement && (target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.tagName === "SELECT" || target.isContentEditable)) {
+    return;
+  }
   const keyboardEvent = event;
   const keyCode = KeyToCodeMap.get(keyboardEvent.code);
   if (!keyCode) {