@netless/window-manager 0.4.65-beta.0 → 0.4.66-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.4.65-beta.0",
+  "version": "0.4.66-beta.0",
   "description": "",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/App/AppContext.ts

@@ -28,6 +28,7 @@ import type {
     MagixEventRemoveListener,
 } from "./MagixEvent";
 import type { AddPageParams, PageController, PageState } from "../Page";
+import { internalEmitter } from "../InternalEmitter";
 
 export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any, TAppOptions = any>
     implements PageController
@@ -256,4 +257,13 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
     public get pageState(): PageState {
         return this.appProxy.pageState;
     }
+
+    public get kind(): string {
+        return this.appProxy.kind;
+    }
+
+    /** Dispatch a local event to `manager.onAppEvent()`. */
+    public dispatchAppEvent(type: string, value?: any): void {
+        internalEmitter.emit(`custom-${this.kind}` as any, { type, appId: this.appId, value });
+    }
 }

package/src/App/AppProxy.ts

@@ -372,6 +372,7 @@ export class AppProxy implements PageRemoveService {
                 const appState = this.appAttributes?.state;
                 if (appState?.zIndex > 0 && appState.zIndex !== this.box?.zIndex) {
                     this.boxManager?.setZIndex(appId, appState.zIndex);
+                    this.boxManager?.focusBox({ appId });
                 }
             });
         });

package/src/index.ts

@@ -450,11 +450,12 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any>
                 for (const appId of apps) {
                     const appScenePath = appManager.store.getAppScenePath(appId);
                     if (appScenePath && appScenePath === scenePath) {
-                        console.warn(`[WindowManager]: ScenePath ${scenePath} Already opened`);
+                        console.warn(`[WindowManager]: ScenePath "${scenePath}" already opened`);
                         if (this.boxManager) {
                             const topBox = this.boxManager.getTopBox();
                             if (topBox) {
                                 this.boxManager.setZIndex(appId, topBox.zIndex + 1, false);
+                                this.boxManager.focusBox({ appId }, false);
                             }
                         }
                         return;
@@ -611,6 +612,15 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes, any>
         addEmitterOnceListener(`destroy-${kind}`, listener);
     }
 
+    /**
+     * app 本地自定义事件回调
+     * 
+     * 返回一个用于撤销此监听的函数
+     */
+    public onAppEvent(kind: string, listener: (args: { type: string, appId: string, value: any }) => void): () => void {
+        return internalEmitter.on(`custom-${kind}` as any, listener);
+    }
+
     /**
      * 设置 ViewMode
      */