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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.7-beta.7",
+  "version": "1.0.7-beta.9",
   "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.13",
+    "@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;

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();
@@ -71,7 +72,9 @@ export class AppManager {
     private callbacksNode: ScenesCallbacksNode | null = null;
     private appCreateQueue = new AppCreateQueue();
 
-    private _focusAppCreatedResolve?: (appProxy: AppProxy) => void;
+    private _focusAppCreatedResolve?: (appProxy?: AppProxy) => void;
+    private _focusAppId: string | undefined;
+    private _resolveTimer: number | undefined;
 
     private sideEffectManager = new SideEffectManager();
 
@@ -341,9 +344,16 @@ export class AppManager {
 
     private async onCreated() {
         if (Object.keys(this.attributes.apps).length && this.store.focus) {
-            await new Promise<AppProxy>(resolve => {
+            this._focusAppId = this.store.focus;
+            console.log("onCreated===>", this._focusAppId);
+            await new Promise<AppProxy | undefined>(resolve => {
                 this._focusAppCreatedResolve = resolve;
+                this._resolveTimer = setTimeout(() => {
+                    console.log("onCreated===>3333", this._focusAppId);
+                    resolve(this.appProxies.get(this._focusAppId || ''));
+                }, 500);
             }).then(() => {
+                console.log("onCreated===>2222", this._focusAppId);
                 this.focusByAttributes(this.attributes.apps);
             });
         }
@@ -594,7 +604,7 @@ export class AppManager {
                         if (!appAttributes) {
                             throw new Error("appAttributes is undefined");
                         }
-
+                        
                         this.appCreateQueue.push<AppProxy>(async () => {
                             this.appStatus.set(id, AppStatus.StartCreate);
                             const appProxy = await this.baseInsertApp(
@@ -611,9 +621,13 @@ export class AppManager {
                             );
                             if (
                                 appProxy &&
-                                this.store.focus === id &&
+                                this._focusAppId === id &&
                                 this._focusAppCreatedResolve
                             ) {
+                                console.log("onCreated===>4444", this._focusAppId);
+                                if (this._resolveTimer) {
+                                    clearTimeout(this._resolveTimer);
+                                }
                                 this._focusAppCreatedResolve(appProxy);
                             }
                             return appProxy;
@@ -940,6 +954,10 @@ export class AppManager {
         this.sideEffectManager.flushAll();
         this._prevFocused = undefined;
         this._prevSceneIndex = undefined;
+        if (this._resolveTimer) {
+            clearTimeout(this._resolveTimer);
+        }
         this._focusAppCreatedResolve = undefined;
+        this._resolveTimer = undefined;
     }
 }

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

package/src/BoxManager.ts

@@ -107,6 +107,7 @@ export const createBoxManager = (
 };
 
 export class BoxManager {
+    static readonly kind = "BoxManager";
     public teleBoxManager: TeleBoxManager;
 
     constructor(

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,27 @@ 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;
+        }
     }
+    return baseClass;
 }

package/src/index.ts

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