@netless/window-manager 0.4.22 → 0.4.23

package/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 0.4.23
+
+1. 修复可写进入立即切换成只读造成初始化 camera 失败的问题
+
 ## 0.4.22
 
-1. 修复只读端先加入时视角初次视角跟随失败的问题
+1. 修复只读端先加入时视角跟随失败的问题
 
 ## 0.4.21
 

package/dist/AttributesDelegate.d.ts

@@ -31,6 +31,12 @@ export declare type StoreContext = {
     safeUpdateAttributes: (keys: string[], value: any) => void;
     safeSetAttributes: (attributes: any) => void;
 };
+export declare type ICamera = Camera & {
+    id: string;
+};
+export declare type ISize = Size & {
+    id: string;
+};
 export declare class AttributesDelegate {
     private context;
     constructor(context: StoreContext);
@@ -55,12 +61,9 @@ export declare class AttributesDelegate {
     setMainViewSceneIndex(index: number): void;
     getMainViewCamera(): MainViewCamera;
     getMainViewSize(): MainViewSize;
-    setMainViewCamera(camera: (Camera & {
-        id: string;
-    }) | undefined): void;
-    setMainViewSize(size: (Size & {
-        id: string;
-    }) | undefined): void;
+    setMainViewCamera(camera: ICamera): void;
+    setMainViewSize(size: ISize): void;
+    setMainViewCameraAndSize(camera: ICamera, size: ISize): void;
     setAppFocus: (appId: string, focus: boolean) => void;
     updateCursor(uid: string, position: Position): void;
     updateCursorState(uid: string, cursorState: string | undefined): void;

package/dist/InternalEmitter.d.ts

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

package/dist/View/MainView.d.ts

@@ -9,6 +9,8 @@ export declare class MainViewProxy {
     private store;
     private sideEffectManager;
     constructor(manager: AppManager);
+    private startListenWritableChange;
+    ensureCameraAndSize(): void;
     private get mainViewCamera();
     private get mainViewSize();
     private moveCameraSizeByAttributes;

package/dist/index.es.js

@@ -1153,6 +1153,12 @@ class AttributesDelegate {
   setMainViewSize(size2) {
     this.context.safeSetAttributes({ ["mainViewSize"]: __spreadValues({}, size2) });
   }
+  setMainViewCameraAndSize(camera, size2) {
+    this.context.safeSetAttributes({
+      ["mainViewCamera"]: __spreadValues({}, camera),
+      ["mainViewSize"]: __spreadValues({}, size2)
+    });
+  }
   updateCursor(uid, position) {
     if (!get(this.attributes, ["cursors"])) {
       this.context.safeUpdateAttributes(["cursors"], {});
@@ -1611,6 +1617,15 @@ class MainViewProxy {
     this.mainViewIsAddListener = false;
     this.store = this.manager.store;
     this.sideEffectManager = new SideEffectManager();
+    this.startListenWritableChange = () => {
+      this.sideEffectManager.add(() => {
+        return emitter.on("writableChange", (isWritable) => {
+          if (isWritable) {
+            this.ensureCameraAndSize();
+          }
+        });
+      });
+    };
     this.addCameraReaction = () => {
       var _a;
       (_a = this.manager.refresher) == null ? void 0 : _a.add(Fields.MainViewCamera, this.cameraReaction);
@@ -1649,10 +1664,8 @@ 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);
@@ -1662,6 +1675,12 @@ class MainViewProxy {
       return () => emitter.off("playgroundSizeChange", playgroundSizeChangeListener);
     });
   }
+  ensureCameraAndSize() {
+    if (!this.mainViewCamera || !this.mainViewSize) {
+      this.manager.dispatchInternalEvent(Events.InitMainViewCamera);
+      this.setCameraAndSize();
+    }
+  }
   get mainViewCamera() {
     return this.store.getMainViewCamera();
   }
@@ -1681,8 +1700,9 @@ class MainViewProxy {
     this.started = true;
   }
   setCameraAndSize() {
-    this.store.setMainViewCamera(__spreadProps(__spreadValues({}, this.mainView.camera), { id: this.manager.uid }));
-    this.store.setMainViewSize(__spreadProps(__spreadValues({}, this.mainView.size), { id: this.manager.uid }));
+    const camera = __spreadProps(__spreadValues({}, this.mainView.camera), { id: this.manager.uid });
+    const size2 = __spreadProps(__spreadValues({}, this.mainView.size), { id: this.manager.uid });
+    this.store.setMainViewCameraAndSize(camera, size2);
   }
   get view() {
     return this.mainView;
@@ -2050,6 +2070,7 @@ class AppManager {
       } else {
         this.mainView.disableCameraTransform = true;
       }
+      emitter.emit("writableChange", isWritable);
     };
     this.updateSceneIndex = () => {
       const scenePath = this.store.getMainViewScenePath();
@@ -14847,7 +14868,7 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "0.4.22";
+    this.version = "0.4.23";
     this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "0.2.26", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^0.1.5", "uuid": "^7.0.3", "video.js": ">=7" }, "peerDependencies": { "white-web-sdk": "^2.16.0" }, "devDependencies": { "@netless/app-docs-viewer": "^0.2.9", "@netless/app-media-player": "0.1.0-beta.5", "@rollup/plugin-commonjs": "^20.0.0", "@rollup/plugin-node-resolve": "^13.0.4", "@rollup/plugin-url": "^6.1.0", "@sveltejs/vite-plugin-svelte": "^1.0.0-next.22", "@tsconfig/svelte": "^2.0.1", "@types/debug": "^4.1.7", "@types/jest": "^27.4.1", "@types/lodash-es": "^4.17.4", "@types/uuid": "^8.3.1", "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.30.0", "cypress": "^8.7.0", "dotenv": "^10.0.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^3.2.0", "jest": "^27.5.1", "jest-canvas-mock": "^2.3.1", "jest-fetch-mock": "^3.0.3", "jest-transform-stub": "^2.0.0", "less": "^4.1.1", "prettier": "^2.3.2", "prettier-plugin-svelte": "^2.4.0", "rollup-plugin-analyzer": "^4.0.0", "rollup-plugin-styles": "^3.14.1", "svelte": "^3.42.4", "svelte-jester": "^2.3.2", "ts-jest": "^27.1.4", "typescript": "^4.5.5", "vite": "^2.5.3", "white-web-sdk": "2.16.10" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;