@netless/window-manager 1.0.7-beta.4 → 1.0.7-beta.6

package/package.json

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

package/src/App/AppContext.ts

@@ -16,7 +16,7 @@ import type {
     View,
     EventListener as WhiteEventListener,
 } from "white-web-sdk";
-import type { ReadonlyTeleBox } from "@netless/telebox-insider";
+import type { NotMinimizedBoxState, ReadonlyTeleBox, TeleBoxState } from "@netless/telebox-insider";
 import type Emittery from "emittery";
 import type { BoxManager } from "../BoxManager";
 import type { AppEmitterEvent, WindowManager } from "../index";
@@ -74,6 +74,14 @@ export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any,
         return this.manager.windowManger;
     };
 
+    public getBoxStatus = (): TeleBoxState | undefined => {
+        return this.manager.store.getBoxStatus(this.appId);
+    };
+
+    public getLastNotMinimizedBoxStatus = (): NotMinimizedBoxState | undefined => {
+        return this.manager.store.getLastNotMinimizedBoxStatus(this.appId);
+    };
+
     public getDisplayer = () => {
         return this.manager.displayer;
     };

package/src/App/AppProxy.ts

@@ -450,6 +450,10 @@ export class AppProxy implements PageRemoveService {
         this.appEmitter.emit("pageStateChange", this.pageState);
     }, 50);
 
+    public notifyBoxStatusChange = (status: TeleBoxState) => {
+        this.appEmitter.emit("boxStatusChange", { appId: this.id, status });
+    };
+
     public get pageState(): PageState {
         return this._pageState.toObject();
     }

package/src/AppManager.ts

@@ -50,6 +50,7 @@ import type {
     BoxStateChangePayload,
 } from "./BoxEmitter";
 import { getExtendClass } from "./Utils/extendClass";
+import type { TeleBoxState } from "@netless/telebox-insider";
 
 export class AppManager {
     public displayer: Displayer;
@@ -454,12 +455,25 @@ export class AppManager {
         callbacks.emit("onBoxStateChange", payload);
     };
 
+    private notifyBoxesStatusChange = debounce(() => {
+        const entries = Object.entries(this.attributes.boxesStatus);
+        if (entries.length > 0) {
+            entries.forEach(([appId, status]) => {
+                const appProxy = this.appProxies.get(appId);
+                if (appProxy) {
+                    appProxy.notifyBoxStatusChange(status as TeleBoxState);
+                }
+            });
+        }
+    }, 50);
+
     public addBoxesStatusChangeListener = () => {
         this.refresher.add("boxesStatus", () => {
             return safeListenPropsUpdated(
                 () => this.attributes.boxesStatus,
                 () => {
                     this.boxManager?.setBoxesStatus(this.attributes.boxesStatus);
+                    this.notifyBoxesStatusChange();
                 }
             );
         });
@@ -474,7 +488,6 @@ export class AppManager {
             );
         });
     };
-
     public addAppsChangeListener = () => {
         this.refresher.add("apps", () => {
             return safeListenPropsUpdated(

package/src/AttributesDelegate.ts

@@ -5,7 +5,6 @@ import type { AddAppParams, AppSyncAttributes } from "./index";
 import type { Camera, Size, View } from "white-web-sdk";
 import type { Cursor } from "./Cursor/Cursor";
 import { getExtendClass } from "./Utils/extendClass";
-import type { TELE_BOX_STATE } from "@netless/telebox-insider";
 import type { ExtendClass } from "./Utils/extendClass";
 import type { NotMinimizedBoxState, TeleBoxState } from "@netless/telebox-insider";
 
@@ -88,11 +87,11 @@ export class AttributesDelegate {
         return get(this.attributes, ["minimized"]);
     }
 
-    public getBoxesStatus(): Record<string, TELE_BOX_STATE> | undefined {
+    public getBoxesStatus(): Record<string, TeleBoxState> | undefined {
         return get(this.attributes, [Fields.BoxesStatus]);
     }
 
-    public getBoxStatus(id: string): TELE_BOX_STATE | undefined {
+    public getBoxStatus(id: string): TeleBoxState | undefined {
         return get(this.attributes, [Fields.BoxesStatus, id]);
     }
 

package/src/BoxManager.ts

@@ -290,23 +290,26 @@ export class BoxManager {
         }
     }
     public setBoxesStatus(status?: Record<string, TeleBoxState>): void {
-        this.teleBoxManager.setBoxesStatus(new Map(Object.entries(status ?? {})), true);
+        const map = new Map(Object.entries(status ?? {}));
+        this.teleBoxManager.setBoxesStatus(map, true);
+        this.context.callbacks.emit("onBoxesStatusChange", map);
+        this.context.emitter.emit("boxesStatusChange", map);
     }
 
-    public setBoxStatus(appId: string, status?: TeleBoxState): void {
-        this.teleBoxManager.update(appId, { boxStatus: status }, true);
-    }
+    // public setBoxStatus(appId: string, status?: TeleBoxState, skipUpdate = false): void {
+    //     this.teleBoxManager.update(appId, { boxStatus: status }, true);
+    // }
 
     public setLastNotMinimizedBoxesStatus(status?: Record<string, NotMinimizedBoxState>): void {
-        this.teleBoxManager.setLastNotMinimizedBoxesStatus(
-            new Map(Object.entries(status ?? {})),
-            true
-        );
+        const map = new Map(Object.entries(status ?? {}));
+        this.teleBoxManager.setLastNotMinimizedBoxesStatus(map, true);
+        this.context.callbacks.emit("onLastNotMinimizedBoxesStatusChange", map);
+        this.context.emitter.emit("lastNotMinimizedBoxesStatusChange", map);
     }
 
-    public setLastNotMinimizedBoxStatus(appId: string, status?: NotMinimizedBoxState): void {
-        this.teleBoxManager.update(appId, { lastNotMinimizedBoxStatus: status }, true);
-    }
+    // public setLastNotMinimizedBoxStatus(appId: string, status?: NotMinimizedBoxState): void {
+    //     this.teleBoxManager.update(appId, { lastNotMinimizedBoxStatus: status }, true);
+    // }
 
     public setupBoxManager(
         createTeleBoxManagerConfig?: CreateTeleBoxManagerConfig

package/src/InternalEmitter.ts

@@ -1,5 +1,6 @@
 import Emittery from "emittery";
 import type { AppInitState, CursorMovePayload } from "./index";
+import type { NotMinimizedBoxState, TeleBoxState } from "@netless/telebox-insider";
 
 export type RemoveSceneParams = {
     scenePath: string;
@@ -28,6 +29,8 @@ export type EmitterEvent = {
     changePageState: undefined;
     writableChange: boolean;
     containerSizeRatioUpdate: number;
+    boxesStatusChange: Map<string, TeleBoxState>;
+    lastNotMinimizedBoxesStatusChange: Map<string, NotMinimizedBoxState>;
 };
 
 export type EmitterType = Emittery<EmitterEvent>;

package/src/callback.ts

@@ -1,5 +1,10 @@
 import Emittery from "emittery";
-import type { TeleBoxColorScheme, TELE_BOX_STATE } from "@netless/telebox-insider";
+import type {
+    TeleBoxColorScheme,
+    TELE_BOX_STATE,
+    TeleBoxState,
+    NotMinimizedBoxState,
+} from "@netless/telebox-insider";
 import type { CameraState, SceneState, View, ViewVisionMode } from "white-web-sdk";
 import type { LoadAppEvent } from "./Register";
 import type { PageState } from "./Page";
@@ -42,6 +47,8 @@ export type PublicEvent = {
     onAppViewMounted: AppPayload;
     onAppSetup: string;
     onAppScenePathChange: AppPayload;
+    onBoxesStatusChange: Map<string, TeleBoxState>;
+    onLastNotMinimizedBoxesStatusChange: Map<string, NotMinimizedBoxState>;
 };
 
 export type CallbacksType = Emittery<PublicEvent>;

package/src/index.ts

@@ -725,7 +725,7 @@ export class WindowManager
     /** 设置指定 box 的状态, 如果为 undefined, 则移除状态*/
     public setBoxStatus(boxId: string, boxStatus?: TELE_BOX_STATE): void {
         if (!this.canOperate) return;
-        this.boxManager?.setBoxStatus(boxId, boxStatus);
+        this.appManager?.store.setBoxStatus(boxId, boxStatus);
     }
 
     /** 设置指定 box 的非最小化状态, 如果为 undefined, 则移除状态 */
@@ -734,7 +734,7 @@ export class WindowManager
         lastNotMinimizedBoxStatus?: NotMinimizedBoxState
     ): void {
         if (!this.canOperate) return;
-        this.boxManager?.setLastNotMinimizedBoxStatus(boxId, lastNotMinimizedBoxStatus);
+        this.appManager?.store.setLastNotMinimizedBoxStatus(boxId, lastNotMinimizedBoxStatus);
     }
 
     public setFullscreen(fullscreen: boolean): void {
@@ -802,7 +802,7 @@ export class WindowManager
         }
     }
 
-    public get boxStatus(): Record<string, TELE_BOX_STATE> | undefined {
+    public get boxStatus(): Record<string, TeleBoxState> | undefined {
         if (this.appManager) {
             return this.appManager.store.getBoxesStatus();
         } else {

package/src/typings.ts

@@ -11,7 +11,7 @@ import type {
     View,
 } from "white-web-sdk";
 import type { AppContext } from "./App";
-import type { ReadonlyTeleBox, TeleBoxRect } from "@netless/telebox-insider";
+import type { ReadonlyTeleBox, TeleBoxRect, TeleBoxState } from "@netless/telebox-insider";
 import type { PageState } from "./Page";
 
 export interface NetlessApp<
@@ -58,6 +58,7 @@ export type AppEmitterEvent<T = any> = {
     reconnected: void;
     seek: number;
     pageStateChange: PageState;
+    boxStatusChange: { appId: string; status: TeleBoxState };
 };
 
 export type RegisterEventData = {