@asdf-overlay/electron 0.9.0 → 0.9.1

package/lib/index.d.ts

@@ -1,6 +1,4 @@
 import type { Overlay } from '@asdf-overlay/core';
-export * from './input/index.js';
-export * from './surface.js';
 export type OverlayWindow = {
     overlay: Overlay;
     id: number;

package/lib/index.js

@@ -1,2 +1 @@
-export * from './input/index.js';
-export * from './surface.js';
+export {};

package/lib/input/conv.d.ts

@@ -1,3 +1,3 @@
 import { Cursor } from '@asdf-overlay/core';
-export declare function toCursor(cursor: string): Cursor | undefined;
-export declare const KEYS: Record<number, string | undefined>;
+export declare function mapCssCursor(cursor: string): Cursor | undefined;
+export declare function mapKeycode(code: number): string | undefined;

package/lib/input/conv.js

@@ -1,7 +1,7 @@
 import { Cursor } from '@asdf-overlay/core';
 // https://www.electronjs.org/docs/latest/api/web-contents
 // https://developer.mozilla.org/ko/docs/Web/CSS/cursor
-export function toCursor(cursor) {
+export function mapCssCursor(cursor) {
     switch (cursor) {
         case 'pointer': return Cursor.Default;
         case 'crosshair': return Cursor.Crosshair;
@@ -50,9 +50,12 @@ export function toCursor(cursor) {
         default: return Cursor.Default;
     }
 }
+export function mapKeycode(code) {
+    return KEYS[code];
+}
 // As per https://www.electronjs.org/docs/latest/api/accelerator
 // and https://learn.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
-export const KEYS = {
+const KEYS = {
     8: 'Backspace',
     9: 'Tab',
     13: 'Enter',
@@ -111,6 +114,21 @@ export const KEYS = {
     91: 'Super',
     92: 'Super',
     93: 'Meta',
+    96: 'num0',
+    97: 'num1',
+    98: 'num2',
+    99: 'num3',
+    100: 'num4',
+    101: 'num5',
+    102: 'num6',
+    103: 'num7',
+    104: 'num8',
+    105: 'num9',
+    106: 'nummult',
+    108: 'numsub',
+    109: 'numsub',
+    110: 'numdec',
+    111: 'numdiv',
     112: 'F1',
     113: 'F2',
     114: 'F3',

package/lib/{input/index.d.ts → input.d.ts}

@@ -1,5 +1,5 @@
 import type { WebContents } from 'electron';
-import type { OverlayWindow } from '../index.js';
+import type { OverlayWindow } from './index.js';
 import type { CursorInput, KeyboardInput } from '@asdf-overlay/core/input';
 export declare class ElectronOverlayInput {
     private readonly window;
@@ -7,7 +7,6 @@ export declare class ElectronOverlayInput {
     private readonly cursorInputHandler;
     private readonly keyboardInputHandler;
     private readonly cursorChangedHandler;
-    forwardInput: boolean;
     private constructor();
     static connect(window: OverlayWindow, contents: WebContents): ElectronOverlayInput;
     disconnect(): Promise<void>;
@@ -20,5 +19,4 @@ export declare class ElectronOverlayInput {
     private updateModifiers;
     sendKeyboardInput(input: KeyboardInput): void;
     private processIme;
-    private sendInput;
 }

package/lib/{input/index.js → input.js}

@@ -1,4 +1,4 @@
-import { KEYS, toCursor } from './conv.js';
+import { mapCssCursor, mapKeycode } from './input/conv.js';
 import { Cursor } from '@asdf-overlay/core';
 export class ElectronOverlayInput {
     window;
@@ -6,7 +6,6 @@ export class ElectronOverlayInput {
     cursorInputHandler;
     keyboardInputHandler;
     cursorChangedHandler;
-    forwardInput = false;
     constructor(window, contents) {
         this.window = window;
         this.contents = contents;
@@ -24,7 +23,7 @@ export class ElectronOverlayInput {
             this.sendKeyboardInput(input);
         });
         this.contents.on('cursor-changed', this.cursorChangedHandler = (_, type) => {
-            void this.window.overlay.setBlockingCursor(this.window.id, toCursor(type));
+            void this.window.overlay.setBlockingCursor(this.window.id, mapCssCursor(type));
         });
     }
     static connect(window, contents) {
@@ -69,7 +68,7 @@ export class ElectronOverlayInput {
         if (input.state === 'Pressed') {
             const clickCount = 1 + ~~input.doubleClick;
             this.clickCounts.push(clickCount);
-            this.sendInput({
+            this.contents.sendInputEvent({
                 type: 'mouseDown',
                 button,
                 clickCount,
@@ -84,7 +83,7 @@ export class ElectronOverlayInput {
         }
         else {
             const clickCount = this.clickCounts.pop() ?? 1;
-            this.sendInput({
+            this.contents.sendInputEvent({
                 type: 'mouseUp',
                 button,
                 clickCount,
@@ -107,7 +106,7 @@ export class ElectronOverlayInput {
         const movementY = input.windowY - this.lastWindowCursor.y;
         switch (input.kind) {
             case 'Enter': {
-                this.sendInput({
+                this.contents.sendInputEvent({
                     type: 'mouseEnter',
                     x: input.clientX,
                     y: input.clientY,
@@ -120,7 +119,7 @@ export class ElectronOverlayInput {
                 break;
             }
             case 'Leave': {
-                this.sendInput({
+                this.contents.sendInputEvent({
                     type: 'mouseLeave',
                     x: input.clientX,
                     y: input.clientY,
@@ -133,7 +132,7 @@ export class ElectronOverlayInput {
                 break;
             }
             case 'Move': {
-                this.sendInput({
+                this.contents.sendInputEvent({
                     type: 'mouseMove',
                     x: input.clientX,
                     y: input.clientY,
@@ -173,7 +172,7 @@ export class ElectronOverlayInput {
                         modifiers: this.modifiers,
                     };
                 }
-                this.sendInput(scroll);
+                this.contents.sendInputEvent(scroll);
                 break;
             }
             case 'Action': {
@@ -238,13 +237,13 @@ export class ElectronOverlayInput {
     sendKeyboardInput(input) {
         switch (input.kind) {
             case 'Key': {
-                const keyCode = KEYS[input.key.code];
+                const keyCode = mapKeycode(input.key.code);
                 if (!keyCode) {
                     return;
                 }
                 const pressed = input.state === 'Pressed';
                 this.updateModifiers(keyCode, pressed);
-                this.sendInput({
+                this.contents.sendInputEvent({
                     type: pressed ? 'keyDown' : 'keyUp',
                     keyCode,
                     modifiers: this.modifiers,
@@ -252,7 +251,7 @@ export class ElectronOverlayInput {
                 return;
             }
             case 'Char': {
-                this.sendInput({
+                this.contents.sendInputEvent({
                     type: 'char',
                     keyCode: input.ch,
                     modifiers: this.modifiers,
@@ -270,17 +269,11 @@ export class ElectronOverlayInput {
             return;
         }
         for (const ch of input.ime.text) {
-            this.sendInput({
+            this.contents.sendInputEvent({
                 type: 'char',
                 keyCode: ch,
                 modifiers: this.modifiers,
             });
         }
     }
-    sendInput(e) {
-        if (!this.forwardInput) {
-            return;
-        }
-        this.contents.sendInputEvent(e);
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asdf-overlay/electron",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Asdf overlay Electron integration",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -15,6 +15,16 @@
     "type": "git",
     "url": "https://github.com/storycraft/asdf-overlay"
   },
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "default": "./lib/index.js"
+    },
+    "./*": {
+      "types": "./lib/*.d.ts",
+      "default": "./lib/*.js"
+    }
+  },
   "files": [
     "lib/**/*"
   ],