@netless/window-manager 0.4.13 → 0.4.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",

package/src/AppListener.ts

@@ -55,6 +55,10 @@ export class AppListeners {
                     this.cursorMoveHandler(data.payload);
                     break;
                 }
+                case Events.RootDirRemoved: {
+                    this.rootDirRemovedHandler();
+                    break;
+                }
                 default:
                     break;
             }
@@ -93,4 +97,8 @@ export class AppListeners {
     private cursorMoveHandler = (payload: any) => {
         emitter.emit("cursorMove", payload);
     };
+
+    private rootDirRemovedHandler = () => {
+        this.manager.onRootDirRemoved();
+    };
 }

package/src/AppManager.ts

@@ -109,10 +109,8 @@ export class AppManager {
     private onRemoveScenes = (scenePath: string) => {
         // 如果移除根目录就把 scenePath 设置为初始值
         if (scenePath === ROOT_DIR) {
-            this.setMainViewScenePath(INIT_DIR);
-            this.createRootDirScenesCallback();
             this.onRootDirRemoved();
-            emitter.emit("rootDirRemoved");
+            this.dispatchInternalEvent(Events.RootDirRemoved);
             return;
         }
         // 如果移除的 path 跟 MainViewScenePath 相同就取当前目录的当前 index
@@ -129,7 +127,10 @@ export class AppManager {
      * 根目录被删除时所有的 scene 都会被删除.
      * 所以需要关掉所有开启了 view 的 app
      */
-    private onRootDirRemoved() {
+    public onRootDirRemoved() {
+        this.setMainViewScenePath(INIT_DIR);
+        this.createRootDirScenesCallback();
+
         this.appProxies.forEach(appProxy => {
             if (appProxy.view) {
                 this.closeApp(appProxy.id);
@@ -137,6 +138,8 @@ export class AppManager {
         });
         // 删除了根目录的 scenes 之后 mainview 需要重新绑定, 否则主白板会不能渲染
         this.mainViewProxy.rebind();
+
+        emitter.emit("rootDirRemoved");
     }
 
     private onReadonlyChanged = () => {
@@ -274,34 +277,13 @@ export class AppManager {
         this.refresher?.add("mainViewIndex", () => {
             return autorun(() => {
                 const mainSceneIndex = get(this.attributes, "_mainSceneIndex");
-                if (mainSceneIndex !== undefined && this._prevSceneIndex !== mainSceneIndex) {
-                    callbacks.emit("mainViewSceneIndexChange", mainSceneIndex);
-                    emitter.emit("changePageState");
-                    if (this.callbacksNode) {
-                        this.updateSceneState(this.callbacksNode);
-                    }
-                    this._prevSceneIndex = mainSceneIndex;
-                }
+                this.onMainViewIndexChange(mainSceneIndex);
             });
         });
         this.refresher?.add("focusedChange", () => {
             return autorun(() => {
                 const focused = get(this.attributes, "focus");
-                if (this._prevFocused !== focused) {
-                    callbacks.emit("focusedChange", focused);
-                    emitter.emit("focusedChange", { focused, prev: this._prevFocused });
-                    this._prevFocused = focused;
-                    if (focused !== undefined) {
-                        this.boxManager?.focusBox({ appId: focused });
-                        // 确保 focus 修改的时候, appProxy 已经创建
-                        setTimeout(() => {
-                            const appProxy = this.appProxies.get(focused);
-                            if (appProxy) {
-                                appRegister.notifyApp(appProxy.kind, "focus", { appId: focused });
-                            }
-                        }, 0);
-                    }
-                }
+                this.onFocusChange(focused);
             });
         });
         this.refresher?.add("registeredChange", () => {
@@ -329,6 +311,35 @@ export class AppManager {
         });
     }
 
+    private onMainViewIndexChange = (index: number) => {
+        if (index !== undefined && this._prevSceneIndex !== index) {
+            callbacks.emit("mainViewSceneIndexChange", index);
+            emitter.emit("changePageState");
+            if (this.callbacksNode) {
+                this.updateSceneState(this.callbacksNode);
+            }
+            this._prevSceneIndex = index;
+        }
+    }
+
+    private onFocusChange = (focused: string | undefined) => {
+        if (this._prevFocused !== focused) {
+            callbacks.emit("focusedChange", focused);
+            emitter.emit("focusedChange", { focused, prev: this._prevFocused });
+            this._prevFocused = focused;
+            if (focused !== undefined) {
+                this.boxManager?.focusBox({ appId: focused });
+                // 确保 focus 修改的时候, appProxy 已经创建
+                setTimeout(() => {
+                    const appProxy = this.appProxies.get(focused);
+                    if (appProxy) {
+                        appRegister.notifyApp(appProxy.kind, "focus", { appId: focused });
+                    }
+                }, 0);
+            }
+        }
+    }
+
     /**
      * 插件更新 attributes 时的回调
      *
@@ -717,7 +728,7 @@ export class AppManager {
         });
     }
 
-    public dispatchInternalEvent(event: Events, payload: any) {
+    public dispatchInternalEvent(event: Events, payload?: any) {
         this.safeDispatchMagixEvent(MagixEventName, {
             eventName: event,
             payload: payload,

package/src/ScenePath/index.ts

@@ -0,0 +1,47 @@
+import type { ScenesCallbacks, ScenesCallbacksNode } from "white-web-sdk";
+import type { AppManager } from "../AppManager";
+
+export class ScenesCallbackManager {
+    
+    private nodes: Map<string, ScenesCallbacksNode> = new Map();
+
+    constructor(private manager: AppManager) {}
+
+    public createNode(path: string, callbacks?: Partial<ScenesCallbacks>): ScenesCallbacksNode | null {
+        const node = this.manager.displayer.createScenesCallback(path, callbacks);
+        if (node) {
+            this.nodes.set(path, node);
+        }
+        return node;
+    }
+
+    public getScenes(path: string) {
+        const node = this.nodes.get(path);
+        return node?.scenes;
+    }
+
+    public getScenesOnce(path: string) {
+        let node = this.nodes.get(path);
+        if (!node) {
+            const created = this.createNode(path);
+            if (created) {
+                node = created;
+            }
+        }
+        const scenes = node?.scenes;
+        this.removeNode(path);
+        return scenes;
+    }
+
+    public removeNode(path: string) {
+        const node = this.nodes.get(path);
+        if (node) {
+            node.dispose();
+            this.nodes.delete(path);
+        }
+    }
+
+    public destroy(): void {
+        this.nodes.forEach(node => node.dispose());
+    }
+}

package/src/constants.ts

@@ -13,6 +13,7 @@ export enum Events {
     MoveCamera = "MoveCamera",
     MoveCameraToContain = "MoveCameraToContain",
     CursorMove = "CursorMove",
+    RootDirRemoved = "RootDirRemoved",
 }
 
 export const MagixEventName = "__WindowManger";