@netless/window-manager 1.0.6 → 1.0.7-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.6",
+  "version": "1.0.7-beta.1",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",

package/src/App/AppProxy.ts

@@ -187,6 +187,11 @@ export class AppProxy implements PageRemoveService {
                 this.appEmitter.onAny(this.appListener);
                 this.appAttributesUpdateListener(appId);
                 this.setViewFocusScenePath();
+                // 如果当前是回放模式, 则需要记录当前主视图的场景路径, 以便在 app 创建后恢复
+                let currentMainViewScenePath: string | undefined;
+                if (this.manager.isReplay) {
+                    currentMainViewScenePath = (this.manager.mainView as any).scenePath as string;
+                }
                 setTimeout(async () => {
                     // 延迟执行 setup, 防止初始化的属性没有更新成功
                     console.log("setup app", app);
@@ -195,6 +200,9 @@ export class AppProxy implements PageRemoveService {
                     appRegister.notifyApp(this.kind, "created", { appId, result });
                     this.afterSetupApp(boxInitState);
                     this.fixMobileSize();
+                    if (currentMainViewScenePath) {
+                        this.manager.mainViewProxy.setFocusScenePath(currentMainViewScenePath);
+                    }
                     callbacks.emit("onAppSetup", appId);
                 }, SETUP_APP_DELAY);
             });

package/src/AppManager.ts

@@ -3,7 +3,7 @@ import { AppCreateQueue } from "./Utils/AppCreateQueue";
 import { AppListeners } from "./AppListener";
 import { AppProxy } from "./App";
 import { appRegister } from "./Register";
-import { autorun, isPlayer, isRoom, ScenePathType } from "white-web-sdk";
+import { autorun, isPlayer, isRoom, ScenePathType, UpdateEventKind } from "white-web-sdk";
 import { boxEmitter } from "./BoxEmitter";
 import { calculateNextIndex } from "./Page";
 import { callbacks } from "./callback";
@@ -12,7 +12,7 @@ import { internalEmitter } from "./InternalEmitter";
 import { Fields, store } from "./AttributesDelegate";
 import { log } from "./Utils/log";
 import { MainViewProxy } from "./View/MainView";
-import { onObjectRemoved, safeListenPropsUpdated } from "./Utils/Reactive";
+import { safeListenPropsUpdated } from "./Utils/Reactive";
 import { reconnectRefresher, WindowManager } from "./index";
 import { RedoUndo } from "./RedoUndo";
 import { SideEffectManager } from "side-effect-manager";
@@ -438,10 +438,20 @@ export class AppManager {
     };
 
     public addAppCloseListener = () => {
+        // this.refresher.add("appsClose", () => {
+        //     return onObjectRemoved(this.attributes.apps, () => {
+        //         this.onAppDelete(this.attributes.apps);
+        //     });
+        // });
         this.refresher.add("appsClose", () => {
-            return onObjectRemoved(this.attributes.apps, () => {
-                this.onAppDelete(this.attributes.apps);
-            });
+            return safeListenPropsUpdated(
+                () => this.attributes.apps,
+                events => {
+                    if (events.some(e => e.kind === UpdateEventKind.Removed)) {
+                        this.onAppDelete(this.attributes.apps);
+                    }
+                }
+            );
         });
     };