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

package/src/index.ts

@@ -28,7 +28,8 @@ import {
     putScenes,
     wait,
 } from "./Utils/Common";
-import type { TELE_BOX_STATE, BoxManager } from "./BoxManager";
+import type { BoxManager } from "./BoxManager";
+import type { TELE_BOX_STATE } from "./BoxManager";
 import * as Errors from "./Utils/error";
 import type { Apps, Position } from "./AttributesDelegate";
 import type {
@@ -49,7 +50,11 @@ import type {
 } from "white-web-sdk";
 import type { AppListeners } from "./AppListener";
 import type { ApplianceIcons, NetlessApp, RegisterParams } from "./typings";
-import type { TeleBoxColorScheme, TeleBoxState } from "@netless/telebox-insider";
+import type {
+    NotMinimizedBoxState,
+    TeleBoxColorScheme,
+    TeleBoxState,
+} from "@netless/telebox-insider";
 import type { AppProxy } from "./App";
 import type { PublicEvent } from "./callback";
 import type Emittery from "emittery";
@@ -59,7 +64,10 @@ import { IframeBridge } from "./View/IframeBridge";
 import { setOptions } from "@netless/app-media-player";
 import type { ExtendPluginInstance } from "./ExtendPluginManager";
 import { ExtendPluginManager } from "./ExtendPluginManager";
-export * from "./View/IframeBridge";
+import { getExtendClass } from "./Utils/extendClass";
+import type { ExtendClass } from "./Utils/extendClass";
+
+export * from "./utils/extendClass";
 
 export type WindowMangerAttributes = {
     modelValue?: string;
@@ -89,6 +97,12 @@ export type AddAppParams<TAttributes = any> = {
     options?: AddAppOptions;
     // 初始化 attributes
     attributes?: TAttributes;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type BaseInsertParams = {
@@ -100,6 +114,12 @@ export type BaseInsertParams = {
     // 初始化 attributes
     attributes?: any;
     isDynamicPPT?: boolean;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type AppSyncAttributes = {
@@ -110,6 +130,12 @@ export type AppSyncAttributes = {
     isDynamicPPT?: boolean;
     fullPath?: string;
     createdAt?: number;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type AppInitState = {
@@ -122,8 +148,19 @@ export type AppInitState = {
     maximized?: boolean;
     minimized?: boolean;
     sceneIndex?: number;
+    /** 所有box的基本状态 */
     boxState?: TeleBoxState; // 兼容旧版 telebox
     zIndex?: number;
+    /** 扩展版本,单个box的状态 */
+    boxStatus?: TeleBoxState;
+    /** 上次非最小化窗口状态 */
+    lastNotMinimizedBoxStatus?: NotMinimizedBoxState;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type CursorMovePayload = { uid: string; state?: "leave"; position: Position };
@@ -156,15 +193,16 @@ export type MountParams = {
     fullscreen?: boolean;
     polling?: boolean;
     supportAppliancePlugin?: boolean;
+    /** 是否使用 boxesStatus 状态管理窗口 */
+    useBoxesStatus?: boolean;
 };
 
 export const reconnectRefresher = new ReconnectRefresher({ emitter: internalEmitter });
-
 export class WindowManager
     extends InvisiblePlugin<WindowMangerAttributes, any>
     implements PageController
 {
-    public static kind = "WindowManager";
+    public static readonly kind = "WindowManager";
     public static displayer: Displayer;
     public static wrapper?: HTMLElement;
     public static sizer?: HTMLElement;
@@ -194,6 +232,7 @@ export class WindowManager
 
     private boxManager?: BoxManager;
     private static params?: MountParams;
+    static extendClass?: ExtendClass;
 
     private containerResizeObserver?: ContainerResizeObserver;
     public containerSizeRatio = WindowManager.containerSizeRatio;
@@ -210,7 +249,10 @@ export class WindowManager
         WindowManager._resolve(manager);
     }
 
-    public static async mount(params: MountParams): Promise<WindowManager> {
+    public static async mount(
+        params: MountParams,
+        extendClass?: ExtendClass
+    ): Promise<WindowManager> {
         const room = params.room;
         WindowManager.container = params.container;
         WindowManager.supportAppliancePlugin = params.supportAppliancePlugin;
@@ -219,6 +261,7 @@ export class WindowManager
 
         const cursor = params.cursor;
         WindowManager.params = params;
+        WindowManager.extendClass = extendClass;
         WindowManager.displayer = params.room;
         checkVersion();
         let manager: WindowManager | undefined = undefined;
@@ -269,11 +312,14 @@ export class WindowManager
         }
         await manager.ensureAttributes();
 
+        const AppManagerClass = getExtendClass(AppManager, WindowManager.extendClass);
+        const CursorManagerClass = getExtendClass(CursorManager, WindowManager.extendClass);
+
         manager._fullscreen = params.fullscreen;
-        manager.appManager = new AppManager(manager);
+        manager.appManager = new AppManagerClass(manager);
         manager.appManager.polling = params.polling || false;
         manager._pageState = new PageStateImpl(manager.appManager);
-        manager.cursorManager = new CursorManager(
+        manager.cursorManager = new CursorManagerClass(
             manager.appManager,
             Boolean(cursor),
             params.cursorOptions,
@@ -369,9 +415,13 @@ export class WindowManager
                     collectorContainer: params.collectorContainer,
                     collectorStyles: params.collectorStyles,
                     prefersColorScheme: params.prefersColorScheme,
+                    useBoxesStatus: params.useBoxesStatus,
                 });
                 this.boxManager = boxManager;
-                this.appManager?.setBoxManager(boxManager);
+                if (this.appManager) {
+                    this.appManager.useBoxesStatus = params.useBoxesStatus || false;
+                    this.appManager.setBoxManager(boxManager);
+                }
                 this.bindMainView(mainViewElement, params.disableCameraTransform);
                 if (WindowManager.wrapper) {
                     this.cursorManager?.setupWrapper(WindowManager.wrapper);
@@ -696,6 +746,21 @@ export class WindowManager
         this.boxManager?.setMinimized(minimized, false);
     }
 
+    /** 设置指定 box 的状态, 如果为 undefined, 则移除状态*/
+    public setBoxStatus(boxId: string, boxStatus?: TELE_BOX_STATE): void {
+        if (!this.canOperate) return;
+        this.appManager?.store.setBoxStatus(boxId, boxStatus);
+    }
+
+    /** 设置指定 box 的非最小化状态, 如果为 undefined, 则移除状态 */
+    public setLastNotMinimizedBoxStatus(
+        boxId: string,
+        lastNotMinimizedBoxStatus?: NotMinimizedBoxState
+    ): void {
+        if (!this.canOperate) return;
+        this.appManager?.store.setLastNotMinimizedBoxStatus(boxId, lastNotMinimizedBoxStatus);
+    }
+
     public setFullscreen(fullscreen: boolean): void {
         if (this._fullscreen !== fullscreen) {
             this._fullscreen = fullscreen;
@@ -761,6 +826,22 @@ export class WindowManager
         }
     }
 
+    public get boxStatus(): Record<string, TeleBoxState> | undefined {
+        if (this.appManager) {
+            return this.appManager.store.getBoxesStatus();
+        } else {
+            throw new Errors.AppManagerNotInitError();
+        }
+    }
+
+    public get lastNotMinimizedBoxStatus(): Record<string, NotMinimizedBoxState> | undefined {
+        if (this.appManager) {
+            return this.appManager.store.getLastNotMinimizedBoxesStatus();
+        } else {
+            throw new Errors.AppManagerNotInitError();
+        }
+    }
+
     public get darkMode(): boolean {
         return Boolean(this.appManager?.boxManager?.darkMode);
     }
@@ -891,7 +972,7 @@ export class WindowManager
         const mainViewCamera = { ...this.mainView.camera };
         if (isEqual({ ...mainViewCamera, ...pureCamera }, mainViewCamera)) return;
         this.mainView.moveCamera(camera);
-        this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
+        // this.appManager?.dispatchInternalEvent(Events.MoveCamera, camera);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
         }, 500);
@@ -904,7 +985,7 @@ export class WindowManager
             }>
     ): void {
         this.mainView.moveCameraToContain(rectangle);
-        this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
+        // this.appManager?.dispatchInternalEvent(Events.MoveCameraToContain, rectangle);
         setTimeout(() => {
             this.appManager?.mainViewProxy.setCameraAndSize();
         }, 500);

package/src/shim.d.ts

@@ -5,6 +5,10 @@ declare module "*.svelte" {
     export default app;
 }
 
+declare module "@netless/telebox-insider" {
+    export * from "@netless/telebox-insider/dist/index.d.ts";
+}
+
 declare global {
     const __APP_VERSION__: string;
     const __APP_DEPENDENCIES__: Record<string, string>;

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 = {