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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.0-canary.13",
+  "version": "1.0.0-canary.14",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",

package/src/App/WhiteboardView.ts

@@ -10,6 +10,7 @@ import type { TeleBoxRect } from "@netless/telebox-insider";
 
 export class WhiteBoardView implements PageController {
     public readonly pageState$: ReadonlyVal<PageState>;
+    public readonly camera$: ReadonlyVal<Camera>;
 
     constructor(
         public view: View,
@@ -23,6 +24,13 @@ export class WhiteBoardView implements PageController {
         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);
+            }
+        });
         view.disableCameraTransform = true;
     }
 
@@ -85,6 +93,7 @@ export class WhiteBoardView implements PageController {
 
     public destroy() {
         this.pageState$.destroy();
+        this.camera$.destroy();
         this.removeViewWrapper();
     }
 }

package/src/AppManager.ts

@@ -138,7 +138,7 @@ export class AppManager {
                 sceneName = this.callbacksNode?.scenes[nextIndex];
             }
             if (sceneName) {
-                this.setMainViewScenePath(`${ROOT_DIR}${sceneName}`);
+                await this.setMainViewScenePath(`${ROOT_DIR}${sceneName}`);
             }
             await this.setMainViewSceneIndex(nextIndex);
         } else {
@@ -153,7 +153,7 @@ export class AppManager {
      * 所以需要关掉所有开启了 view 的 app
      */
     public async onRootDirRemoved(needClose = true) {
-        this.setMainViewScenePath(INIT_DIR);
+        await this.setMainViewScenePath(INIT_DIR);
         this.createRootDirScenesCallback();
 
         for (const [id, appProxy] of this.appProxies.entries()) {
@@ -161,9 +161,9 @@ export class AppManager {
                 await this.closeApp(id, needClose);
             }
         }
-        // 删除了根目录的 scenes 之后 mainview 需要重新绑定, 否则主白板会不能渲染
+        // 删除了根目录的 scenes 之后 main-view 需要重新绑定, 否则主白板会不能渲染
         this.mainViewProxy.rebind();
-        emitter.emit("rootDirRemoved");
+        await emitter.emit("rootDirRemoved");
         this.updateRootDirRemoving(false);
     }
 
@@ -462,9 +462,9 @@ export class AppManager {
     );
 
     /**
-     * 插件更新 attributes 时的回调
+     * 插件更新 apps 时的回调
      *
-     * @param {*} attributes
+     * @param {*} apps
      * @memberof WindowManager
      */
     public async _attributesUpdateCallback(apps: any) {
@@ -680,7 +680,7 @@ export class AppManager {
     public displayerWritableListener = (isReadonly: boolean) => {
         const isWritable = !isReadonly;
         const isManualWritable =
-            this.windowManger.readonly === undefined || this.windowManger.readonly === false;
+            this.windowManger.readonly === undefined || !this.windowManger.readonly;
         if (this.windowManger.readonly === undefined) {
             this.boxManager?.setReadonly(isReadonly);
         } else {
@@ -689,7 +689,7 @@ export class AppManager {
         this.appProxies.forEach(appProxy => {
             appProxy.emitAppIsWritableChange();
         });
-        if (isWritable === true) {
+        if (isWritable) {
             if (this.room && this.room.disableSerialization === true) {
                 this.room.disableSerialization = false;
             }

package/src/PageState.ts

@@ -6,7 +6,7 @@ import type { PageState } from "./Page";
 export class PageStateImpl {
     constructor(private manager: AppManager) {
         emitter.on("changePageState", () => {
-            callbacks.emit("pageStateChange", this.toObject());
+          callbacks.emit("pageStateChange", this.toObject());
         });
     }
 

package/src/View/CameraSynchronizer.ts

@@ -46,7 +46,7 @@ export class CameraSynchronizer {
                     animationMode: AnimationMode.Immediately,
                 });
             }
-            moveCamera();
+            moveCamera(); 
             // TODO 直接调用 moveCamera 依然会出现 camera 错误的情况,这里暂时加一个 delay 保证 camera 是对的, 后续需要 SDK 进行修改
             delay(moveCamera, 50);
         }