@netless/window-manager 1.0.0-canary.77 → 1.0.0-canary.78

package/dist/index.js

@@ -619,9 +619,14 @@ class AppListeners {
     this.moveCameraHandler = (payload) => {
       const size$ = this.manager.mainViewProxy.size$;
       if (size$.value) {
-        const size = this.manager.mainView.size;
-        const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
-        const nextCamera = { ...payload, scale: payload.scale * diff };
+        const nextCamera = { ...payload };
+        if (nextCamera.scale) {
+          const size = this.manager.mainView.size;
+          const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
+          nextCamera.scale *= diff;
+        } else {
+          delete nextCamera.scale;
+        }
         this.manager.mainView.moveCamera(nextCamera);
       }
     };
@@ -6096,6 +6101,9 @@ class BoxManager {
     const { emitter: emitter2, callbacks: callbacks2, boxEmitter: boxEmitter2 } = context;
     this.teleBoxManager = this.setupBoxManager(createTeleBoxManagerConfig);
     this.sideEffectManager.add(() => [
+      this.teleBoxManager.onValChanged("rootRect", (rect) => {
+        emitter2.emit("playgroundSizeChange", rect);
+      }),
       // 使用 _xxx$.reaction 订阅修改的值, 不管有没有 skipUpdate, 修改值都会触发回调
       this.teleBoxManager.onValChanged("state", (state) => {
         callbacks2.emit("boxStateChange", state);
@@ -12643,7 +12651,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.77";
+    this.version = "1.0.0-canary.78";
     this.dependencies = { "dependencies": { "@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": "^5.1.2", "side-effect-manager": "^1.2.1", "uuid": "^9.0.0", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "1.0.0-canary.6", "@netless/app-plyr": "^0.2.4", "@playwright/test": "^1.33.0", "@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-url": "^8.0.1", "@sveltejs/vite-plugin-svelte": "^2.2.0", "@tsconfig/svelte": "^4.0.1", "@types/debug": "^4.1.7", "@types/node": "^18.0.3", "@types/lodash": "^4.14.194", "@types/lodash-es": "^4.17.7", "@types/uuid": "^9.0.1", "@typescript-eslint/eslint-plugin": "^5.59.5", "@typescript-eslint/parser": "^5.59.5", "@vitest/ui": "^0.31.0", "cypress": "^12.12.0", "dotenv": "^16.0.3", "eslint": "^8.40.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-svelte3": "^4.0.0", "jsdom": "^22.0.0", "less": "^4.1.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^4.0.0", "svelte": "^3.59.1", "typescript": "^5.0.4", "vite": "^4.3.5", "vite-plugin-dts": "^2.3.0", "vitest": "^0.31.0", "white-web-sdk": "^2.16.42" } };
     this.emitter = callbacks;
     this.viewMode$ = new valueEnhancer.Val(whiteWebSdk.ViewMode.Broadcaster);

package/dist/index.mjs

@@ -595,9 +595,14 @@ class AppListeners {
     this.moveCameraHandler = (payload) => {
       const size$ = this.manager.mainViewProxy.size$;
       if (size$.value) {
-        const size = this.manager.mainView.size;
-        const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
-        const nextCamera = { ...payload, scale: payload.scale * diff };
+        const nextCamera = { ...payload };
+        if (nextCamera.scale) {
+          const size = this.manager.mainView.size;
+          const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
+          nextCamera.scale *= diff;
+        } else {
+          delete nextCamera.scale;
+        }
         this.manager.mainView.moveCamera(nextCamera);
       }
     };
@@ -6072,6 +6077,9 @@ class BoxManager {
     const { emitter: emitter2, callbacks: callbacks2, boxEmitter: boxEmitter2 } = context;
     this.teleBoxManager = this.setupBoxManager(createTeleBoxManagerConfig);
     this.sideEffectManager.add(() => [
+      this.teleBoxManager.onValChanged("rootRect", (rect) => {
+        emitter2.emit("playgroundSizeChange", rect);
+      }),
       // 使用 _xxx$.reaction 订阅修改的值, 不管有没有 skipUpdate, 修改值都会触发回调
       this.teleBoxManager.onValChanged("state", (state) => {
         callbacks2.emit("boxStateChange", state);
@@ -12619,7 +12627,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.77";
+    this.version = "1.0.0-canary.78";
     this.dependencies = { "dependencies": { "@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": "^5.1.2", "side-effect-manager": "^1.2.1", "uuid": "^9.0.0", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "1.0.0-canary.6", "@netless/app-plyr": "^0.2.4", "@playwright/test": "^1.33.0", "@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-url": "^8.0.1", "@sveltejs/vite-plugin-svelte": "^2.2.0", "@tsconfig/svelte": "^4.0.1", "@types/debug": "^4.1.7", "@types/node": "^18.0.3", "@types/lodash": "^4.14.194", "@types/lodash-es": "^4.17.7", "@types/uuid": "^9.0.1", "@typescript-eslint/eslint-plugin": "^5.59.5", "@typescript-eslint/parser": "^5.59.5", "@vitest/ui": "^0.31.0", "cypress": "^12.12.0", "dotenv": "^16.0.3", "eslint": "^8.40.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-svelte3": "^4.0.0", "jsdom": "^22.0.0", "less": "^4.1.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^4.0.0", "svelte": "^3.59.1", "typescript": "^5.0.4", "vite": "^4.3.5", "vite-plugin-dts": "^2.3.0", "vitest": "^0.31.0", "white-web-sdk": "^2.16.42" } };
     this.emitter = callbacks;
     this.viewMode$ = new Val(ViewMode.Broadcaster);

package/dist/index.umd.js

@@ -590,9 +590,14 @@
       this.moveCameraHandler = (payload) => {
         const size$ = this.manager.mainViewProxy.size$;
         if (size$.value) {
-          const size = this.manager.mainView.size;
-          const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
-          const nextCamera = { ...payload, scale: payload.scale * diff };
+          const nextCamera = { ...payload };
+          if (nextCamera.scale) {
+            const size = this.manager.mainView.size;
+            const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
+            nextCamera.scale *= diff;
+          } else {
+            delete nextCamera.scale;
+          }
           this.manager.mainView.moveCamera(nextCamera);
         }
       };
@@ -6067,6 +6072,9 @@
       const { emitter: emitter2, callbacks: callbacks2, boxEmitter: boxEmitter2 } = context;
       this.teleBoxManager = this.setupBoxManager(createTeleBoxManagerConfig);
       this.sideEffectManager.add(() => [
+        this.teleBoxManager.onValChanged("rootRect", (rect) => {
+          emitter2.emit("playgroundSizeChange", rect);
+        }),
         // 使用 _xxx$.reaction 订阅修改的值, 不管有没有 skipUpdate, 修改值都会触发回调
         this.teleBoxManager.onValChanged("state", (state) => {
           callbacks2.emit("boxStateChange", state);
@@ -12614,7 +12622,7 @@
   const _WindowManager = class extends whiteWebSdk.InvisiblePlugin {
     constructor(context) {
       super(context);
-      this.version = "1.0.0-canary.77";
+      this.version = "1.0.0-canary.78";
       this.dependencies = { "dependencies": { "@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": "^5.1.2", "side-effect-manager": "^1.2.1", "uuid": "^9.0.0", "value-enhancer": "^1.3.2" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "1.0.0-canary.6", "@netless/app-plyr": "^0.2.4", "@playwright/test": "^1.33.0", "@rollup/plugin-commonjs": "^24.1.0", "@rollup/plugin-node-resolve": "^15.0.2", "@rollup/plugin-url": "^8.0.1", "@sveltejs/vite-plugin-svelte": "^2.2.0", "@tsconfig/svelte": "^4.0.1", "@types/debug": "^4.1.7", "@types/node": "^18.0.3", "@types/lodash": "^4.14.194", "@types/lodash-es": "^4.17.7", "@types/uuid": "^9.0.1", "@typescript-eslint/eslint-plugin": "^5.59.5", "@typescript-eslint/parser": "^5.59.5", "@vitest/ui": "^0.31.0", "cypress": "^12.12.0", "dotenv": "^16.0.3", "eslint": "^8.40.0", "eslint-config-prettier": "^8.8.0", "eslint-plugin-svelte3": "^4.0.0", "jsdom": "^22.0.0", "less": "^4.1.3", "prettier": "^2.8.8", "prettier-plugin-svelte": "^2.10.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^4.0.0", "svelte": "^3.59.1", "typescript": "^5.0.4", "vite": "^4.3.5", "vite-plugin-dts": "^2.3.0", "vitest": "^0.31.0", "white-web-sdk": "^2.16.42" } };
       this.emitter = callbacks;
       this.viewMode$ = new valueEnhancer.Val(whiteWebSdk.ViewMode.Broadcaster);

package/package.json

@@ -1,11 +1,22 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.77",
+  "version": "1.0.0-canary.78",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "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",
@@ -58,16 +69,5 @@
     "vite-plugin-dts": "^2.3.0",
     "vitest": "^0.31.0",
     "white-web-sdk": "^2.16.42"
-  },
-  "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/AppListener.ts

@@ -134,12 +134,24 @@ export class AppListeners {
         }
     }
 
-    private moveCameraHandler = (payload: Camera) => {
+    private moveCameraHandler = (payload: Partial<Camera>) => {
         const size$ = this.manager.mainViewProxy.size$;
+        // 'size' 存在表示白板已经可见，此时 moveCamera 才有意义
         if (size$.value) {
-            const size = this.manager.mainView.size;
-            const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
-            const nextCamera = { ...payload, scale: payload.scale * diff };
+            const nextCamera = { ...payload };
+
+            // 如果远端移动视角带有缩放，调整以符合本地视角
+            if (nextCamera.scale) {
+                const size = this.manager.mainView.size;
+                const diff = Math.max(size.height / size$.value.height, size.width / size$.value.width);
+                nextCamera.scale *= diff;
+            }
+
+            // 有可能传了个 scale = 0, 规避这些无效值
+            else {
+                delete nextCamera.scale;
+            }
+
             this.manager.mainView.moveCamera(nextCamera);
         }
     }

package/src/BoxManager.ts

@@ -108,6 +108,9 @@ export class BoxManager {
         const { emitter, callbacks, boxEmitter } = context;
         this.teleBoxManager = this.setupBoxManager(createTeleBoxManagerConfig);
         this.sideEffectManager.add(() => [
+            this.teleBoxManager.onValChanged("rootRect", rect => {
+                emitter.emit("playgroundSizeChange", rect);
+            }),
             // 使用 _xxx$.reaction 订阅修改的值, 不管有没有 skipUpdate, 修改值都会触发回调
             this.teleBoxManager.onValChanged("state", state => {
                 callbacks.emit("boxStateChange", state);