@netless/app-slide 0.2.105 → 0.2.106-beta.1

package/dist/main.es.js

@@ -38722,25 +38722,42 @@ geometry=${JSON.stringify(o2)}`;
   }(), mw = function() {
     function t2() {
       var t3 = this;
-      this.tasks = [], this.isDestroy = false, this.isScheduling = false, this.schedule = function() {
-        t3.isScheduling = true;
-        var e2 = t3.tasks.shift();
-        e2 && !t3.isDestroy && (e2.status = "running", e2.fn.apply(null).then(function() {
-          t3.tasks.length > 0 ? setTimeout(t3.schedule) : t3.isScheduling = false;
-        }).catch(function() {
-          t3.tasks.length > 0 ? setTimeout(t3.schedule) : t3.isScheduling = false;
-        }));
+      this.tasks = [], this.isDestroy = false, this.schedule = function() {
+        if (!t3.runningTask && !t3.isDestroy) {
+          var e2 = t3.tasks.shift();
+          e2 && (e2.status = "running", t3.runningTask = e2, e2.fn.apply(null).then(e2.resolve, e2.reject).finally(function() {
+            t3.runningTask === e2 && (t3.runningTask = void 0), !t3.isDestroy && t3.tasks.length > 0 && setTimeout(t3.schedule);
+          }));
+        }
       };
     }
     return t2.prototype.getRunningTask = function() {
-      return this.tasks[0] && "running" === this.tasks[0].status ? this.tasks[0] : null;
+      var t3;
+      return null !== (t3 = this.runningTask) && void 0 !== t3 ? t3 : null;
     }, t2.prototype.addTask = function(t3, e2) {
-      var i2 = { type: t3, status: "wait", fn: e2 }, n2 = this.getRunningTask();
-      n2 && t3 === n2.type || (this.tasks = this.tasks.filter(function(e3) {
-        return e3.type !== t3;
-      }), this.tasks.push(i2), this.isScheduling || this.schedule());
+      if (this.isDestroy)
+        return Promise.resolve();
+      var i2 = this.getRunningTask();
+      if (i2 && t3 === i2.type)
+        return i2.promise;
+      var n2, r2, o2 = this.tasks.find(function(e3) {
+        return e3.type === t3;
+      });
+      if (o2)
+        return o2.promise;
+      var s2 = new Promise(function(t4, e3) {
+        n2 = t4, r2 = e3;
+      });
+      s2.catch(function() {
+      });
+      var a2 = { type: t3, status: "wait", fn: e2, promise: s2, resolve: n2, reject: r2 };
+      return this.tasks.push(a2), this.schedule(), s2;
     }, t2.prototype.destroy = function() {
-      this.isDestroy = true;
+      var t3, e2;
+      return this.isDestroy = true, this.tasks.splice(0, this.tasks.length).forEach(function(t4) {
+        return t4.resolve();
+      }), null !== (e2 = null === (t3 = this.runningTask) || void 0 === t3 ? void 0 : t3.promise.catch(function() {
+      })) && void 0 !== e2 ? e2 : Promise.resolve();
     }, t2;
   }(), gw = function() {
     return (gw = Object.assign || function(t2) {
@@ -39422,7 +39439,7 @@ geometry=${JSON.stringify(o2)}`;
   }
   var Nw = { syncDispatch: "syncDispatch", syncReceive: "syncReceive", syncEventLag: "syncEventLag", renderStart: "renderStart", renderEnd: "renderEnd", renderError: "renderError", slideChange: "slideChange", mainSeqStepStart: "mainSeqStepStart", mainSeqStepEnd: "mainSeqStepEnd", animateStart: "animateStart", animateEnd: "animateEnd", stateChange: "stateChange", slideStepEnd: "slideEnd", slideStepStart: "slideStart", useraddLink: "useraddLink" }, Dw = { taskId: "", url: "", currentSlideIndex: -1, mainSeqStep: -1, mainSeqState: null, mediaState: /* @__PURE__ */ Object.create(null), interactiveSeqState: /* @__PURE__ */ Object.create(null) }, Fw = "";
   try {
-    Fw = "1.4.60";
+    Fw = "1.4.61-beta.0";
   } catch (t2) {
     Fw = "-dev-";
   }
@@ -40181,21 +40198,23 @@ geometry=${JSON.stringify(o2)}`;
             case 0:
               return this.logger.info("do frozen with player[" + !!this.player + "]", this.taskId), this.tracker({ name: "frozenSlide", reason: "", result: "", payload: { taskId: this.taskId } }), this.view && this.player ? [4, (i3 = this.player).waitUntilActive(function() {
                 return !s2.isLoading;
-              }, 6e4)] : [3, 2];
+              }, 6e4)] : [3, 3];
             case 1:
               if (a2.sent(), "alive" !== this.lifecycle || this.player !== i3)
                 return [2];
               for (r3 in n2 = i3.getSnapshot() || "", this.cacheImage.src = n2, this.cacheImage.style.display = "block", "hidden" === this.frame.style.visibility && (this.frame.style.visibility = "visible"), i3.destroy(), null === (e3 = this.playerController) || void 0 === e3 || e3.destroy(), this.player = void 0, this.pptMediaPermissionNotified = false, this.__slideState.mediaState)
                 o2 = this.__slideState.mediaState[r3], this.__slideState.mediaState[r3] = Ew(Ew({}, o2), { frozenTime: this.timestamp() });
-              a2.label = 2;
+              return [4, ww(eb.platform)];
             case 2:
+              a2.sent(), a2.label = 3;
+            case 3:
               return t3 && t3(), [2];
           }
         });
       });
     }, e2.prototype.frozen = function(t3) {
       var e3 = this;
-      this.frozenTaskManager.addTask("frozen", function() {
+      return this.frozenTaskManager.addTask("frozen", function() {
         return e3._doFrozen(t3);
       });
     }, e2.prototype._doRelease = function(t3) {
@@ -40211,7 +40230,9 @@ geometry=${JSON.stringify(o2)}`;
             case 1:
               return a2.trys.push([1, , 5, 6]), [4, ww(eb.platform)];
             case 2:
-              for (r3 in a2.sent(), this.player = this.initPlayer(this.config), (null === (e3 = this.config) || void 0 === e3 ? void 0 : e3.controller) && this.createController(), this.player.view && (this.canvasContainer.appendChild(this.player.view), this.player.view.style.visibility = "hidden"), n2 = this.__slideState, this.__slideState = hb()(Dw), n2.mediaState)
+              if (a2.sent(), "alive" !== this.lifecycle || this.player)
+                return [2];
+              for (r3 in this.player = this.initPlayer(this.config), (null === (e3 = this.config) || void 0 === e3 ? void 0 : e3.controller) && this.createController(), this.player.view && (this.canvasContainer.appendChild(this.player.view), this.player.view.style.visibility = "hidden"), n2 = this.__slideState, this.__slideState = hb()(Dw), n2.mediaState)
                 "play" === (o2 = n2.mediaState[r3]).type && (s2 = Math.max(null !== (i3 = o2.frozenTime) && void 0 !== i3 ? i3 : 0, o2.time), o2.time = this.timestamp() - (s2 - o2.time), o2.frozenTime = void 0);
               return [4, this.setSlideState(n2)];
             case 3:
@@ -40227,7 +40248,7 @@ geometry=${JSON.stringify(o2)}`;
       });
     }, e2.prototype.release = function(t3) {
       var e3 = this;
-      this.frozenTaskManager.addTask("release", function() {
+      return this.frozenTaskManager.addTask("release", function() {
         return e3._doRelease(t3);
       });
     }, e2.prototype._doDestroy = function() {
@@ -40280,11 +40301,27 @@ geometry=${JSON.stringify(o2)}`;
       return this.player ? this.player.preloadResource(t3) : Promise.resolve();
     }, e2.prototype.destroy = function() {
       var t3, e3 = this;
-      "alive" === this.lifecycle && (this.lifecycle = "disposing", this.lifecycleGeneration += 1, this.renderVisibilityTimers.forEach(function(t4) {
+      return "disposed" === this.lifecycle ? Promise.resolve() : (this.destroyPromise || (this.lifecycle = "disposing", this.lifecycleGeneration += 1, this.renderVisibilityTimers.forEach(function(t4) {
         return clearTimeout(t4);
-      }), this.renderVisibilityTimers.clear(), this.renderingTaskManager.destroy(), null === (t3 = this.player) || void 0 === t3 || t3.destroy(), this.logger.info("pre destroy slide", ""), this.isLoading ? this.waitLoadEnd().then(function() {
-        e3._doDestroy();
-      }) : this._doDestroy());
+      }), this.renderVisibilityTimers.clear(), this.renderingTaskManager.destroy(), null === (t3 = this.player) || void 0 === t3 || t3.destroy(), this.logger.info("pre destroy slide", ""), this.destroyPromise = Mw(e3, void 0, void 0, function() {
+        var t4;
+        return Cw(this, function(e4) {
+          switch (e4.label) {
+            case 0:
+              return [4, this.frozenTaskManager.destroy()];
+            case 1:
+              return e4.sent(), this.isLoading ? [4, this.waitLoadEnd()] : [3, 3];
+            case 2:
+              e4.sent(), e4.label = 3;
+            case 3:
+              return t4 = Boolean(this.player || this.iosNewPlayer), this._doDestroy(), t4 ? [4, ww(eb.platform)] : [3, 5];
+            case 4:
+              e4.sent(), e4.label = 5;
+            case 5:
+              return [2];
+          }
+        });
+      })), this.destroyPromise);
     }, e2.prototype.clearSlideCache = function() {
       var t3;
       null === (t3 = this.player) || void 0 === t3 || t3.clearLocalCache();
@@ -41179,23 +41216,26 @@ class SlideControllerBase {
       if (this.ready) {
         log("[Slide] freeze", this.context.appId);
         if (this.invisibleBehavior === "frozen") {
-          this.slide.frozen();
+          return Promise.resolve(this.slide.frozen());
         } else {
           this.slide.pause();
         }
       } else {
         this._toFreeze = 1;
       }
+      return Promise.resolve();
     };
     this.unfreeze = async () => {
       if (!this.visible)
         return;
+      if (!this.isFrozen && this.ready)
+        return;
       this.isFrozen = false;
       if (this.ready) {
         let isNeedSyncState = false;
         log("[Slide] unfreeze", this.context.appId);
         if (this.invisibleBehavior === "frozen") {
-          this.slide.release(() => {
+          await this.slide.release(() => {
             this.slide.notifyFrameResize();
           });
           isNeedSyncState = true;
@@ -41442,12 +41482,14 @@ class SlideControllerBase {
     return slide;
   }
   destroy() {
+    var _a;
     this.sideEffect.flushAll();
     if (!this.destroyed) {
       log("[Slide] destroy slide (once)");
-      this.slide.destroy();
       this.destroyed = true;
+      this.destroyPromise = Promise.resolve(this.slide.destroy());
     }
+    return (_a = this.destroyPromise) != null ? _a : Promise.resolve();
   }
 }
 class SlideController extends SlideControllerBase {
@@ -42810,8 +42852,6 @@ class ResizableContainer {
         this.whiteboardContainer.style.clipPath = `inset(${padding}px 0px ${padding}px 0px)`;
       }
     }
-    this.translateX = 0.5;
-    this.translateY = 0.5;
     this.renderScrollBar(
       parentBounds.width,
       parentBounds.width * this.scale,
@@ -42820,14 +42860,15 @@ class ResizableContainer {
     );
     this.handleNormalizeTranslate(this.translateX, this.translateY, {
       triggerScrollBar: true,
-      triggerSync: true
+      triggerSync: false,
+      force: true
     });
     (_a = this.slide) == null ? void 0 : _a.notifyFrameResize();
     (_b = this.onLayoutUpdated) == null ? void 0 : _b.call(this);
   }
   handleNormalizeTranslate(x, y, options) {
     var _a;
-    if (Math.abs(x - this.translateX) < 1e-3 && Math.abs(y - this.translateY) < 1e-3 && !options.triggerSync) {
+    if (Math.abs(x - this.translateX) < 1e-3 && Math.abs(y - this.translateY) < 1e-3 && !options.triggerSync && !options.force) {
       return;
     }
     const parentBounds = this.scrollContainer.getBoundingClientRect();
@@ -43673,6 +43714,7 @@ class SlideDocsViewer {
     this.render();
     this._registerBoxSizeChange();
     this.sideEffect.add(() => {
+      var _a, _b;
       const applyScale = (scale) => {
         if (this.resizableContainer) {
           this.resizableContainer.scaleContainer(scale);
@@ -43689,16 +43731,22 @@ class SlideDocsViewer {
       } else {
         console.log("[SlideDocsViewer] No initial slideScale found");
       }
+      const initialTranslateX = (_a = this.context.storage.state.translateX) != null ? _a : 0.5;
+      const initialTranslateY = (_b = this.context.storage.state.translateY) != null ? _b : 0.5;
+      this.resizableContainer.handleNormalizeTranslate(initialTranslateX, initialTranslateY, {
+        triggerScrollBar: true,
+        triggerSync: false
+      });
       const handler = (diff) => {
-        var _a, _b;
+        var _a2, _b2;
         if (diff.slideScale !== void 0) {
           const newScale = diff.slideScale.newValue;
           applyScale(newScale != null ? newScale : 1);
         }
         if (diff.translateX !== void 0 || diff.translateY !== void 0) {
           const currentTranslate = this.resizableContainer.getTranslate();
-          const translateX = diff.translateX ? (_a = diff.translateX.newValue) != null ? _a : 0.5 : currentTranslate.x;
-          const translateY = diff.translateY ? (_b = diff.translateY.newValue) != null ? _b : 0.5 : currentTranslate.y;
+          const translateX = diff.translateX ? (_a2 = diff.translateX.newValue) != null ? _a2 : 0.5 : currentTranslate.x;
+          const translateY = diff.translateY ? (_b2 = diff.translateY.newValue) != null ? _b2 : 0.5 : currentTranslate.y;
           if (this.resizableContainer) {
             this.resizableContainer.handleNormalizeTranslate(translateX, translateY, {
               triggerScrollBar: true,
@@ -43852,15 +43900,16 @@ class SlideDocsViewer {
   getPageIndex(page) {
     return (page > 0 ? page : 1) - 1;
   }
-  unmount() {
+  async unmount() {
     var _a, _b;
     (_a = this.offBoxSizeChange) == null ? void 0 : _a.call(this);
     this.offBoxSizeChange = void 0;
     (_b = this.contentResizeObserver) == null ? void 0 : _b.disconnect();
     this.contentResizeObserver = void 0;
     if (this.slideController) {
-      this.slideController.destroy();
+      const controller = this.slideController;
       this.slideController = null;
+      await controller.destroy();
     }
     this.viewer.unmount();
     this.resizableContainer.destroy(this.box);
@@ -43869,9 +43918,9 @@ class SlideDocsViewer {
   setReadonly(readonly) {
     this.viewer.setReadonly(readonly);
   }
-  destroy() {
+  async destroy() {
     this.sideEffect.flushAll();
-    this.unmount();
+    await this.unmount();
     this.viewer.destroy();
   }
   toggleClickThrough(tool) {
@@ -44136,12 +44185,13 @@ class SlidePreviewer {
     slide.on(Slide.SLIDE_EVENTS.renderEnd, this.resolveReady);
     this.readyPromise.then(this.refreshPages);
   }
-  destroy() {
+  async destroy() {
     this.sideEffect.flushAll();
     if (this.slide && !this.destroyed) {
-      this.slide.destroy();
       this.destroyed = true;
+      this.destroyPromise = Promise.resolve(this.slide.destroy());
     }
+    await this.destroyPromise;
     this.viewer.destroy();
   }
   getPageIndex(page) {
@@ -44161,11 +44211,12 @@ class SlidePreviewer {
   }
 }
 const usePlugin = /* @__PURE__ */ Slide.Slide.usePlugin.bind(Slide.Slide);
-const version = "0.2.105";
+const version = "0.2.106-beta.1";
+const DEFAULT_SLIDE_SETUP_READY_TIMEOUT = 5e3;
 const SlideApp = {
   kind: "Slide",
   setup(context) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     console.log("[Slide] setup @ " + version);
     if (context.getIsWritable()) {
       context.storage.ensureState(EmptyAttributes);
@@ -44178,6 +44229,10 @@ const SlideApp = {
       throw new Error("[Slide] no view, please set scenePath on addApp()");
     }
     view.disableCameraTransform = true;
+    const isLazySetupMode = () => {
+      var _a2;
+      return ((_a2 = context.getWindowManager()) == null ? void 0 : _a2.lazySetupInMaximizedMode) === true;
+    };
     const box = context.getBox();
     box.mountStyles(styles);
     try {
@@ -44186,6 +44241,8 @@ const SlideApp = {
     }
     const baseScenePath = context.getInitScenePath();
     let docsViewer = null;
+    let slideControllerRef;
+    let firstRenderFailed = false;
     const onPageChanged = (page) => {
       const room2 = context.getRoom();
       if (docsViewer && docsViewer.slideController) {
@@ -44211,14 +44268,21 @@ const SlideApp = {
         ...options,
         onPageChanged,
         onNavigate: options.onNavigate,
-        onRenderError: appOptions2.onRenderError,
+        onRenderError: (error, pageIndex) => {
+          var _a2;
+          firstRenderFailed = true;
+          (_a2 = appOptions2.onRenderError) == null ? void 0 : _a2.call(appOptions2, error, pageIndex);
+        },
         showRenderError: appOptions2.showRenderError,
         invisibleBehavior: appOptions2.invisibleBehavior
       });
-      if (useFreezer)
+      slideControllerRef = slideController;
+      if (useFreezer && !isLazySetupMode())
         apps.set(context.appId, slideController, box);
       logger.setAppController(context.appId, slideController);
       slideController.readyPromise.then(options.onReady).then(() => {
+        if (disposed)
+          return;
         const room2 = context.getRoom();
         let synced = false;
         if (room2 && context.getIsWritable()) {
@@ -44273,18 +44337,82 @@ const SlideApp = {
         return () => room.callbacks.off("onRoomStateChanged", onRoomStateChanged);
       });
     }
-    context.emitter.on("destroy", () => {
+    const isBlurFreezeAllowed = () => {
+      var _a2;
+      const boxStatus = context.getBoxStatus();
+      if (boxStatus)
+        return boxStatus !== "normal";
+      const boxState = (_a2 = context.getWindowManager()) == null ? void 0 : _a2.boxState;
+      return boxState != null && boxState !== "normal";
+    };
+    sideEffect.add(
+      () => context.emitter.on("focus", async (isFocused) => {
+        if (disposed)
+          return;
+        if (!isLazySetupMode())
+          return;
+        const controller = docsViewer == null ? void 0 : docsViewer.slideController;
+        if (!controller)
+          return;
+        if (!isFocused) {
+          if (!isBlurFreezeAllowed())
+            return;
+          if (!controller.isFrozen) {
+            log("[Slide] blur freeze", context.appId);
+            await controller.freeze();
+          }
+          return;
+        }
+        if (controller.isFrozen) {
+          log("[Slide] focus unfreeze", context.appId);
+          await controller.unfreeze();
+        }
+      })
+    );
+    let disposed = false;
+    let offDestroy;
+    const teardown = async () => {
+      if (disposed)
+        return;
+      disposed = true;
+      const removeDestroy = offDestroy;
+      offDestroy = void 0;
+      removeDestroy == null ? void 0 : removeDestroy();
       log("[Slide] destroy", context.appId);
       if (useFreezer)
         apps.delete(context.appId);
       sideEffect.flushAll();
       if (docsViewer) {
-        docsViewer.destroy();
+        const viewer = docsViewer;
         docsViewer = null;
+        await viewer.destroy();
       }
-    });
+    };
+    offDestroy = context.emitter.on("destroy", teardown);
     docsViewer.mount();
-    return {
+    SlideApp.__teardownByContext || (SlideApp.__teardownByContext = /* @__PURE__ */ new WeakMap());
+    SlideApp.__teardownByContext.set(context, teardown);
+    const waitForFirstRender = (timeoutMs) => new Promise((resolve) => {
+      let settled = false;
+      const settle = (loaded) => {
+        if (settled)
+          return;
+        settled = true;
+        window.clearTimeout(timeoutTimer);
+        window.clearInterval(pollTimer);
+        resolve(loaded);
+      };
+      const timeoutTimer = window.setTimeout(() => settle(false), timeoutMs);
+      slideControllerRef == null ? void 0 : slideControllerRef.readyPromise.then(
+        () => settle(!firstRenderFailed),
+        () => settle(false)
+      );
+      const pollTimer = window.setInterval(() => {
+        if (disposed || firstRenderFailed)
+          settle(false);
+      }, 100);
+    });
+    const appResult = {
       onPptMediaPermissionRequest: (callback) => {
         var _a2, _b2;
         const slide = (_a2 = docsViewer == null ? void 0 : docsViewer.slideController) == null ? void 0 : _a2.slide;
@@ -44312,6 +44440,10 @@ const SlideApp = {
           translateX: 0.5,
           translateY: 0.5
         });
+        container.handleNormalizeTranslate(0.5, 0.5, {
+          triggerScrollBar: true,
+          triggerSync: false
+        });
         container.scaleContainer(applyScale);
       },
       getViewScale: () => {
@@ -44412,6 +44544,21 @@ const SlideApp = {
         return false;
       }
     };
+    const setupReadyTimeout = (_f = appOptions == null ? void 0 : appOptions.setupReadyTimeout) != null ? _f : DEFAULT_SLIDE_SETUP_READY_TIMEOUT;
+    return waitForFirstRender(setupReadyTimeout).then(() => {
+      if (firstRenderFailed) {
+        throw new Error("[Slide] first render failed before ready");
+      }
+      if (!disposed && !(slideControllerRef == null ? void 0 : slideControllerRef.ready)) {
+        log("[Slide] setup ready wait timed out, slide keeps loading in background");
+      }
+      return appResult;
+    });
+  },
+  async teardown(context) {
+    var _a, _b, _c;
+    await ((_b = (_a = SlideApp.__teardownByContext) == null ? void 0 : _a.get(context)) == null ? void 0 : _b());
+    (_c = SlideApp.__teardownByContext) == null ? void 0 : _c.delete(context);
   }
 };
 var Slide$1 = Slide.Slide;