@netless/window-manager 1.0.0-canary.71 → 1.0.0-canary.73

package/package.json

@@ -1,22 +1,11 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.71",
+  "version": "1.0.0-canary.73",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
-  "types": "dist/src/index.d.ts",
+  "types": "dist/index.d.ts",
   "repository": "netless-io/window-manager",
-  "scripts": {
-    "prettier": "prettier --write .",
-    "dev": "vite build --watch",
-    "build": "vite build",
-    "type-gen": "tsc --emitDeclarationOnly",
-    "predev": "yarn type-gen",
-    "build:lib:types": "tsc --emitDeclarationOnly",
-    "lint": "eslint --ext .ts,.tsx,.svelte . && prettier --check .",
-    "test": "vitest",
-    "e2e": "playwright test"
-  },
   "keywords": [],
   "author": "",
   "license": "ISC",
@@ -24,49 +13,61 @@
     "white-web-sdk": "^2.16.0"
   },
   "dependencies": {
-    "@juggle/resize-observer": "^3.3.1",
+    "@juggle/resize-observer": "^3.4.0",
     "@netless/synced-store": "^2.0.7",
     "@netless/telebox-insider": "1.0.0-alpha.37",
     "emittery": "^0.11.0",
+    "jspdf": "^2.5.1",
     "lodash": "^4.17.21",
-    "p-retry": "^4.6.2",
+    "p-retry": "^5.1.2",
     "side-effect-manager": "^1.2.1",
-    "uuid": "^7.0.3",
+    "uuid": "^9.0.0",
     "value-enhancer": "^1.3.2"
   },
   "devDependencies": {
-    "@netless/app-docs-viewer": "^1.0.0-canary.3",
+    "@netless/app-docs-viewer": "1.0.0-canary.5",
     "@netless/app-plyr": "^0.2.4",
-    "@playwright/test": "^1.23.2",
-    "@rollup/plugin-commonjs": "^20.0.0",
-    "@rollup/plugin-node-resolve": "^13.0.4",
-    "@rollup/plugin-url": "^6.1.0",
-    "@sveltejs/vite-plugin-svelte": "^1.0.0-next.49",
-    "@tsconfig/svelte": "^2.0.1",
+    "@playwright/test": "^1.28.1",
+    "@rollup/plugin-commonjs": "^23.0.4",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-url": "^8.0.1",
+    "@sveltejs/vite-plugin-svelte": "^2.0.2",
+    "@tsconfig/svelte": "^3.0.0",
     "@types/debug": "^4.1.7",
     "@types/lodash": "^4.14.182",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^18.0.3",
-    "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^4.30.0",
-    "@typescript-eslint/parser": "^4.30.0",
-    "@vitest/ui": "^0.14.2",
+    "@types/uuid": "^9.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "@vitest/ui": "^0.25.7",
     "cypress": "^8.7.0",
     "dotenv": "^10.0.0",
-    "eslint": "^7.32.0",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-svelte3": "^3.2.0",
+    "eslint-plugin-svelte3": "^4.0.0",
     "jsdom": "^19.0.0",
     "less": "^4.1.3",
-    "prettier": "^2.3.2",
-    "prettier-plugin-svelte": "^2.4.0",
+    "prettier": "^2.8.1",
+    "prettier-plugin-svelte": "^2.9.0",
     "rollup-plugin-analyzer": "^4.0.0",
-    "rollup-plugin-styles": "^3.14.1",
-    "svelte": "^3.42.4",
-    "typescript": "^4.5.5",
-    "vite": "^3.1.3",
-    "vite-plugin-dts": "^1.5.0",
-    "vitest": "^0.23.4",
-    "white-web-sdk": "^2.16.35"
+    "rollup-plugin-styles": "^4.0.0",
+    "svelte": "^3.54.0",
+    "typescript": "^4.9.4",
+    "vite": "^4.0.3",
+    "vite-plugin-dts": "^1.7.1",
+    "vitest": "^0.25.7",
+    "white-web-sdk": "^2.16.40"
+  },
+  "scripts": {
+    "prettier": "prettier --write .",
+    "dev": "vite build --watch",
+    "build": "vite build",
+    "type-gen": "tsc --emitDeclarationOnly",
+    "predev": "yarn type-gen",
+    "build:lib:types": "tsc --emitDeclarationOnly",
+    "lint": "eslint --ext .ts,.tsx,.svelte . && prettier --check .",
+    "test": "vitest",
+    "e2e": "playwright test"
   }
-}
+}

package/src/BoxManager.ts

@@ -23,6 +23,7 @@ import type { View } from "white-web-sdk";
 import type { CallbacksType } from "./callback";
 import type { EmitterType } from "./InternalEmitter";
 import type { AppState } from "./App/type";
+import { ReadonlyVal } from "value-enhancer";
 
 export { TELE_BOX_STATE };
 
@@ -218,7 +219,7 @@ export class BoxManager {
         return this.teleBoxManager.stageRect;
     }
 
-    public get stageRect$() {
+    public get stageRect$(): ReadonlyVal<TeleBoxRect, any> {
         return this.teleBoxManager._stageRect$;
     }
 

package/src/Cursor/index.ts

@@ -11,6 +11,7 @@ import type { Point, RoomMember, View } from "white-web-sdk";
 import type { AppManager } from "../AppManager";
 import { ApplianceMap } from "./icons";
 import { findMemberByUid } from "../Helper";
+import { Val } from "value-enhancer";
 
 export type EventType = {
     type: PositionType;
@@ -33,7 +34,7 @@ export class CursorManager {
     private store = this.manager.store;
     public applianceIcons: ApplianceIcons = ApplianceMap;
 
-    public get playground$() {
+    public get playground$(): Val<HTMLElement | undefined, any> {
         return this.manager.windowManger.playground$;
     }
 
@@ -116,9 +117,13 @@ export class CursorManager {
         this.updateCursor(this.getType(event), event.clientX, event.clientY);
     }, 48);
 
+    private shouldBroadcast() {
+        return this.manager.canOperate && this.manager.room?.disableDeviceInputs === false;
+    }
+
     private updateCursor(event: EventType, clientX: number, clientY: number) {
         const self = findMemberByUid(this.manager.room, this.manager.uid);
-        if (this.wrapperRect && this.manager.canOperate && this.canMoveCursor(self)) {
+        if (this.wrapperRect && this.shouldBroadcast() && this.canMoveCursor(self)) {
             const view = event.type === "main" ? this.manager.mainView : this.focusView;
             const point = this.getPoint(view, clientX, clientY);
             if (point) {

package/src/Utils/AppCreateQueue.ts

@@ -10,7 +10,7 @@ export class AppCreateQueue {
     public isEmit = false;
 
     private initInterval() {
-        return setInterval(() => {
+        return window.setInterval(() => {
             this.invoke();
         }, 50);
     }

package/{vite.config.js → vite.config.mjs}

@@ -1,9 +1,9 @@
 import path from "path";
-import dts from 'vite-plugin-dts'
-import { defineConfig } from 'vitest/config'
-import { svelte } from "@sveltejs/vite-plugin-svelte";
-import { dependencies, peerDependencies, version, devDependencies } from "./package.json"
-import { omit } from "lodash";
+import dts from "vite-plugin-dts";
+import { svelte, vitePreprocess } from "@sveltejs/vite-plugin-svelte";
+import { defineConfig } from "vitest/config";
+import { dependencies, peerDependencies, version, devDependencies } from "./package.json";
+import lodash from "lodash";
 
 export default defineConfig(() => {
     // const isProd = mode === "production";
@@ -12,9 +12,7 @@ export default defineConfig(() => {
         test: {
             environment: "jsdom",
             deps: {
-                inline: [
-                  "@juggle/resize-observer"
-                ]
+                inline: ["@juggle/resize-observer"],
             },
             setupFiles: "./test/setup.ts",
             include: ["test/**/*.test.ts"],
@@ -22,15 +20,15 @@ export default defineConfig(() => {
         define: {
             __APP_VERSION__: JSON.stringify(version),
             __APP_DEPENDENCIES__: JSON.stringify({
-                dependencies, peerDependencies, devDependencies
+                dependencies,
+                peerDependencies,
+                devDependencies,
             }),
         },
         plugins: [
             svelte({
                 emitCss: false,
-                experimental: {
-                    useVitePreprocess: true,
-                },
+                preprocess: vitePreprocess(),
             }),
             dts(),
         ],
@@ -41,16 +39,15 @@ export default defineConfig(() => {
                 formats: ["es", "umd", "cjs"],
                 name: "WindowManager",
                 fileName: "index",
-
             },
             outDir: "dist",
             rollupOptions: {
                 external: Object.keys({
-                    ...omit(dependencies, ["@netless/telebox-insider"]),
+                    ...lodash.omit(dependencies, ["@netless/telebox-insider"]),
                     ...peerDependencies,
                 }),
             },
-            minify: false
+            minify: false,
         },
     };
-})
+});