@netless/window-manager 0.3.16-canary.0 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netless/window-manager",
-  "version": "0.3.16-canary.0",
+  "version": "0.3.16",
   "description": "",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",

package/src/AppManager.ts

@@ -395,6 +395,9 @@ export class AppManager {
                 if (appProxy) {
                     appProxy.destroy(false, true, payload.error);
                 }
+                if (this.boxManager.maximized) {
+                    this.boxManager.focusTopBox();
+                }
                 break;
             }
             case "boxStateChange": {

package/src/BoxManager.ts

@@ -268,8 +268,8 @@ export class BoxManager {
         this.teleBoxManager.update(appId, { x, y }, true);
     }
 
-    public focusBox({ appId }: AppId): void {
-        this.teleBoxManager.update(appId, { focus: true }, true);
+    public focusBox({ appId }: AppId, skipUpdate = true): void {
+        this.teleBoxManager.update(appId, { focus: true }, skipUpdate);
     }
 
     public resizeBox({ appId, width, height, skipUpdate }: ResizeBoxParams): void {
@@ -315,6 +315,16 @@ export class BoxManager {
         this.teleBoxManager.setMinimized(minimized, skipUpdate);
     }
 
+    public focusTopBox(): void {
+        const boxes = this.teleBoxManager.query();
+        if (boxes.length >= 1) {
+            const box = this.getTopBox();
+            if (box) {
+                this.focusBox({ appId: box.id }, false);
+            }
+        }
+    }
+
     public setReadonly(readonly: boolean) {
         this.teleBoxManager.setReadonly(readonly);
     }

package/src/MainView.ts

@@ -24,8 +24,14 @@ export class MainViewProxy extends Base {
         emitter.once("mainViewMounted").then(() => {
             setTimeout(() => {
                 this.start();
+                if (!this.mainViewCamera || !this.mainViewSize) {
+                    this.setCameraAndSize();
+                }
             }, 200); // 等待 mainView 挂载完毕再进行监听，否则会触发不必要的 onSizeUpdated
         });
+        emitter.on("playgroundSizeChange", () => {
+            this.sizeChangeHandler(this.mainViewSize);
+        });
     }
 
     private get mainViewCamera() {
@@ -43,10 +49,9 @@ export class MainViewProxy extends Base {
 
     public start() {
         if (this.started) return;
+        this.sizeChangeHandler(this.mainViewSize);
         this.addCameraListener();
         this.manager.refresher?.add(Fields.MainViewCamera, this.cameraReaction);
-        this.manager.refresher?.add(Fields.MainViewSize, this.sizeReaction);
-        this.view.callbacks.on("onSizeUpdated", this.sizeListener);
         this.started = true;
     }
 
@@ -60,6 +65,7 @@ export class MainViewProxy extends Base {
             () => this.mainViewCamera,
             camera => {
                 if (camera && camera.id !== this.context.uid) {
+                    this.moveCameraToContian(this.mainViewSize);
                     this.moveCamera(camera);
                 }
             },
@@ -69,20 +75,12 @@ export class MainViewProxy extends Base {
         );
     };
 
-    private sizeReaction = () => {
-        return reaction(
-            () => this.mainViewSize,
-            size => {
-                if (size && size.id !== this.context.uid) {
-                    this.moveCameraToContian(size);
-                    this.moveCamera(this.mainViewCamera);
-                }
-            },
-            {
-                fireImmediately: true,
-            }
-        );
-    };
+    private sizeChangeHandler =  debounce((size: Size) => {
+        if (size) {
+            this.moveCameraToContian(size);
+            this.moveCamera(this.mainViewCamera);
+        }
+    }, 30);
 
     public get view(): View {
         return this.mainView;
@@ -104,9 +102,9 @@ export class MainViewProxy extends Base {
         return mainView;
     }
 
-    private cameraListener = (camera: Camera) => {
+    private onCameraUpdatedByDevice = (camera: Camera) => {
         this.store.setMainViewCamera({ ...camera, id: this.context.uid });
-        if (this.store.getMainViewSize()?.id !== this.context.uid) {
+        if (!isEqual(this.mainViewSize, {...this.mainView.size, id: this.context.uid})) {
             this.setMainViewSize(this.view.size);
         }
     };
@@ -138,28 +136,25 @@ export class MainViewProxy extends Base {
         this.context.blurFocusBox();
     }
 
-    private sizeListener = (size: Size) => {
-        this.setMainViewSize(size);
-        callbacks.emit("cameraStateChange", this.cameraState);
-    };
-
     public setMainViewSize = debounce(size => {
         this.store.setMainViewSize({ ...size, id: this.context.uid });
     }, 50);
 
     private addCameraListener() {
-        this.view.callbacks.on("onCameraUpdatedByDevice", this.cameraListener);
-        this.view.callbacks.on("onCameraUpdated", this.cameraStateChangeListener);
+        this.view.callbacks.on("onCameraUpdatedByDevice", this.onCameraUpdatedByDevice);
+        this.view.callbacks.on("onCameraUpdated", this.onCameraOrSizeUpdated);
+        this.view.callbacks.on("onSizeUpdated", this.onCameraOrSizeUpdated);
     }
 
     private removeCameraListener() {
-        this.view.callbacks.off("onCameraUpdatedByDevice", this.cameraListener);
-        this.view.callbacks.off("onCameraUpdated", this.cameraStateChangeListener)
+        this.view.callbacks.off("onCameraUpdatedByDevice", this.onCameraUpdatedByDevice);
+        this.view.callbacks.off("onCameraUpdated", this.onCameraOrSizeUpdated);
+        this.view.callbacks.off("onSizeUpdated", this.onCameraOrSizeUpdated);
     }
 
-    private cameraStateChangeListener = () => {
+    private onCameraOrSizeUpdated = () => {
         callbacks.emit("cameraStateChange", this.cameraState);
-    }
+    };
 
     public switchViewModeToWriter(): void {
         if (!this.manager.canOperate) return;
@@ -203,7 +198,6 @@ export class MainViewProxy extends Base {
         this.removeCameraListener();
         this.manager.refresher?.remove(Fields.MainViewCamera);
         this.manager.refresher?.remove(Fields.MainViewSize);
-        this.view.callbacks.off("onSizeUpdated", this.sizeListener);
         this.started = false;
     }
 

package/src/index.ts

@@ -135,6 +135,7 @@ export type EmitterEvent = {
     mainViewMounted: undefined;
     observerIdChange: number;
     boxStateChange: string;
+    playgroundSizeChange: DOMRect;
 };
 
 export const emitter: Emittery<EmitterEvent> = new Emittery();
@@ -175,7 +176,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
     public static containerSizeRatio = DEFAULT_CONTAINER_RATIO;
     private static isCreated = false;
 
-    public version = "0.3.16-canary.0";
+    public version = "0.3.16";
 
     public appListeners?: AppListeners;
 
@@ -700,6 +701,7 @@ export class WindowManager extends InvisiblePlugin<WindowMangerAttributes> {
                 this.updateSizer(containerRect, sizer, wrapper);
                 this.cursorManager?.updateContainerRect();
                 this.appManager?.boxManager.updateManagerRect();
+                emitter.emit("playgroundSizeChange", containerRect);
             }
         });