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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.7-beta.6",
+  "version": "1.0.7-beta.8",
   "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.14",
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",

package/src/App/AppContext.ts

@@ -34,6 +34,7 @@ import { callbacks } from "../callback";
 export class AppContext<TAttributes extends {} = any, TMagixEventPayloads = any, TAppOptions = any>
     implements PageController
 {
+    static readonly kind = "AppContext";
     public readonly emitter: Emittery<AppEmitterEvent<TAttributes>>;
     public readonly mobxUtils = {
         autorun,

package/src/App/AppProxy.ts

@@ -38,6 +38,7 @@ import { getExtendClass } from "../Utils/extendClass";
 export type AppEmitter = Emittery<AppEmitterEvent>;
 
 export class AppProxy implements PageRemoveService {
+    static readonly kind = "AppProxy";
     public kind: string;
     public id: string;
     public scenePath?: string;
@@ -152,7 +153,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 +178,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 +226,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 +321,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 +342,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

@@ -53,6 +53,7 @@ import { getExtendClass } from "./Utils/extendClass";
 import type { TeleBoxState } from "@netless/telebox-insider";
 
 export class AppManager {
+    static readonly kind = "AppManager";
     public displayer: Displayer;
     public viewManager: ViewManager;
     public appProxies: Map<string, AppProxy> = new Map();
@@ -602,6 +603,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

@@ -53,6 +53,7 @@ export type ICamera = Camera & { id: string };
 export type ISize = Size & { id: string };
 
 export class AttributesDelegate {
+    static readonly kind = "AttributesDelegate";
     constructor(private context: StoreContext) {}
 
     public setContext(context: StoreContext) {
@@ -133,7 +134,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 };
@@ -104,6 +107,7 @@ export const createBoxManager = (
 };
 
 export class BoxManager {
+    static readonly kind = "BoxManager";
     public teleBoxManager: TeleBoxManager;
 
     constructor(
@@ -270,6 +274,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);
@@ -386,6 +393,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/Cursor/index.ts

@@ -26,6 +26,7 @@ export type MoveCursorParams = {
 const LocalCursorSideEffectId = "local-cursor";
 
 export class CursorManager {
+    static readonly kind = "CursorManager";
     public containerRect?: DOMRect;
     public wrapperRect?: DOMRect;
     public cursorInstances: Map<string, Cursor> = new Map();

package/src/Utils/extendClass.ts

@@ -36,24 +36,28 @@ export function getExtendClass<T extends ExtendClassAble>(
     baseClass: T,
     extendClass?: ExtendClass
 ): T {
-    switch (baseClass.name) {
-        case "AppManager":
-            return (extendClass?.AppManager || AppManager) as T;
-        case "BoxManager":
-            return (extendClass?.BoxManager || BoxManager) as T;
-        case "AttributesDelegate":
-            return (extendClass?.AttributesDelegate || AttributesDelegate) as T;
-        case "CursorManager":
-            return (extendClass?.CursorManager || CursorManager) as T;
-        case "AppProxy":
-            return (extendClass?.AppProxy || AppProxy) as T;
-        case "AppContext":
-            return (extendClass?.AppContext || AppContext) as T;
-        case "TeleBoxManager":
-            return (extendClass?.TeleBoxManager || TeleBoxManager) as T;
-        case "TeleBoxCollector":
-            return (extendClass?.TeleBoxCollector || TeleBoxCollector) as T;
-        default:
-            return baseClass;
+    if (baseClass.kind && extendClass && Object.keys(extendClass).includes(baseClass.kind)) {
+        switch (baseClass.kind) {
+            case "AppManager":
+                return (extendClass?.AppManager || AppManager) as T;
+            case "BoxManager":
+                return (extendClass?.BoxManager || BoxManager) as T;
+            case "AttributesDelegate":
+                return (extendClass?.AttributesDelegate || AttributesDelegate) as T;
+            case "CursorManager":
+                return (extendClass?.CursorManager || CursorManager) as T;
+            case "AppProxy":
+                return (extendClass?.AppProxy || AppProxy) as T;
+            case "AppContext":
+                return (extendClass?.AppContext || AppContext) as T;
+            case "TeleBoxManager":
+                return (extendClass?.TeleBoxManager || TeleBoxManager) as T;
+            case "TeleBoxCollector":
+                return (extendClass?.TeleBoxCollector || TeleBoxCollector) as T;
+            default:
+                return baseClass;
+        }
+    } else {
+        return baseClass;
     }
 }

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 };
@@ -178,7 +202,7 @@ 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;