@netless/window-manager 0.4.22 → 0.4.25

package/dist/index.d.ts

@@ -232,6 +232,7 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     refresh(): void;
     /** @inner */
     _refresh(): void;
+    setContainerSizeRatio(ratio: number): void;
     private isDynamicPPT;
     private ensureAttributes;
 }

package/dist/index.es.js

@@ -19,7 +19,7 @@ var __spreadValues = (a2, b2) => {
 var __spreadProps = (a2, b2) => __defProps(a2, __getOwnPropDescs(b2));
 import pRetry from "p-retry";
 import Emittery from "emittery";
-import { debounce, isEqual, omit, isObject, has, get, size as size$1, mapValues, noop as noop$1, pick, isEmpty, isInteger, orderBy, throttle, isFunction, isNull } from "lodash";
+import { debounce, isEqual, omit, isObject, has, get, size as size$1, mapValues, noop as noop$1, pick, isEmpty, isInteger, orderBy, isFunction, throttle, isNumber, isNull } from "lodash";
 import { ScenePathType, UpdateEventKind, listenUpdated, unlistenUpdated, reaction, autorun, toJS, listenDisposed, unlistenDisposed, AnimationMode, isPlayer, isRoom, WhiteVersion, ApplianceNames, RoomPhase, InvisiblePlugin, ViewMode } from "white-web-sdk";
 import { v4 } from "uuid";
 import { genUID, SideEffectManager } from "side-effect-manager";
@@ -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);
@@ -1629,6 +1644,13 @@ class MainViewProxy {
         this.moveCamera(this.mainViewCamera);
       }
     }, 30);
+    this.onUpdateContainerSizeRatio = () => {
+      const size2 = this.store.getMainViewSize();
+      this.sizeChangeHandler(size2);
+      if (size2.id === this.manager.uid) {
+        this.setCameraAndSize();
+      }
+    };
     this.onCameraUpdatedByDevice = (camera) => {
       this.store.setMainViewCamera(__spreadProps(__spreadValues({}, camera), { id: this.manager.uid }));
       if (!isEqual(this.mainViewSize, __spreadProps(__spreadValues({}, this.mainView.size), { id: this.manager.uid }))) {
@@ -1649,19 +1671,25 @@ 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);
     };
     this.sideEffectManager.add(() => {
-      emitter.on("playgroundSizeChange", playgroundSizeChangeListener);
-      return () => emitter.off("playgroundSizeChange", playgroundSizeChangeListener);
+      return emitter.on("playgroundSizeChange", playgroundSizeChangeListener);
+    });
+    this.sideEffectManager.add(() => {
+      return emitter.on("containerSizeRatioUpdate", this.onUpdateContainerSizeRatio);
     });
   }
+  ensureCameraAndSize() {
+    if (!this.mainViewCamera || !this.mainViewSize) {
+      this.manager.dispatchInternalEvent(Events.InitMainViewCamera);
+      this.setCameraAndSize();
+    }
+  }
   get mainViewCamera() {
     return this.store.getMainViewCamera();
   }
@@ -1681,8 +1709,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 +2079,7 @@ class AppManager {
       } else {
         this.mainView.disableCameraTransform = true;
       }
+      emitter.emit("writableChange", isWritable);
     };
     this.updateSceneIndex = () => {
       const scenePath = this.store.getMainViewScenePath();
@@ -2534,6 +2564,9 @@ class ContainerResizeObserver {
         this.emitter.emit("playgroundSizeChange", containerRect);
       }
     });
+    this.disposer = this.emitter.on("containerSizeRatioUpdate", () => {
+      this.updateSizer(container.getBoundingClientRect(), sizer, wrapper);
+    });
     this.containerResizeObserver.observe(container);
   }
   updateSizer({ width, height }, sizer, wrapper) {
@@ -2552,6 +2585,10 @@ class ContainerResizeObserver {
   disconnect() {
     var _a;
     (_a = this.containerResizeObserver) == null ? void 0 : _a.disconnect();
+    if (isFunction(this.disposer)) {
+      this.disposer();
+      this.disposer = void 0;
+    }
   }
 }
 var react = { exports: {} };
@@ -14847,14 +14884,14 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "0.4.22";
-    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.version = "0.4.25";
+    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/lodash": "^4.14.182", "@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", "jsdom": "^19.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", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.12.4", "white-web-sdk": "2.16.10" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;
     this.isReplay = isPlayer(this.displayer);
     this.containerSizeRatio = _WindowManager.containerSizeRatio;
     _WindowManager.displayer = context.displayer;
-    window.NETLESS_DEPS = { "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" } };
+    window.NETLESS_DEPS = { "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/lodash": "^4.14.182", "@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", "jsdom": "^19.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", "typescript": "^4.5.5", "vite": "^2.5.3", "vitest": "^0.12.4", "white-web-sdk": "2.16.10" } };
   }
   static async mount(params) {
     const room = params.room;
@@ -15453,6 +15490,14 @@ const _WindowManager = class extends InvisiblePlugin {
     }
     (_c = (_b = this.appManager) == null ? void 0 : _b.refresher) == null ? void 0 : _c.refresh();
   }
+  setContainerSizeRatio(ratio) {
+    if (!isNumber(ratio)) {
+      throw new Error(`[WindowManager]: updateContainerSizeRatio error, ratio must be a number. but got ${ratio}`);
+    }
+    _WindowManager.containerSizeRatio = ratio;
+    this.containerSizeRatio = ratio;
+    emitter.emit("containerSizeRatioUpdate", ratio);
+  }
   isDynamicPPT(scenes) {
     var _a, _b;
     const sceneSrc = (_b = (_a = scenes[0]) == null ? void 0 : _a.ppt) == null ? void 0 : _b.src;