@pixldocs/canvas-renderer 0.5.170 → 0.5.171

package/dist/{index-CtWVrKc-.cjs → index-BgOzEKmN.cjs}

@@ -16135,9 +16135,9 @@ function captureFabricCanvasSvgForPdf(fabricInstance, canvasWidth, canvasHeight)
   }
   return svgString;
 }
-const resolvedPackageVersion = "0.5.170";
+const resolvedPackageVersion = "0.5.171";
 const PACKAGE_VERSION = resolvedPackageVersion;
-const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.170";
+const DEPLOYMENT_VERSION_MARKER = "__PIXLDOCS_CANVAS_RENDERER_VERSION__:0.5.171";
 const roundParityValue = (value) => {
   if (typeof value !== "number") return value;
   return Number.isFinite(value) ? Number(value.toFixed(3)) : value;
@@ -16635,7 +16635,7 @@ class PixldocsRenderer {
         await this.waitForCanvasScene(container, cloned, i);
       }
       console.log(`[canvas-renderer][pdf-unified] mounted ${cloned.pages.length} page(s), handing off to client exportMultiPagePdf`);
-      const { exportMultiPagePdf, preparePagesForExport } = await Promise.resolve().then(() => require("./vectorPdfExport-BnFtIh0l.cjs"));
+      const { exportMultiPagePdf, preparePagesForExport } = await Promise.resolve().then(() => require("./vectorPdfExport-BrwXcGkA.cjs"));
       const prepared = preparePagesForExport(
         cloned.pages,
         canvasWidth,
@@ -16655,28 +16655,46 @@ class PixldocsRenderer {
     }
   }
   getExpectedImageCount(config, pageIndex) {
+    return this.getExpectedImageIds(config, pageIndex).length;
+  }
+  /**
+   * Collects ids of nodes that the renderer expects to produce a renderable
+   * fabric image. Excludes SVG sources because those are loaded as Groups,
+   * not HTMLImageElement-backed Images, and would otherwise inflate the
+   * `expected` counter forever.
+   */
+  getExpectedImageIds(config, pageIndex) {
     const page = config.pages[pageIndex];
-    if (!(page == null ? void 0 : page.children)) return 0;
-    let count = 0;
+    if (!(page == null ? void 0 : page.children)) return [];
+    const ids = [];
+    const isSvgUrl = (u) => /\.svg(\?|#|$)/i.test(u) || u.startsWith("data:image/svg");
     const walk = (nodes) => {
       for (const node of nodes) {
         if (!node || node.visible === false) continue;
         const src = typeof node.src === "string" ? node.src.trim() : "";
         const imageUrl = typeof node.imageUrl === "string" ? node.imageUrl.trim() : "";
-        if (node.type === "image" && (src || imageUrl)) count += 1;
+        const url = src || imageUrl;
+        if (node.type === "image" && url && !isSvgUrl(url) && node.id) {
+          ids.push(String(node.id));
+        }
         if (Array.isArray(node.children) && node.children.length > 0) {
           walk(node.children);
         }
       }
     };
     walk(page.children);
-    return count;
+    return ids;
   }
-  waitForCanvasImages(container, expectedImageCount, maxWaitMs = 15e3, pollMs = 120) {
+  waitForCanvasImages(container, expectedImageCount, maxWaitMs, pollMs = 120) {
+    const timeout = Math.max(500, maxWaitMs ?? this.config.assetWaitTimeoutMs ?? 15e3);
+    const earlyExitMs = Math.max(250, this.config.assetWaitEarlyExitMs ?? 1500);
+    const debug = !!this.config.debug;
     return new Promise((resolve) => {
       const start = Date.now();
       let stableFrames = 0;
       let lastSummary = "";
+      let lastActual = -1;
+      let lastProgressAt = Date.now();
       const isRenderableImage = (value) => value instanceof HTMLImageElement && value.complete && value.naturalWidth > 0 && value.naturalHeight > 0;
       const collectRenderableImages = (obj, seen) => {
         if (!obj || typeof obj !== "object") return;
@@ -16740,19 +16758,34 @@ class PixldocsRenderer {
         const summary = `expected=${expectedImageCount} actual=${actualImageCount} dom=${domImages.length} fabricReady=${fabricReady} domReady=${allDomLoaded} canvasReady=${canvasReady}`;
         if (summary !== lastSummary) {
           lastSummary = summary;
-          console.log(`[canvas-renderer][asset-wait] ${summary}`);
+          if (debug) console.log(`[canvas-renderer][asset-wait] ${summary}`);
+        }
+        if (actualImageCount !== lastActual) {
+          lastActual = actualImageCount;
+          lastProgressAt = Date.now();
         }
         if (ready) {
           stableFrames += 1;
           if (stableFrames >= 2) {
-            console.log(`[canvas-renderer][asset-wait] ready after ${elapsed}ms (${summary})`);
+            if (debug) console.log(`[canvas-renderer][asset-wait] ready after ${elapsed}ms (${summary})`);
             settle();
             return;
           }
         } else {
           stableFrames = 0;
         }
-        if (elapsed >= maxWaitMs) {
+        const sceneSettled = fabricReady && allDomLoaded && canvasReady && fabricObjects.length > 0;
+        const idleFor = Date.now() - lastProgressAt;
+        if (sceneSettled && actualImageCount < expectedImageCount && idleFor >= earlyExitMs) {
+          if (debug) {
+            console.log(
+              `[canvas-renderer][asset-wait] early-exit after ${elapsed}ms (idle=${idleFor}ms, ${summary})`
+            );
+          }
+          settle();
+          return;
+        }
+        if (elapsed >= timeout) {
           const fabricImageDebug = [];
           for (const obj of fabricObjects) {
             getImageDebugInfo(obj, fabricImageDebug);
@@ -18737,7 +18770,7 @@ async function prepareLiveCanvasSvgForPdf(rawSvg, pageWidth, pageHeight, pageKey
     if (options == null ? void 0 : options.stripPageBackground) stripRootPageBackgroundFromSvg(svgToDraw);
     sanitizeSvgTreeForPdf(svgToDraw);
     try {
-      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await Promise.resolve().then(() => require("./vectorPdfExport-BnFtIh0l.cjs"));
+      const { bakeTextAnchorPositionsFromLiveSvg, logTextMeasurementDiagnostic } = await Promise.resolve().then(() => require("./vectorPdfExport-BrwXcGkA.cjs"));
       try {
         await logTextMeasurementDiagnostic(svgToDraw);
       } catch {
@@ -19136,4 +19169,4 @@ exports.setAutoShrinkDebug = setAutoShrinkDebug;
 exports.setBundledAssetPrefixes = setBundledAssetPrefixes;
 exports.warmResolvedTemplateForPreview = warmResolvedTemplateForPreview;
 exports.warmTemplateFromForm = warmTemplateFromForm;
-//# sourceMappingURL=index-CtWVrKc-.cjs.map
+//# sourceMappingURL=index-BgOzEKmN.cjs.map