@pixldocs/canvas-renderer 0.5.191 → 0.5.193

package/dist/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index-BJR7zaam.cjs");
+const index = require("./index-uwKwubUL.cjs");
 exports.DEPLOYMENT_VERSION_MARKER = index.DEPLOYMENT_VERSION_MARKER;
 exports.FONT_FALLBACK_DEVANAGARI = index.FONT_FALLBACK_DEVANAGARI;
 exports.FONT_FALLBACK_MATH = index.FONT_FALLBACK_MATH;

package/dist/index.d.ts

@@ -648,20 +648,12 @@ export declare interface RendererConfig {
     /** Verbose asset-wait diagnostics. Default: false. */
     debug?: boolean;
     /**
-     * PDF export: when `true`, always skip the live-canvas SVG → svg2pdf fast
-     * path and use the per-element Fabric → jsPDF `addImage` path instead.
+     * PDF export: advanced override. When `true`, skip the live-canvas SVG →
+     * svg2pdf path and use the older per-element/config-space fallback.
      *
-     * Why: on iOS / Safari the svg2pdf path internally rasterises embedded
-     * `data:image/*` sources through a tainted offscreen canvas roundtrip and
-     * silently drops large user-uploaded JPEGs from camera-roll pickers. The
-     * per-element path goes straight from the live HTMLImageElement into
-     * jsPDF.addImage and is reliable across browsers.
-     *
-     * Default: `'auto'` — on by default for any config containing a
-     * `data:image/(jpeg|png|webp)` source when running on Safari / iOS;
-     * off everywhere else so the editor's vector fast path stays in use.
-     * Set to `true` to force on always (e.g. BioMaker), `false` to fully
-     * disable the auto-detect.
+     * Default: `'auto'`, which keeps the live SVG path. BioMaker-style hosts
+     * should leave this unset/`'auto'`; `true` is only a manual escape hatch and
+     * can drift from the live Fabric layout for auto-shrink/crop-group templates.
      */
     forcePerElementPdf?: boolean | 'auto';
     /**
@@ -670,8 +662,8 @@ export declare interface RendererConfig {
      * images are JPEG-recompressed in-browser to fit. Prevents Safari from
      * silently failing to embed multi-megapixel camera-roll JPEGs.
      *
-     * Default: `2048` when `forcePerElementPdf` is active, otherwise `0`
-     * (no downscaling). Set explicitly to override either way.
+     * Default: `0` unless explicitly set. BioMaker-style PDF hosts should pass
+     * `2048` so large camera/gallery photos are normalized before mount.
      */
     maxImageEdgePx?: number;
 }

package/dist/index.js

@@ -1,4 +1,4 @@
-import { D, F, o, q, s, P, t, u, v, w, x, y, z, B, C, E, G, H, I, J, K, L, M, b, N, O, Q, R, S, U, V, W, X, Y, Z, _, $, a0, a1, a2, a3, a4, a5 } from "./index-C3kuDISv.js";
+import { D, F, o, q, s, P, t, u, v, w, x, y, z, B, C, E, G, H, I, J, K, L, M, b, N, O, Q, R, S, U, V, W, X, Y, Z, _, $, a0, a1, a2, a3, a4, a5 } from "./index-CDoyeKa8.js";
 export {
   D as DEPLOYMENT_VERSION_MARKER,
   F as FONT_FALLBACK_DEVANAGARI,

package/dist/{vectorPdfExport-D_2mdcwO.cjs → vectorPdfExport-BHKMcbVb.cjs}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jspdf = require("jspdf");
 const svg2pdf_js = require("svg2pdf.js");
 const fabric = require("fabric");
-const index = require("./index-BJR7zaam.cjs");
+const index = require("./index-uwKwubUL.cjs");
 const pdfFonts = require("./pdfFonts-BTj2f465.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -468,7 +468,8 @@ function buildMatrixTransformedSvgForPage(svg, matrix, localX, localY, width, he
     frame: { x: minX, y: minY, width: frameW, height: frameH }
   };
 }
-async function svg2pdfWithDomMount(svg, pdf, opts) {
+async function svg2pdfWithDomMount(svg, pdf, opts, options) {
+  await preloadSvgImagesForPdf(svg, options);
   const wrap = document.createElement("div");
   wrap.style.cssText = "position:fixed;left:-9999px;top:0;width:0;height:0;overflow:hidden;pointer-events:none;opacity:0";
   wrap.appendChild(svg);
@@ -480,6 +481,48 @@ async function svg2pdfWithDomMount(svg, pdf, opts) {
     if (wrap.parentNode) document.body.removeChild(wrap);
   }
 }
+function getSvgImageHref(image) {
+  return image.getAttribute("href") || image.getAttribute("xlink:href") || "";
+}
+async function preloadSvgImagesForPdf(svg, options) {
+  const images = Array.from(svg.querySelectorAll("image"));
+  if (!images.length) return;
+  const required = new Set((options == null ? void 0 : options.requiredImageIds) ?? []);
+  const failedRequired = [];
+  const loadOne = (href) => new Promise((resolve) => {
+    if (!href) return resolve(false);
+    const img = new Image();
+    if (!href.startsWith("data:") && !href.startsWith("blob:")) img.crossOrigin = "anonymous";
+    const done = (ok) => resolve(ok);
+    img.onload = async () => {
+      try {
+        if (typeof img.decode === "function") await img.decode();
+      } catch {
+      }
+      done(img.naturalWidth > 0 && img.naturalHeight > 0);
+    };
+    img.onerror = () => done(false);
+    try {
+      img.src = href;
+    } catch {
+      done(false);
+    }
+  });
+  for (const image of images) {
+    const href = getSvgImageHref(image);
+    const id = image.getAttribute("data-pixldocs-image-id") || "";
+    const ok = await loadOne(href);
+    if (id && required.has(id) && !ok) failedRequired.push(id);
+  }
+  if (required.size > 0) {
+    const present = new Set(images.map((image) => image.getAttribute("data-pixldocs-image-id") || "").filter(Boolean));
+    const missing = [...required].filter((id) => !present.has(id));
+    if (missing.length || failedRequired.length) {
+      throw new Error(`[client-pdf-export] expected image(s) not ready for SVG PDF${(options == null ? void 0 : options.context) ? ` (${options.context})` : ""}: missing=${missing.join(",") || "none"} failed=${failedRequired.join(",") || "none"}`);
+    }
+    console.log("[client-pdf-export] SVG image ids ready", { context: options == null ? void 0 : options.context, count: required.size, ids: [...required] });
+  }
+}
 function resetPdfColorState(pdf, label) {
   pdf.setFillColor(0, 0, 0);
   pdf.setDrawColor(0, 0, 0);
@@ -2525,7 +2568,7 @@ async function fetchSvgAsElement(imageUrl, colorMap) {
 async function getRecoloredSvgDataUrl(imageUrl, colorMap) {
   if (!colorMap || Object.keys(colorMap).length === 0) return null;
   try {
-    const { getNormalizedSvgUrl } = await Promise.resolve().then(() => require("./index-BJR7zaam.cjs")).then((n) => n.canvasImageLoader);
+    const { getNormalizedSvgUrl } = await Promise.resolve().then(() => require("./index-uwKwubUL.cjs")).then((n) => n.canvasImageLoader);
     return await getNormalizedSvgUrl(imageUrl, colorMap);
   } catch {
     return null;
@@ -3316,7 +3359,7 @@ async function fetchImageAsBase64(imageUrl, opts = {}) {
     }
     let fetchUrl = imageUrl;
     if (imageUrl.startsWith("http://") || imageUrl.startsWith("https://")) {
-      const { isPrivateUrl } = await Promise.resolve().then(() => require("./index-BJR7zaam.cjs")).then((n) => n.canvasImageLoader);
+      const { isPrivateUrl } = await Promise.resolve().then(() => require("./index-uwKwubUL.cjs")).then((n) => n.canvasImageLoader);
       if (isPrivateUrl(imageUrl)) return null;
       const proxyUrl = new URL(`${index.API_URL}/image-proxy`);
       proxyUrl.searchParams.set("url", imageUrl);
@@ -4921,6 +4964,17 @@ function preparePagesForExport(pages, canvasWidth, canvasHeight, options) {
     };
   });
 }
+function getExpectedRasterImageIdsForPdfPage(page) {
+  const ids = [];
+  const isSvgUrl = (url) => /\.svg(?:\?|#|$)/i.test(url) || /^data:image\/svg/i.test(url);
+  for (const item of page.elements) {
+    if (isGroupBackgroundDrawable(item) || item.type !== "image" || item.visible === false) continue;
+    const src = String(item.src || item.imageUrl || "").trim();
+    if (!src || item.sourceFormat === "svg" || isSvgUrl(src)) continue;
+    ids.push(item.id);
+  }
+  return [...new Set(ids)];
+}
 async function exportMultiPagePdf(pages, options) {
   var _a, _b, _c, _d, _e;
   const { filename = "document.pdf", title, watermark = false, returnBlob = false, pdfTextMode = "selectable", skipLiveCanvasSvgFastPath = false } = options;
@@ -5068,6 +5122,7 @@ async function exportMultiPagePdf(pages, options) {
     }
     const liveCanvasForPage = page.pageId ? index.getCanvasForPage(page.pageId) : null;
     let allowLiveCanvasFallback = !!liveCanvasForPage && !skipLiveCanvasSvgFastPath;
+    const expectedRasterImageIds = getExpectedRasterImageIdsForPdfPage(page);
     if (liveCanvasForPage && !skipLiveCanvasSvgFastPath) {
       try {
         const liveSvgString = index.captureFabricCanvasSvgForPdf(
@@ -5110,7 +5165,8 @@ async function exportMultiPagePdf(pages, options) {
           await svg2pdfWithDomMount(
             liveSvg,
             pdfWithColorLogging(pdf, seq, `page-${pageIndex + 1}`),
-            svg2pdfOpts(0, 0, page.width, page.height)
+            svg2pdfOpts(0, 0, page.width, page.height),
+            { requiredImageIds: expectedRasterImageIds, context: `page-${pageIndex + 1}` }
           );
           debugLog(`live canvas svg2pdf DONE #${seq} page=${pageIndex + 1}`);
           resetPdfColorState(pdf, `after live canvas svg2pdf page ${pageIndex + 1}`);
@@ -5124,6 +5180,9 @@ async function exportMultiPagePdf(pages, options) {
           svgLength: (liveSvgString == null ? void 0 : liveSvgString.length) ?? 0
         });
       } catch (error) {
+        if (error instanceof Error && /expected image\(s\) not ready for SVG PDF/i.test(error.message)) {
+          throw error;
+        }
         allowLiveCanvasFallback = false;
         console.error(`[client-pdf-export] live SVG export failed for page ${pageIndex + 1}`, error);
       }
@@ -5310,4 +5369,4 @@ exports.exportMultiPagePdf = exportMultiPagePdf;
 exports.logTextMeasurementDiagnostic = logTextMeasurementDiagnostic;
 exports.preparePagesForExport = preparePagesForExport;
 exports.rewriteSvgFontsForJsPDFWithSourceMeta = rewriteSvgFontsForJsPDFWithSourceMeta;
-//# sourceMappingURL=vectorPdfExport-D_2mdcwO.cjs.map
+//# sourceMappingURL=vectorPdfExport-BHKMcbVb.cjs.map