@netless/window-manager 0.4.22 → 0.4.23

package/package.json

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

package/src/AppManager.ts

@@ -585,6 +585,7 @@ export class AppManager {
         } else {
             this.mainView.disableCameraTransform = true;
         }
+        emitter.emit("writableChange", isWritable);
     };
 
     public safeSetAttributes(attributes: any) {

package/src/AttributesDelegate.ts

@@ -38,6 +38,11 @@ export type StoreContext = {
     safeUpdateAttributes: (keys: string[], value: any) => void;
     safeSetAttributes: (attributes: any) => void;
 }
+
+export type ICamera = Camera & { id: string };
+
+export type ISize = Size & { id: string };
+
 export class AttributesDelegate {
 
     constructor(private context: StoreContext) {}
@@ -152,14 +157,21 @@ export class AttributesDelegate {
         return get(this.attributes, [Fields.MainViewSize]);
     }
 
-    public setMainViewCamera(camera: (Camera & { id: string }) | undefined) {
+    public setMainViewCamera(camera: ICamera) {
         this.context.safeSetAttributes({ [Fields.MainViewCamera]: { ...camera } });
     }
 
-    public setMainViewSize(size: (Size & { id: string }) | undefined) {
+    public setMainViewSize(size: ISize) {
         this.context.safeSetAttributes({ [Fields.MainViewSize]: { ...size } });
     }
 
+    public setMainViewCameraAndSize(camera: ICamera, size: ISize) {
+        this.context.safeSetAttributes({
+            [Fields.MainViewCamera]: { ...camera },
+            [Fields.MainViewSize]: { ...size },
+        });
+    }
+
     public setAppFocus = (appId: string, focus: boolean) => {
         if (focus) {
             this.context.safeSetAttributes({ [Fields.Focus]: appId });

package/src/InternalEmitter.ts

@@ -24,6 +24,7 @@ export type EmitterEvent = {
     rootDirRemoved: undefined;
     setReadonly: boolean;
     changePageState: undefined;
+    writableChange: boolean;
 };
 
 export type EmitterType = Emittery<EmitterEvent>;

package/src/View/MainView.ts

@@ -25,10 +25,8 @@ export class MainViewProxy {
         emitter.once("mainViewMounted").then(() => {
             this.addMainViewListener();
             this.start();
-            if (!this.mainViewCamera || !this.mainViewSize) {
-                manager.dispatchInternalEvent(Events.InitMainViewCamera)
-                this.setCameraAndSize();
-            }
+            this.ensureCameraAndSize();
+            this.startListenWritableChange();
         });
         const playgroundSizeChangeListener = () => {
             this.sizeChangeHandler(this.mainViewSize);
@@ -39,6 +37,23 @@ export class MainViewProxy {
         });
     }
 
+    private startListenWritableChange = () => {
+        this.sideEffectManager.add(() => {
+            return emitter.on("writableChange", isWritable => {
+                if (isWritable) {
+                    this.ensureCameraAndSize();
+                }
+            });
+        });
+    }
+
+    public ensureCameraAndSize() {
+        if (!this.mainViewCamera || !this.mainViewSize) {
+            this.manager.dispatchInternalEvent(Events.InitMainViewCamera);
+            this.setCameraAndSize();
+        }
+    }
+
     private get mainViewCamera() {
         return this.store.getMainViewCamera();
     }
@@ -62,11 +77,12 @@ export class MainViewProxy {
 
     public addCameraReaction = () => {
         this.manager.refresher?.add(Fields.MainViewCamera, this.cameraReaction);
-    }
+    };
 
     public setCameraAndSize(): void {
-        this.store.setMainViewCamera({ ...this.mainView.camera, id: this.manager.uid });
-        this.store.setMainViewSize({ ...this.mainView.size, id: this.manager.uid });
+        const camera = { ...this.mainView.camera, id: this.manager.uid };
+        const size = { ...this.mainView.size, id: this.manager.uid };
+        this.store.setMainViewCameraAndSize(camera, size);
     }
 
     private cameraReaction = () => {
@@ -77,7 +93,8 @@ export class MainViewProxy {
                     this.moveCameraToContian(this.mainViewSize);
                     this.moveCamera(camera);
                 }
-            }, { fireImmediately: true }
+            },
+            { fireImmediately: true }
         );
     };