@netless/window-manager 1.0.7-beta.2 → 1.0.7-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.7-beta.2",
+  "version": "1.0.7-beta.3",
   "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.9",
+    "@netless/telebox-insider": "0.3.0-beta.10",
     "emittery": "^0.9.2",
     "lodash": "^4.17.21",
     "p-retry": "^4.6.1",

package/src/App/AppProxy.ts

@@ -179,7 +179,8 @@ export class AppProxy implements PageRemoveService {
         if (!this.boxManager) {
             throw new BoxManagerNotFoundError();
         }
-        const context = new AppContext(this.manager, this.boxManager, appId, this, appOptions);
+        const AppContextClass = getExtendClass(AppContext, WindowManager.extendClass);
+        const context = new AppContextClass(this.manager, this.boxManager, appId, this, appOptions);
         this.appContext = context;
         try {
             internalEmitter.once(`${appId}${Events.WindowCreated}` as any).then(async () => {

package/src/AppManager.ts

@@ -458,8 +458,6 @@ export class AppManager {
             return safeListenPropsUpdated(
                 () => this.attributes.boxesStatus,
                 () => {
-                    const currentBoxesStatus = this.boxManager?.teleBoxManager.boxesStatus;
-                    console.log("boxesStatus===>autorun", isEqual(Object.entries(this.attributes.boxesStatus), [...(currentBoxesStatus?.entries() ?? [])]), Object.entries(this.attributes.boxesStatus), [...(currentBoxesStatus?.entries() ?? [])])
                     this.boxManager?.setBoxesStatus(this.attributes.boxesStatus);
                 }
             );
@@ -468,8 +466,6 @@ export class AppManager {
             return safeListenPropsUpdated(
                 () => this.attributes.lastNotMinimizedBoxesStatus,
                 () => {
-                    const currentLastNotMinimizedBoxesStatus = this.boxManager?.teleBoxManager.lastNotMinimizedBoxesStatus;
-                    console.log("lastNotMinimizedBoxesStatus===>autorun", isEqual(Object.entries(this.attributes.lastNotMinimizedBoxesStatus), [...(currentLastNotMinimizedBoxesStatus?.entries() ?? [])]), Object.entries(this.attributes.lastNotMinimizedBoxesStatus), [...(currentLastNotMinimizedBoxesStatus?.entries() ?? [])])
                     this.boxManager?.setLastNotMinimizedBoxesStatus(this.attributes.lastNotMinimizedBoxesStatus);
                 }
             );
@@ -708,12 +704,6 @@ export class AppManager {
         const attrs = params.attributes ?? {};
         this.safeUpdateAttributes([appId], attrs);
         this.store.setupAppAttributes(params, appId, isDynamicPPT);
-        // if (this.useBoxesStatus){
-        //     // todo: 这里需要优化
-        //     // if(!this.store.getLastNotMinimizedBoxesStatus()){
-        //     //     this.store.setLastNotMinimizedBoxesStatus({});
-        //     // }
-        // }
         const needFocus = !this.boxManager?.minimized;
         if (needFocus) {
             this.store.setAppFocus(appId, true);

package/src/BoxManager.ts

@@ -179,7 +179,6 @@ export class BoxManager {
         this.teleBoxManager.events.on("focused", box => {
             if (box) {
                 if (this.canOperate) {
-                    console.log("focused===>focused", box.id, box.zIndex)
                     boxEmitter.emit("focus", { appId: box.id });
                 } else {
                     this.teleBoxManager.blurBox(box.id);
@@ -189,7 +188,6 @@ export class BoxManager {
         this.teleBoxManager.events.on("blurred", box => {
             if (box) {
                 if (this.canOperate) {
-                    console.log("focused===>blurred", box.id, box.zIndex)
                     boxEmitter.emit("blurred", { appId: box.id });
                 }
             }
@@ -273,7 +271,6 @@ export class BoxManager {
             id: params.appId,
             boxStatus: params.boxStatus,
         };
-        console.log("createBox===>", createBoxConfig.id, params.boxStatus)
         this.teleBoxManager.create(createBoxConfig, params.smartPosition);
         this.context.emitter.emit(`${params.appId}${Events.WindowCreated}` as any);
     }

package/src/Utils/extendClass.ts

@@ -1,15 +1,22 @@
-import { AppProxy } from "../App";
+import { AppContext, AppProxy } from "../App";
 import { AppManager } from "../AppManager";
 import { AttributesDelegate } from "../AttributesDelegate";
 import { BoxManager } from "../BoxManager";
 import { CursorManager } from "../Cursor";
 
+export { AppManager } from "../AppManager";
+export { AppContext, AppProxy } from "../App";
+export { BoxManager } from "../BoxManager";
+export { AttributesDelegate } from "../AttributesDelegate";
+export { CursorManager } from "../Cursor";
+
 export type ExtendClassAble =
     | typeof AppManager
+    | typeof AppProxy
+    | typeof AppContext
     | typeof BoxManager
     | typeof AttributesDelegate
     | typeof CursorManager
-    | typeof AppProxy;
 
 export type ExtendClass = {
     AppManager?: typeof AppManager;
@@ -17,12 +24,13 @@ export type ExtendClass = {
     AttributesDelegate?: typeof AttributesDelegate;
     CursorManager?: typeof CursorManager;
     AppProxy?: typeof AppProxy;
+    AppContext?: typeof AppContext;
 };
 export function getExtendClass<T extends ExtendClassAble>(
     baseClass: T,
     extendClass?: ExtendClass
 ): T {
-    switch (baseClass.constructor.name) {
+    switch (baseClass.name) {
         case "AppManager":
             return (extendClass?.AppManager || AppManager) as T;
         case "BoxManager":
@@ -33,6 +41,8 @@ export function getExtendClass<T extends ExtendClassAble>(
             return (extendClass?.CursorManager || CursorManager) as T;
         case "AppProxy":
             return (extendClass?.AppProxy || AppProxy) as T;
+        case "AppContext":
+            return (extendClass?.AppContext || AppContext) as T;
         default:
             return baseClass;
     }

package/src/index.ts

@@ -64,7 +64,8 @@ import { setOptions } from "@netless/app-media-player";
 import type { ExtendPluginInstance } from "./ExtendPluginManager";
 import { ExtendPluginManager } from "./ExtendPluginManager";
 import { ExtendClass, getExtendClass } from "./Utils/extendClass";
-export * from "./View/IframeBridge";
+
+export * from "./utils/extendClass";
 
 export type WindowMangerAttributes = {
     modelValue?: string;
@@ -166,7 +167,7 @@ export type MountParams = {
     fullscreen?: boolean;
     polling?: boolean;
     supportAppliancePlugin?: boolean;
-    /** 是否使用 boxesStatus 状态 */
+    /** 是否使用 boxesStatus 状态管理窗口 */
     useBoxesStatus?: boolean;
 };