@netless/app-presentation 0.1.13-beta.2 → 0.1.13-beta.4

package/dist/index.js

@@ -1154,6 +1154,7 @@ var _Preload = class _Preload {
     // 暂停后不再创建预加载链接（app 失焦降级时调用）；已插入的 link 会被移除，
     // 挂起的 idle 回调重新进入 touch() 时也会被跳过
     this.paused = false;
+    this.disposed = false;
     this.preloadMap = new Map(pages.map((e, index) => [index, {
       src: e.src,
       state: 0 /* unloaded */
@@ -1168,13 +1169,13 @@ var _Preload = class _Preload {
     this.destroySomeLink();
   }
   resume(index) {
-    if (!this.paused)
+    if (!this.paused || this.disposed)
       return;
     this.paused = false;
     this.touch(index != null ? index : this.touchIndex, true);
   }
   touch(index, force = false) {
-    if (this.paused)
+    if (this.paused || this.disposed)
       return;
     if (index >= this.preloadSize) {
       this.touchIndex = 0;
@@ -1182,11 +1183,11 @@ var _Preload = class _Preload {
       this.touchIndex = index;
     }
     const value = this.preloadMap.get(this.touchIndex);
-    if (value && value.state === 0 /* unloaded */) {
+    if (value && (value.state === 0 /* unloaded */ || force && value.state === 2 /* error */)) {
       this.createLink(this.touchIndex, force);
     }
     if (this.loadingLinks.size < _Preload.maxLinks) {
-      const willLoad = [...this.preloadMap.entries()].find(([i, e]) => i > this.touchIndex && e.state !== 1 /* loaded */);
+      const willLoad = [...this.preloadMap.entries()].find(([i, e]) => i > this.touchIndex && e.state === 0 /* unloaded */);
       if (willLoad) {
         this.requestAsyncCallBack(() => {
           this.touch(willLoad[0], false);
@@ -1219,21 +1220,27 @@ var _Preload = class _Preload {
       linkDom.as = "image";
       linkDom.href = value.src;
       linkDom.dataset.order = index + "";
-      document.head.appendChild(linkDom);
       linkDom.onload = () => {
+        var _a;
+        if (((_a = this.loadingLinks.get(index)) == null ? void 0 : _a.link) !== linkDom)
+          return;
         const value2 = this.preloadMap.get(index);
         if (value2) {
           value2.state = 1 /* loaded */;
           this.preloadMap.set(index, value2);
-          document.head.contains(linkDom) && document.head.removeChild(linkDom);
-          this.loadingLinks.delete(index);
+          this.removeLink(index, linkDom);
           this.touch(this.touchIndex + 1, false);
         }
       };
       linkDom.onerror = () => {
+        var _a;
+        if (((_a = this.loadingLinks.get(index)) == null ? void 0 : _a.link) !== linkDom)
+          return;
         const value2 = this.preloadMap.get(index);
-        if (value2 == null ? void 0 : value2.src) {
-          linkDom.href = value2.src;
+        if (value2) {
+          value2.state = 2 /* error */;
+          this.removeLink(index, linkDom);
+          this.touch(this.touchIndex + 1, false);
         }
       };
       this.loadingLinks.set(index, {
@@ -1242,17 +1249,23 @@ var _Preload = class _Preload {
       });
       value.state = 0 /* unloaded */;
       this.preloadMap.set(index, value);
+      document.head.appendChild(linkDom);
       return 0 /* unloaded */;
     }
     return 2 /* error */;
   }
+  removeLink(index, link) {
+    link.onload = null;
+    link.onerror = null;
+    document.head.contains(link) && document.head.removeChild(link);
+    this.loadingLinks.delete(index);
+  }
   destroySomeLink(excludeIndex) {
     for (const [index, { link }] of this.loadingLinks) {
       if (excludeIndex !== void 0 && index === excludeIndex) {
         continue;
       }
-      document.head.contains(link) && document.head.removeChild(link);
-      this.loadingLinks.delete(index);
+      this.removeLink(index, link);
     }
   }
   async requestAsyncCallBack(callBack, timeout) {
@@ -1270,6 +1283,7 @@ var _Preload = class _Preload {
     callBack();
   }
   dispose() {
+    this.disposed = true;
     this.destroySomeLink();
     this.preloadMap.clear();
   }
@@ -1982,19 +1996,72 @@ function cameraToSharedViewport(camera, viewSize, referenceSize) {
 var createPresentationRuntimeTeardown = (box, dispose2) => {
   let tornDown = false;
   return () => {
+    var _a, _b, _c;
     if (tornDown)
       return;
     tornDown = true;
     try {
       dispose2();
     } finally {
-      box.unmountContent();
-      box.unmountFooter();
-      box.unmountStyles();
+      try {
+        (_a = box.unmountContent) == null ? void 0 : _a.call(box);
+      } finally {
+        try {
+          (_b = box.unmountFooter) == null ? void 0 : _b.call(box);
+        } finally {
+          (_c = box.unmountStyles) == null ? void 0 : _c.call(box);
+        }
+      }
     }
   };
 };
 
+// src/setup-ready.ts
+var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed, options) => {
+  return new Promise((resolve) => {
+    let settled = false;
+    let timedOut = false;
+    let pollTimer;
+    const settle = (result) => {
+      if (settled)
+        return;
+      settled = true;
+      window.clearTimeout(timeoutTimer);
+      if (pollTimer !== void 0)
+        window.clearInterval(pollTimer);
+      resolve(result);
+    };
+    const timeoutTimer = window.setTimeout(() => {
+      timedOut = true;
+      options == null ? void 0 : options.onTimeout();
+      if (!(options == null ? void 0 : options.waitForReady()))
+        settle("timeout");
+    }, timeoutMs);
+    const check = () => {
+      var _a, _b;
+      if (isDisposed()) {
+        settle("disposed");
+        return;
+      }
+      if (timedOut && !(options == null ? void 0 : options.waitForReady())) {
+        settle("timeout");
+        return;
+      }
+      const img = getImage();
+      if (img == null ? void 0 : img.complete) {
+        if (img.naturalWidth > 0) {
+          settle("loaded");
+        } else if (img.currentSrc || ((_a = img.getAttribute("src")) == null ? void 0 : _a.trim()) || ((_b = img.getAttribute("srcset")) == null ? void 0 : _b.trim())) {
+          settle("error");
+        }
+      }
+    };
+    check();
+    if (!settled)
+      pollTimer = window.setInterval(check, 100);
+  });
+};
+
 // src/app-presentation.ts
 var import_debounce2 = __toESM(require_debounce());
 var emptySceneName = "$$empty$$";
@@ -2023,36 +2090,6 @@ var isBlurDegradationAllowed = (context) => {
   return boxState !== void 0 && boxState !== "normal";
 };
 var DEFAULT_SETUP_READY_TIMEOUT = 5e3;
-var waitForCurrentPageImage = (view, timeoutMs, isDisposed) => {
-  return new Promise((resolve) => {
-    let settled = false;
-    let pollTimer;
-    const settle = (loaded) => {
-      if (settled)
-        return;
-      settled = true;
-      window.clearTimeout(timeoutTimer);
-      if (pollTimer !== void 0)
-        window.clearInterval(pollTimer);
-      resolve(loaded);
-    };
-    const timeoutTimer = window.setTimeout(() => settle(false), timeoutMs);
-    const check = () => {
-      if (isDisposed()) {
-        settle(false);
-        return;
-      }
-      const img = findBackgroundImage(view);
-      if (img && img.complete && img.naturalWidth > 0) {
-        settle(true);
-      }
-    };
-    check();
-    if (!settled) {
-      pollTimer = window.setInterval(check, 100);
-    }
-  });
-};
 var resolveImageUrl = (url) => {
   try {
     return new URL(url, window.location.href).href;
@@ -2084,6 +2121,19 @@ var setupBlurThumbnailDegradation = (config) => {
   const boxBlurClass = box.wrapClassName("blur");
   let blurEpisode = false;
   let reDegradeEnabled = false;
+  let previewSuspended = false;
+  let appliedFocusState = true;
+  let logicalFocused = true;
+  const activityBlocked = () => {
+    var _a, _b;
+    const wm = context.getWindowManager();
+    if ((wm == null ? void 0 : wm.lazySetupInMaximizedMode) !== true)
+      return false;
+    const host = (_a = context.getRuntimeActivity) == null ? void 0 : _a.call(context);
+    if (host)
+      return document.visibilityState === "hidden" || !host.active;
+    return document.visibilityState === "hidden" || wm.boxState === "minimized" || ((_b = wm.attributes) == null ? void 0 : _b.minimized) === true || context.getBoxStatus() === "minimized";
+  };
   let boxBlurred = box.$box.classList.contains(boxBlurClass);
   const setBackgroundSuspended = (suspended) => {
     app.whiteboardDOM.classList.toggle(
@@ -2098,7 +2148,7 @@ var setupBlurThumbnailDegradation = (config) => {
     const thumbnailURL = page.thumbnail;
     const img = findBackgroundImage(view);
     if (!thumbnailURL || !hasUsableThumbnail(page)) {
-      if (boxBlurred) {
+      if (boxBlurred || activityBlocked()) {
         setBackgroundSuspended(true);
         if (img && resolveImageUrl(img.src) !== resolveImageUrl(TRANSPARENT_BACKGROUND)) {
           img.src = TRANSPARENT_BACKGROUND;
@@ -2120,9 +2170,12 @@ var setupBlurThumbnailDegradation = (config) => {
     setBackgroundSuspended(false);
   };
   const suspendCachedResources = () => {
-    if (!blurEpisode || !boxBlurred)
+    if (!blurEpisode || !boxBlurred && !activityBlocked())
       return;
-    app.suspendPreviewResources();
+    if (!previewSuspended) {
+      previewSuspended = true;
+      app.suspendPreviewResources();
+    }
     const page = pages[pageIndex$.value];
     if (!page || !hasUsableThumbnail(page) || reDegradeEnabled) {
       degrade();
@@ -2133,6 +2186,7 @@ var setupBlurThumbnailDegradation = (config) => {
       return;
     blurEpisode = false;
     reDegradeEnabled = false;
+    previewSuspended = false;
     restore2();
     app.preload.resume(pageIndex$.value);
   };
@@ -2163,27 +2217,40 @@ var setupBlurThumbnailDegradation = (config) => {
       return;
     reDegradeEnabled = false;
   };
-  const offFocus = context.emitter.on("focus", (isFocused) => {
+  const applyActivity = () => {
+    var _a;
+    const lazy = ((_a = context.getWindowManager()) == null ? void 0 : _a.lazySetupInMaximizedMode) === true;
+    const isFocused = (!lazy || logicalFocused) && !activityBlocked();
+    if (appliedFocusState === isFocused)
+      return;
+    if (!isFocused && !isBlurDegradationAllowed(context) && !activityBlocked())
+      return;
     if (isFocused) {
       restoreFocusedResources();
     } else {
-      if (!isBlurDegradationAllowed(context))
-        return;
       blurEpisode = true;
       reDegradeEnabled = true;
       degrade();
       app.preload.pause();
       suspendCachedResources();
     }
+    appliedFocusState = isFocused;
+  };
+  const offFocus = context.emitter.on("focus", (isFocused) => {
+    logicalFocused = isFocused;
+    applyActivity();
   });
   dispose2.add(offFocus);
+  dispose2.add(context.emitter.on("runtimeActivity", applyActivity));
+  document.addEventListener("visibilitychange", applyActivity);
+  dispose2.add(() => document.removeEventListener("visibilitychange", applyActivity));
   const updateBoxBlurred = (blurred) => {
     if (boxBlurred === blurred)
       return;
     boxBlurred = blurred;
     if (blurred)
       suspendCachedResources();
-    else
+    else if (logicalFocused && !activityBlocked())
       restoreFocusedResources();
   };
   const onBoxBlur = () => updateBoxBlurred(true);
@@ -2630,7 +2697,7 @@ var NetlessAppPresentation = {
         options.useClipView
       )
     );
-    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.2";
+    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.4";
     app.scaleDocsToFit = scaleDocsToFit;
     app.log = log;
     app.warn = warn;
@@ -3099,9 +3166,22 @@ var NetlessAppPresentation = {
     );
     const setupReadyTimeout = (_d = options.setupReadyTimeout) != null ? _d : DEFAULT_SETUP_READY_TIMEOUT;
     return prepareScenesPromise.then(async () => {
-      const loaded = await waitForCurrentPageImage(view, setupReadyTimeout, () => disposed);
-      if (!loaded && !disposed) {
-        warn(`[Presentation] setup ready wait timed out after ${setupReadyTimeout}ms`);
+      const result = await waitForCurrentPageImage(
+        () => findBackgroundImage(view),
+        setupReadyTimeout,
+        () => disposed,
+        {
+          waitForReady: () => Boolean(context.waitForActualSetupReady),
+          onTimeout: () => warn(`[Presentation] setup page image still pending after ${setupReadyTimeout}ms`)
+        }
+      );
+      if (disposed)
+        throw new Error("[Presentation] disposed before setup ready");
+      if (result === "error" && context.waitForActualSetupReady) {
+        throw new Error("[Presentation] setup page image failed to load");
+      }
+      if (result === "error" && !disposed) {
+        warn("[Presentation] setup page image failed to load; continuing setup");
       }
       return controller;
     });
@@ -3190,7 +3270,7 @@ var install = (register, options = {}) => {
 };
 
 // src/index.ts
-var version = "0.1.13-beta.2";
+var version = "0.1.13-beta.4";
 
 exports.NetlessAppPresentation = NetlessAppPresentation;
 exports.Presentation = Presentation;