@netless/window-manager 1.0.7-beta.5 → 1.0.7-beta.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.7-beta.5",
+  "version": "1.0.7-beta.7",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@juggle/resize-observer": "^3.3.1",
-    "@netless/telebox-insider": "0.3.0-beta.10",
+    "@netless/telebox-insider": "0.3.0-beta.13",
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",

package/src/App/AppProxy.ts

@@ -152,7 +152,10 @@ export class AppProxy implements PageRemoveService {
                 appImpl,
                 params.options,
                 appParams?.appOptions,
-                this.manager.useBoxesStatus ? TELE_BOX_STATE.Normal : undefined
+                this.manager.useBoxesStatus ? TELE_BOX_STATE.Normal : undefined,
+                params.forceTop,
+                params.forceNormal,
+                params.isDragContent
             );
         } else {
             throw new Error(`[WindowManager]: app load failed ${params.kind} ${params.src}`);
@@ -174,9 +177,12 @@ export class AppProxy implements PageRemoveService {
         app: NetlessApp,
         options?: setAppOptions,
         appOptions?: any,
-        boxStatus?: TeleBoxState
+        boxStatus?: TeleBoxState,
+        forceTop?: boolean,
+        forceNormal?: boolean,
+        isDragContent?: boolean
     ) {
-        log("setupApp", appId, app, options, boxStatus);
+        log("setupApp", appId, app, options, boxStatus, forceTop, forceNormal, isDragContent);
         if (!this.boxManager) {
             throw new BoxManagerNotFoundError();
         }
@@ -219,6 +225,9 @@ export class AppProxy implements PageRemoveService {
                 canOperate: this.manager.canOperate,
                 smartPosition: this.isAddApp,
                 boxStatus,
+                forceTop,
+                forceNormal,
+                isDragContent,
             });
             if (this.isAddApp && this.box) {
                 if (boxStatus) {
@@ -311,6 +320,7 @@ export class AppProxy implements PageRemoveService {
         const minimized = this.attributes?.["minimized"];
         const boxStatus = this.store.getBoxStatus(id) ?? undefined;
         const lastNotMinimizedBoxStatus = this.store.getLastNotMinimizedBoxStatus(id) ?? undefined;
+        const { forceTop, forceNormal, isDragContent } = this.store.getAppAttributes(id);
         const zIndex = attrs?.zIndex;
         let payload = { maximized, minimized, zIndex } as AppInitState;
         if (position) {
@@ -331,6 +341,15 @@ export class AppProxy implements PageRemoveService {
         if (lastNotMinimizedBoxStatus) {
             payload = { ...payload, lastNotMinimizedBoxStatus };
         }
+        if (forceTop) {
+            payload = { ...payload, forceTop };
+        }
+        if (forceNormal) {
+            payload = { ...payload, forceNormal };
+        }
+        if (isDragContent) {
+            payload = { ...payload, isDragContent };
+        }
         return payload;
     };
 

package/src/AppManager.ts

@@ -602,6 +602,9 @@ export class AppManager {
                                     kind: app.kind,
                                     options: app.options,
                                     isDynamicPPT: app.isDynamicPPT,
+                                    forceNormal: app.forceNormal,
+                                    forceTop: app.forceTop,
+                                    isDragContent: app.isDragContent,
                                 },
                                 id,
                                 false

package/src/AttributesDelegate.ts

@@ -133,7 +133,14 @@ export class AttributesDelegate {
             attrNames.push("scenes");
         }
         const options = pick(params.options, attrNames);
-        const attrs: AppSyncAttributes = { kind: params.kind, options, isDynamicPPT };
+        const attrs: AppSyncAttributes = {
+            kind: params.kind,
+            options,
+            isDynamicPPT,
+            forceTop: params.forceTop,
+            forceNormal: params.forceNormal,
+            isDragContent: params.isDragContent,
+        };
         if (typeof params.src === "string") {
             attrs.src = params.src;
         }

package/src/BoxManager.ts

@@ -33,6 +33,9 @@ export type CreateBoxParams = {
     canOperate?: boolean;
     smartPosition?: boolean;
     boxStatus?: TeleBoxState;
+    forceTop?: boolean;
+    forceNormal?: boolean;
+    isDragContent?: boolean;
 };
 
 type AppId = { appId: string };
@@ -270,6 +273,9 @@ export class BoxManager {
             height,
             id: params.appId,
             boxStatus: params.boxStatus,
+            forceTop: params.forceTop,
+            forceNormal: params.forceNormal,
+            isDragContent: params.isDragContent,
         };
         this.teleBoxManager.create(createBoxConfig, params.smartPosition);
         this.context.emitter.emit(`${params.appId}${Events.WindowCreated}` as any);
@@ -296,9 +302,9 @@ export class BoxManager {
         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 {
         const map = new Map(Object.entries(status ?? {}));
@@ -307,9 +313,9 @@ export class BoxManager {
         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
@@ -386,6 +392,9 @@ export class BoxManager {
                     zIndex: state.zIndex,
                     boxStatus: state.boxStatus,
                     lastNotMinimizedBoxStatus: state.lastNotMinimizedBoxStatus,
+                    forceTop: state.forceTop,
+                    forceNormal: state.forceNormal,
+                    isDragContent: state.isDragContent,
                 },
                 true
             );

package/src/index.ts

@@ -97,6 +97,12 @@ export type AddAppParams<TAttributes = any> = {
     options?: AddAppOptions;
     // 初始化 attributes
     attributes?: TAttributes;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type BaseInsertParams = {
@@ -108,6 +114,12 @@ export type BaseInsertParams = {
     // 初始化 attributes
     attributes?: any;
     isDynamicPPT?: boolean;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type AppSyncAttributes = {
@@ -118,6 +130,12 @@ export type AppSyncAttributes = {
     isDynamicPPT?: boolean;
     fullPath?: string;
     createdAt?: number;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type AppInitState = {
@@ -137,6 +155,12 @@ export type AppInitState = {
     boxStatus?: TeleBoxState;
     /** 上次非最小化窗口状态 */
     lastNotMinimizedBoxStatus?: NotMinimizedBoxState;
+    // 强制置顶
+    forceTop?: boolean;
+    // 强制正常窗口
+    forceNormal?: boolean;
+    // 是否可以在内容区域拖动
+    isDragContent?: boolean;
 };
 
 export type CursorMovePayload = { uid: string; state?: "leave"; position: Position };
@@ -725,7 +749,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 +758,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 {