@netless/window-manager 1.0.0-canary.16 → 1.0.0-canary.19

package/dist/index.d.ts

@@ -81,6 +81,8 @@ export declare type MountParams = {
     container?: HTMLElement;
     /** 白板高宽比例, 默认为 9 / 16 */
     containerSizeRatio?: number;
+    /** @deprecated */
+    chessboard?: boolean;
     /** 是否高亮显示同步区域, 默认为 true */
     highlightStage?: boolean;
     collectorContainer?: HTMLElement;
@@ -243,6 +245,11 @@ export declare class WindowManager extends InvisiblePlugin<WindowMangerAttribute
     /** @inner */
     _refresh(): void;
     setContainerSizeRatio(ratio: number): void;
+    createPPTHandler(): {
+        onPageJumpTo: (_pptUUID: string, index: number) => void;
+        onPageToNext: () => void;
+        onPageToPrev: () => void;
+    };
     private isDynamicPPT;
     private ensureAttributes;
 }

package/dist/index.es.js

@@ -1070,7 +1070,7 @@ class AppContext {
       (_a = this.room) == null ? void 0 : _a.putScenes(this.appProxy.scenePath, scenes);
     };
     this.getInitScenePath = () => {
-      return this.manager.getAppInitPath(this.appId);
+      return this.appProxy.scenePath;
     };
     this.setAttributes = (attributes) => {
       this.manager.safeSetAttributes({ [this.appId]: attributes });
@@ -1228,12 +1228,17 @@ class CameraSynchronizer {
         const nextScale = camera.scale * scale2;
         const moveCamera = () => {
           var _a;
-          (_a = this.view) == null ? void 0 : _a.moveCamera({
-            centerX: camera.centerX,
-            centerY: camera.centerY,
+          const config = {
             scale: nextScale,
             animationMode: AnimationMode.Immediately
-          });
+          };
+          if (camera.centerX !== null) {
+            config.centerX = camera.centerX;
+          }
+          if (camera.centerY !== null) {
+            config.centerY = camera.centerY;
+          }
+          (_a = this.view) == null ? void 0 : _a.moveCamera(config);
         };
         moveCamera();
         delay(moveCamera, 50);
@@ -1280,7 +1285,7 @@ class ViewSync {
       }, "view");
     };
     this.onCameraUpdatedByDevice = (camera) => {
-      this.synchronizer.onLocalCameraUpdate(camera);
+      this.synchronizer.onLocalCameraUpdate(Object.assign(camera, { id: this.context.uid }));
       const stage = this.context.stageRect$.value;
       if (stage) {
         const size2 = { width: stage.width, height: stage.height, id: this.context.uid };
@@ -1290,15 +1295,12 @@ class ViewSync {
       }
     };
     this.synchronizer = new CameraSynchronizer((camera) => {
-      const iCamera = __spreadValues({
-        id: this.context.uid
-      }, camera);
-      this.context.camera$.setValue(iCamera, true);
+      this.context.camera$.setValue(camera, true);
       const notStoreCamera = this.context.viewMode$ && this.context.viewMode$.value === ViewMode.Freedom;
       if (notStoreCamera) {
         return;
       } else {
-        this.context.storeCamera(iCamera);
+        this.context.storeCamera(camera);
       }
     });
     this.bindView(this.context.view$.value);
@@ -1324,16 +1326,13 @@ class ViewSync {
         this.synchronizer.onRemoteSizeUpdate(size2);
       }
     }));
-    if (this.context.stageRect$.value) {
-      this.synchronizer.setRect(this.context.stageRect$.value);
-      this.sem.add(() => this.context.stageRect$.subscribe((rect) => {
-        if (rect) {
-          this.synchronizer.setRect(rect);
-        }
-      }));
-    }
+    this.sem.add(() => this.context.stageRect$.reaction((rect) => {
+      if (rect) {
+        this.synchronizer.setRect(rect);
+      }
+    }));
     const camera$size$ = combine([this.context.camera$, this.context.size$]);
-    camera$size$.subscribe(([camera, size2]) => {
+    camera$size$.reaction(([camera, size2]) => {
       if (camera && size2) {
         this.synchronizer.onRemoteUpdate(camera, size2);
         camera$size$.destroy();
@@ -1745,8 +1744,8 @@ class AppProxy {
       if (box && view) {
         if (!this.camera$.value) {
           this.storeCamera({
-            centerX: 0,
-            centerY: 0,
+            centerX: null,
+            centerY: null,
             scale: 1,
             id: this.uid
           });
@@ -1907,12 +1906,14 @@ class AppProxy {
     var _a, _b;
     const box = (_a = this.boxManager) == null ? void 0 : _a.getBox(this.id);
     if (box) {
-      (_b = this.boxManager) == null ? void 0 : _b.resizeBox({
-        appId: this.id,
-        width: box.intrinsicWidth + 1e-3,
-        height: box.intrinsicHeight + 1e-3,
-        skipUpdate: true
-      });
+      if (!box.minimized) {
+        (_b = this.boxManager) == null ? void 0 : _b.resizeBox({
+          appId: this.id,
+          width: box.intrinsicWidth + 1e-3,
+          height: box.intrinsicHeight + 1e-3,
+          skipUpdate: true
+        });
+      }
     }
   }
   async onSeek(time2) {
@@ -2091,6 +2092,8 @@ class AppProxy {
     this.manager.refresher.remove(this.id);
     this.manager.refresher.remove(this.stateKey);
     this.manager.refresher.remove(`${this.id}-fullPath`);
+    this.manager.refresher.remove(`${this.id}-camera`);
+    this.manager.refresher.remove(`${this.id}-size`);
     this.valManager.destroy();
   }
   close() {
@@ -2248,6 +2251,14 @@ class MainViewProxy {
       })
     ]);
     this.createViewSync();
+    this.sideEffectManager.add(() => emitter.on("focusedChange", ({ focused }) => {
+      if (focused === void 0) {
+        const scenePath = this.store.getMainViewScenePath();
+        if (scenePath) {
+          setScenePath(this.manager.room, scenePath);
+        }
+      }
+    }));
   }
   ensureCameraAndSize() {
     var _a;
@@ -2677,7 +2688,6 @@ class AppManager {
       if (sceneState) {
         const scenePath = sceneState.scenePath;
         this.appProxies.forEach((appProxy) => {
-          console.log("scenePath", scenePath, appProxy.scenePath);
           if (appProxy.scenePath && scenePath.startsWith(appProxy.scenePath)) {
             appProxy.emitAppSceneStateChange(sceneState);
             appProxy.setFullPath(scenePath);
@@ -4262,13 +4272,19 @@ class Y$3 {
     const o2 = document.createElement("div");
     o2.className = this.wrapClassName("content-wrap");
     const r2 = document.createElement("div");
-    r2.className = this.wrapClassName("content") + " tele-fancy-scrollbar", this.$content = r2, this._sideEffect.add(() => {
+    r2.className = this.wrapClassName("content") + " tele-fancy-scrollbar", this.$content = r2;
+    const h = () => {
+      const e3 = r2.getBoundingClientRect();
+      this._contentRect$.setValue({ x: 0, y: 0, width: e3.width, height: e3.height });
+    };
+    this._sideEffect.add(() => {
       const e3 = new W$3(() => {
-        const e4 = r2.getBoundingClientRect();
-        this._contentRect$.setValue({ x: 0, y: 0, width: e4.width, height: e4.height });
+        this.minimized || h();
       });
       return e3.observe(r2), () => e3.disconnect();
-    }), this._sideEffect.add(() => {
+    }), this._sideEffect.addDisposer(this._minimized$.reaction((e3) => {
+      e3 || this._sideEffect.setTimeout(h, 400, "minimized-content-rect-fix");
+    })), this._sideEffect.add(() => {
       let e3;
       return this._$userStyles$.subscribe((t3) => {
         e3 && e3.remove(), e3 = t3, t3 && o2.appendChild(t3);
@@ -4294,13 +4310,13 @@ class Y$3 {
           ((i3 = this.$stage) == null ? void 0 : i3.parentElement) && this.$stage.remove();
       });
     }), o2.appendChild(r2);
-    const h = document.createElement("div");
-    return h.className = this.wrapClassName("footer-wrap"), this.$footer = h, this._sideEffect.add(() => {
+    const c = document.createElement("div");
+    return c.className = this.wrapClassName("footer-wrap"), this.$footer = c, this._sideEffect.add(() => {
       let e3;
       return this._$userFooter$.subscribe((t3) => {
-        e3 && e3.remove(), e3 = t3, t3 && h.appendChild(t3);
+        e3 && e3.remove(), e3 = t3, t3 && c.appendChild(t3);
       });
-    }), a2.appendChild(n2), a2.appendChild(o2), a2.appendChild(h), this._renderResizeHandlers(), this.$box;
+    }), a2.appendChild(n2), a2.appendChild(o2), a2.appendChild(c), this._renderResizeHandlers(), this.$box;
   }
   _renderResizeHandlers() {
     const e2 = document.createElement("div");
@@ -5928,7 +5944,7 @@ class ReconnectRefresher {
     };
     this.onReconnected = debounce(() => {
       this._onReconnected();
-    }, 3e3);
+    }, 1e3);
     this._onReconnected = () => {
       log("onReconnected refresh reactors");
       this.releaseDisposers();
@@ -6048,6 +6064,9 @@ const replaceRoomFunction = (room, manager) => {
     room.lockImage = (...args) => manager.lockImage(...args);
     room.lockImages = (...args) => manager.lockImages(...args);
     delegateRemoveScenes(room, manager);
+    if (!room.dynamicPpt.slideStateAdapter.pptHandler) {
+      room.dynamicPpt.slideStateAdapter.pptHandler = manager.createPPTHandler();
+    }
   }
 };
 const delegateRemoveScenes = (room, manager) => {
@@ -15602,15 +15621,15 @@ const reconnectRefresher = new ReconnectRefresher({ emitter });
 const _WindowManager = class extends InvisiblePlugin {
   constructor(context) {
     super(context);
-    this.version = "1.0.0-canary.16";
-    this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "1.0.0-alpha.17", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^1.1.0", "uuid": "^7.0.3", "value-enhancer": "^1.3.0", "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", "@vitest/ui": "^0.14.1", "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.14.1", "white-web-sdk": "2.16.10" } };
+    this.version = "1.0.0-canary.19";
+    this.dependencies = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "1.0.0-alpha.18", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^1.1.0", "uuid": "^7.0.3", "value-enhancer": "^1.3.0", "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", "@vitest/ui": "^0.14.1", "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.14.1", "white-web-sdk": "2.16.10" } };
     this.emitter = callbacks$1;
     this.viewMode = ViewMode.Broadcaster;
     this.viewMode$ = new Val(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": "1.0.0-alpha.17", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^1.1.0", "uuid": "^7.0.3", "value-enhancer": "^1.3.0", "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", "@vitest/ui": "^0.14.1", "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.14.1", "white-web-sdk": "2.16.10" } };
+    window.NETLESS_DEPS = { "dependencies": { "@juggle/resize-observer": "^3.3.1", "@netless/telebox-insider": "1.0.0-alpha.18", "emittery": "^0.9.2", "lodash": "^4.17.21", "p-retry": "^4.6.1", "side-effect-manager": "^1.1.0", "uuid": "^7.0.3", "value-enhancer": "^1.3.0", "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", "@vitest/ui": "^0.14.1", "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.14.1", "white-web-sdk": "2.16.10" } };
   }
   static async mount(params) {
     var _a;
@@ -16242,6 +16261,26 @@ const _WindowManager = class extends InvisiblePlugin {
     this.containerSizeRatio = ratio;
     emitter.emit("containerSizeRatioUpdate", ratio);
   }
+  createPPTHandler() {
+    return {
+      onPageJumpTo: (_pptUUID, index2) => {
+        var _a, _b, _c, _d;
+        (_d = (_c = (_b = (_a = this.appManager) == null ? void 0 : _a.focusApp) == null ? void 0 : _b.appContext) == null ? void 0 : _c.whiteBoardView) == null ? void 0 : _d.jumpPage(index2);
+      },
+      onPageToNext: () => {
+        var _a, _b, _c, _d;
+        if (this.focused) {
+          (_d = (_c = (_b = (_a = this.appManager) == null ? void 0 : _a.focusApp) == null ? void 0 : _b.appContext) == null ? void 0 : _c.whiteBoardView) == null ? void 0 : _d.nextPage();
+        }
+      },
+      onPageToPrev: () => {
+        var _a, _b, _c, _d;
+        if (this.focused) {
+          (_d = (_c = (_b = (_a = this.appManager) == null ? void 0 : _a.focusApp) == null ? void 0 : _b.appContext) == null ? void 0 : _c.whiteBoardView) == null ? void 0 : _d.prevPage();
+        }
+      }
+    };
+  }
   isDynamicPPT(scenes) {
     var _a, _b;
     const sceneSrc = (_b = (_a = scenes[0]) == null ? void 0 : _a.ppt) == null ? void 0 : _b.src;