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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "1.0.7-beta.8",
+  "version": "1.0.8",
   "description": "Multi-window mode for Netless Whiteboard",
   "author": "l1shen <lishen1635@gmail.com> (https://github.com/l1shen)",
   "license": "MIT",

package/src/AppListener.ts

@@ -50,14 +50,14 @@ export class AppListeners {
                     this.setMainViewScenePathHandler(data.payload);
                     break;
                 }
-                case Events.MoveCamera: {
-                    this.moveCameraHandler(data.payload);
-                    break;
-                }
-                case Events.MoveCameraToContain: {
-                    this.moveCameraToContainHandler(data.payload);
-                    break;
-                }
+                // case Events.MoveCamera: {
+                //     this.moveCameraHandler(data.payload);
+                //     break;
+                // }
+                // case Events.MoveCameraToContain: {
+                //     this.moveCameraToContainHandler(data.payload);
+                //     break;
+                // }
                 case Events.CursorMove: {
                     this.cursorMoveHandler(data.payload);
                     break;
@@ -102,16 +102,16 @@ export class AppListeners {
         callbacks.emit("mainViewScenePathChange", nextScenePath);
     };
 
-    private moveCameraHandler = (
-        payload: Camera & { animationMode?: AnimationMode | undefined }
-    ) => {
-        if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera })) return;
-        this.manager.mainView.moveCamera(payload);
-    };
+    // private moveCameraHandler = (
+    //     payload: Camera & { animationMode?: AnimationMode | undefined }
+    // ) => {
+    //     if (isEqual(omit(payload, ["animationMode"]), { ...this.manager.mainView.camera })) return;
+    //     this.manager.mainView.moveCamera(payload);
+    // };
 
-    private moveCameraToContainHandler = (payload: any) => {
-        this.manager.mainView.moveCameraToContain(payload);
-    };
+    // private moveCameraToContainHandler = (payload: any) => {
+    //     this.manager.mainView.moveCameraToContain(payload);
+    // };
 
     private cursorMoveHandler = (payload: any) => {
         internalEmitter.emit("cursorMove", payload);

package/src/AppManager.ts

@@ -72,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();
 
@@ -342,8 +344,12 @@ 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;
+            await new Promise<AppProxy | undefined>(resolve => {
                 this._focusAppCreatedResolve = resolve;
+                this._resolveTimer = setTimeout(() => {
+                    resolve(this.appProxies.get(this._focusAppId || ''));
+                }, 500);
             }).then(() => {
                 this.focusByAttributes(this.attributes.apps);
             });
@@ -595,7 +601,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(
@@ -612,9 +618,12 @@ export class AppManager {
                             );
                             if (
                                 appProxy &&
-                                this.store.focus === id &&
+                                this._focusAppId === id &&
                                 this._focusAppCreatedResolve
                             ) {
+                                if (this._resolveTimer) {
+                                    clearTimeout(this._resolveTimer);
+                                }
                                 this._focusAppCreatedResolve(appProxy);
                             }
                             return appProxy;
@@ -941,6 +950,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/Utils/extendClass.ts

@@ -57,7 +57,6 @@ export function getExtendClass<T extends ExtendClassAble>(
             default:
                 return baseClass;
         }
-    } else {
-        return baseClass;
     }
+    return baseClass;
 }

package/src/index.ts

@@ -972,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);
@@ -985,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);