@netless/window-manager 1.0.0-canary.14 → 1.0.0-canary.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.14",
+  "version": "1.0.0-canary.15",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
-    "@netless/telebox-insider": "1.0.0-alpha.16",
+    "@netless/telebox-insider": "1.0.0-alpha.17",
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",

package/pnpm-lock.yaml

@@ -4,7 +4,7 @@ specifiers:
   '@juggle/resize-observer': ^3.3.1
   '@netless/app-docs-viewer': ^0.2.9
   '@netless/app-media-player': 0.1.0-beta.5
-  '@netless/telebox-insider': 1.0.0-alpha.16
+  '@netless/telebox-insider': 1.0.0-alpha.17
   '@rollup/plugin-commonjs': ^20.0.0
   '@rollup/plugin-node-resolve': ^13.0.4
   '@rollup/plugin-url': ^6.1.0
@@ -43,7 +43,7 @@ specifiers:
 
 dependencies:
   '@juggle/resize-observer': registry.npmmirror.com/@juggle/resize-observer/3.3.1
-  '@netless/telebox-insider': 1.0.0-alpha.16
+  '@netless/telebox-insider': 1.0.0-alpha.17
   emittery: registry.npmmirror.com/emittery/0.9.2
   lodash: registry.npmmirror.com/lodash/4.17.21
   p-retry: registry.npmmirror.com/p-retry/4.6.1
@@ -97,8 +97,8 @@ packages:
       vanilla-lazyload: 17.6.1
     dev: true
 
-  /@netless/telebox-insider/1.0.0-alpha.16:
-    resolution: {integrity: sha512-WoBhBMVXKqZuTYEhcDapYOX05ScvngcdCfcrc2fXHkH5PQxtWWwOc4G2X/stK8giHdlGlAkq+HdKTpQ1Ymn7Aw==}
+  /@netless/telebox-insider/1.0.0-alpha.17:
+    resolution: {integrity: sha512-FoiX5tKKT26EyDiO/gT4P7rhr9Pvkcf2RJuSPxt5PO0ij73vUaU6OwjXJzZkcnIZlHPHhleJoqt1difaJpmyLQ==}
     dependencies:
       '@juggle/resize-observer': 3.3.1
       '@types/shallowequal': 1.1.1

package/src/App/AppContext.ts

@@ -110,6 +110,12 @@ export class AppContext<TAttributes = any, TMagixEventPayloads = any, TAppOption
             this.ensurePageSize(size);
         }
         this.whiteBoardView = new WhiteBoardView(view, this, this.appProxy, removeViewWrapper, this.ensurePageSize);
+        this.appProxy.sideEffectManager.add(() => {
+            return () => {
+                this.whiteBoardView?.destroy();
+                this.whiteBoardView = undefined;
+            }
+        });
         return this.whiteBoardView;
     }
 

package/src/App/AppProxy.ts

@@ -61,7 +61,7 @@ export class AppProxy implements PageRemoveService {
     public appResult?: NetlessApp;
     public appContext?: AppContext;
 
-    private sideEffectManager = new SideEffectManager();
+    public sideEffectManager = new SideEffectManager();
     private valManager = new ValManager();
 
     private fullPath$ = this.valManager.attach(new Val<string | undefined>(undefined));
@@ -589,8 +589,9 @@ export class AppProxy implements PageRemoveService {
         if (!this.camera$.value) {
             return;
         }
-        const nextCamera = { ...this.camera$.value, ...camera };
+        const nextCamera = { ...this.camera$.value, ...camera, id: this.uid };
         this.storeCamera(nextCamera);
+        this.camera$.setValue(nextCamera);
     };
 
     public async destroy(

package/src/App/WhiteboardView.ts

@@ -1,5 +1,6 @@
 import { putScenes } from "../Utils/Common";
 import { Val } from "value-enhancer";
+import { pick } from "lodash";
 
 import type { ReadonlyVal } from "value-enhancer";
 import type { AddPageParams, PageController, PageState } from "../Page";
@@ -8,9 +9,11 @@ import type { AppContext } from "./AppContext";
 import type { Camera, View } from "white-web-sdk";
 import type { TeleBoxRect } from "@netless/telebox-insider";
 
+export type WhiteBoardViewCamera = Omit<Camera, "scale">;
+
 export class WhiteBoardView implements PageController {
     public readonly pageState$: ReadonlyVal<PageState>;
-    public readonly camera$: ReadonlyVal<Camera>;
+    public readonly camera$: ReadonlyVal<WhiteBoardViewCamera>;
 
     constructor(
         public view: View,
@@ -21,16 +24,22 @@ export class WhiteBoardView implements PageController {
     ) {
         const pageState$ = new Val<PageState>(appProxy.pageState);
         this.pageState$ = pageState$;
-        appProxy.appEmitter.on("pageStateChange", pageState => {
-            pageState$.setValue(pageState);
-        });
-        const camera$ = new Val<Camera, boolean>(this.view.camera);
-        this.camera$ = camera$
-        appProxy.camera$.subscribe(camera => {
-            if (camera) {
-                camera$.setValue(camera, true);
-            }
-        });
+        this.appProxy.sideEffectManager.add(() =>
+            appProxy.appEmitter.on("pageStateChange", pageState => {
+                pageState$.setValue(pageState);
+            })
+        );
+        const camera$ = new Val<WhiteBoardViewCamera>(
+            pick(this.view.camera, ["centerX", "centerY"])
+        );
+        this.camera$ = camera$;
+        this.appProxy.sideEffectManager.add(() =>
+            appProxy.camera$.subscribe(camera => {
+                if (camera) {
+                    camera$.setValue(pick(camera, ["centerX", "centerY"]));
+                }
+            })
+        );
         view.disableCameraTransform = true;
     }
 
@@ -38,7 +47,7 @@ export class WhiteBoardView implements PageController {
         return this.pageState$.value;
     }
 
-    public moveCamera(camera: Partial<Camera>) {
+    public moveCamera(camera: Partial<WhiteBoardViewCamera>) {
         this.appProxy.moveCamera(camera);
     }