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

package/dist/index.d.ts

@@ -472,8 +472,8 @@ interface PresentationAppOptions {
     /** useClipView is used to set the presentation use clip view, it will be used in the presentation, and the presentation will be use clip view when the app is initialized */
     useClipView?: boolean;
     /**
-     * Max time (ms) `setup()` waits for the first visible page image to load
-     * before resolving anyway. Default: 5_000.
+     * First-image warning threshold in ms. Default: 5_000. New lazy hosts
+     * await real readiness; legacy/eager hosts resolve on timeout.
      */
     setupReadyTimeout?: number;
     /**

package/dist/index.global.js

@@ -2016,9 +2016,10 @@ var NetlessAppPresentation = (function (exports) {
   };
 
   // src/setup-ready.ts
-  var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed) => {
+  var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed, options) => {
     return new Promise((resolve) => {
       let settled = false;
+      let timedOut = false;
       let pollTimer;
       const settle = (result) => {
         if (settled)
@@ -2029,13 +2030,22 @@ var NetlessAppPresentation = (function (exports) {
           window.clearInterval(pollTimer);
         resolve(result);
       };
-      const timeoutTimer = window.setTimeout(() => settle("timeout"), timeoutMs);
+      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) {
@@ -2110,6 +2120,19 @@ var NetlessAppPresentation = (function (exports) {
     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(
@@ -2124,7 +2147,7 @@ var NetlessAppPresentation = (function (exports) {
       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;
@@ -2146,9 +2169,12 @@ var NetlessAppPresentation = (function (exports) {
       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();
@@ -2159,6 +2185,7 @@ var NetlessAppPresentation = (function (exports) {
         return;
       blurEpisode = false;
       reDegradeEnabled = false;
+      previewSuspended = false;
       restore2();
       app.preload.resume(pageIndex$.value);
     };
@@ -2189,27 +2216,40 @@ var NetlessAppPresentation = (function (exports) {
         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);
@@ -2656,7 +2696,7 @@ var NetlessAppPresentation = (function (exports) {
           options.useClipView
         )
       );
-      app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.3";
+      app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.4";
       app.scaleDocsToFit = scaleDocsToFit;
       app.log = log;
       app.warn = warn;
@@ -3128,11 +3168,18 @@ var NetlessAppPresentation = (function (exports) {
         const result = await waitForCurrentPageImage(
           () => findBackgroundImage(view),
           setupReadyTimeout,
-          () => disposed
+          () => disposed,
+          {
+            waitForReady: () => Boolean(context.waitForActualSetupReady),
+            onTimeout: () => warn(`[Presentation] setup page image still pending after ${setupReadyTimeout}ms`)
+          }
         );
-        if (result === "timeout" && !disposed) {
-          warn(`[Presentation] setup ready wait timed out after ${setupReadyTimeout}ms`);
-        } else if (result === "error" && !disposed) {
+        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;
@@ -3222,7 +3269,7 @@ var NetlessAppPresentation = (function (exports) {
   };
 
   // src/index.ts
-  var version = "0.1.13-beta.3";
+  var version = "0.1.13-beta.4";
 
   exports.NetlessAppPresentation = NetlessAppPresentation;
   exports.Presentation = Presentation;

package/dist/index.js

@@ -2017,9 +2017,10 @@ var createPresentationRuntimeTeardown = (box, dispose2) => {
 };
 
 // src/setup-ready.ts
-var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed) => {
+var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed, options) => {
   return new Promise((resolve) => {
     let settled = false;
+    let timedOut = false;
     let pollTimer;
     const settle = (result) => {
       if (settled)
@@ -2030,13 +2031,22 @@ var waitForCurrentPageImage = (getImage, timeoutMs, isDisposed) => {
         window.clearInterval(pollTimer);
       resolve(result);
     };
-    const timeoutTimer = window.setTimeout(() => settle("timeout"), timeoutMs);
+    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) {
@@ -2111,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(
@@ -2125,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;
@@ -2147,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();
@@ -2160,6 +2186,7 @@ var setupBlurThumbnailDegradation = (config) => {
       return;
     blurEpisode = false;
     reDegradeEnabled = false;
+    previewSuspended = false;
     restore2();
     app.preload.resume(pageIndex$.value);
   };
@@ -2190,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);
@@ -2657,7 +2697,7 @@ var NetlessAppPresentation = {
         options.useClipView
       )
     );
-    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.3";
+    app.contentDOM.dataset.appPresentationVersion = "0.1.13-beta.4";
     app.scaleDocsToFit = scaleDocsToFit;
     app.log = log;
     app.warn = warn;
@@ -3129,11 +3169,18 @@ var NetlessAppPresentation = {
       const result = await waitForCurrentPageImage(
         () => findBackgroundImage(view),
         setupReadyTimeout,
-        () => disposed
+        () => disposed,
+        {
+          waitForReady: () => Boolean(context.waitForActualSetupReady),
+          onTimeout: () => warn(`[Presentation] setup page image still pending after ${setupReadyTimeout}ms`)
+        }
       );
-      if (result === "timeout" && !disposed) {
-        warn(`[Presentation] setup ready wait timed out after ${setupReadyTimeout}ms`);
-      } else if (result === "error" && !disposed) {
+      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;
@@ -3223,7 +3270,7 @@ var install = (register, options = {}) => {
 };
 
 // src/index.ts
-var version = "0.1.13-beta.3";
+var version = "0.1.13-beta.4";
 
 exports.NetlessAppPresentation = NetlessAppPresentation;
 exports.Presentation = Presentation;