@pixldocs/canvas-renderer 0.5.209 → 0.5.211

package/dist/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const index = require("./index-DQF_on2h.cjs");
+const index = require("./index-d8U2oDzI.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

@@ -373,6 +373,10 @@ export declare interface PdfFromFormOptions {
      * Per-call override of `RendererConfig.maxImageEdgePx`. See that field.
      */
     maxImageEdgePx?: number;
+    /** Preserve original raster bytes when false; use bounded JPEG/PNG optimization when true. */
+    compressImages?: boolean;
+    /** JPEG quality (0..1) used only when compressImages is true. */
+    compressionQuality?: number;
 }
 
 export declare interface PdfRenderResult {
@@ -540,6 +544,8 @@ export declare class PixldocsRenderer {
         textMode?: 'auto' | 'selectable' | 'pixel-perfect';
         forcePerElementPdf?: boolean | 'auto';
         maxImageEdgePx?: number;
+        compressImages?: boolean;
+        compressionQuality?: number;
     }): Promise<PdfRenderResult>;
     /**
      * Resolve from V2 sectionState and render a vector PDF.

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-DOIdbh-Q.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-C0tTvSFQ.js";
 export {
   D as DEPLOYMENT_VERSION_MARKER,
   F as FONT_FALLBACK_DEVANAGARI,

package/dist/{vectorPdfExport-C0GsER0C.js → vectorPdfExport-BEGl71uB.js}

@@ -1,7 +1,7 @@
 import { jsPDF, ShadingPattern } from "jspdf";
 import { svg2pdf } from "svg2pdf.js";
 import * as fabric from "fabric";
-import { p as parseTextMarkdown, r as renderSmartElementToSvg, g as getCanvasForPage, c as captureFabricCanvasSvgForPdf, f as findNodeById, a as getAbsoluteBounds, b as getProxiedImageUrl, d as getImageProxyFetchOptions, A as API_URL, n as normalizeShapeType, i as isElement, e as isGroup, h as buildRoundedTrianglePath, j as hasEdgeFade, k as bakeEdgeFade, l as getRoundedRectRadii, T as TRIANGLE_STROKE_MITER_LIMIT, m as getTrianglePoints } from "./index-DOIdbh-Q.js";
+import { p as parseTextMarkdown, r as renderSmartElementToSvg, g as getCanvasForPage, c as captureFabricCanvasSvgForPdf, f as findNodeById, a as getAbsoluteBounds, b as getProxiedImageUrl, d as getImageProxyFetchOptions, A as API_URL, n as normalizeShapeType, i as isElement, e as isGroup, h as buildRoundedTrianglePath, j as hasEdgeFade, k as bakeEdgeFade, l as getRoundedRectRadii, T as TRIANGLE_STROKE_MITER_LIMIT, m as getTrianglePoints } from "./index-C0tTvSFQ.js";
 import { resetPdfFontRegistry, FONT_FALLBACK_SYMBOLS, FONT_FALLBACK_MATH, FONT_FALLBACK_DEVANAGARI, embedFontWithGoogleFallback, getEmbeddedVariantsList, isFontAvailable, isFamilyEmbedded, resolveBestRegisteredVariant, getEmbeddedJsPDFFontName, resolveFontWeight, doesVariantSupportChar } from "./pdfFonts-DhEaMTZl.js";
 async function embedFontsForSvg(pdf, svgStr) {
   var _a;
@@ -124,6 +124,32 @@ function elementHasFade(element) {
 const yieldToUI = () => new Promise((resolve) => {
   requestAnimationFrame(() => setTimeout(resolve, 0));
 });
+const IS_SAFARI = typeof navigator !== "undefined" && /^((?!chrome|android|crios|fxios).)*safari/i.test(navigator.userAgent || "");
+const IS_IOS = typeof navigator !== "undefined" && /iPad|iPhone|iPod/.test(navigator.userAgent || "");
+const SAFARI_MAX_SIDE = IS_IOS ? 4096 : 16384;
+const SAFARI_MAX_AREA = IS_IOS ? 16777216 : 268435456;
+function getSafeCanvasDims(w, h) {
+  const width = Math.max(1, Math.round(w));
+  const height = Math.max(1, Math.round(h));
+  if (!IS_SAFARI) return { width, height, scale: 1 };
+  const sideScale = Math.min(1, SAFARI_MAX_SIDE / Math.max(width, height));
+  const areaScale = Math.min(1, Math.sqrt(SAFARI_MAX_AREA / (width * height)));
+  const scale = Math.min(sideScale, areaScale);
+  if (scale >= 1) return { width, height, scale: 1 };
+  return {
+    width: Math.max(1, Math.floor(width * scale)),
+    height: Math.max(1, Math.floor(height * scale)),
+    scale
+  };
+}
+async function ensureImageDecoded(img) {
+  try {
+    if (typeof img.decode === "function") {
+      await img.decode();
+    }
+  } catch {
+  }
+}
 const SHADOW_RASTER_ALPHA_COMPENSATION = 0.84;
 function collectFontSpecsFromShadowMarkup(markup) {
   const specs = /* @__PURE__ */ new Set();
@@ -314,6 +340,7 @@ async function rasterizeStoredCropImageToPng(options) {
     }
   });
   if (!img) return null;
+  await ensureImageDecoded(img);
   const natW = Math.max(1, naturalWidth || img.naturalWidth || frameW);
   const natH = Math.max(1, naturalHeight || img.naturalHeight || frameH);
   const baseScale = Math.max(frameW / natW, frameH / natH);
@@ -328,8 +355,11 @@ async function rasterizeStoredCropImageToPng(options) {
   const offsetY = overflowY > 0 ? -overflowY * (clampedPanY - 0.5) : 0;
   const imgX = frameW / 2 + offsetX - drawW / 2;
   const imgY = frameH / 2 + offsetY - drawH / 2;
-  const outW = maintainResolution && natW > frameW ? Math.max(1, Math.round(natW)) : Math.max(1, Math.round(frameW * 2));
-  const outH = maintainResolution && natH > frameH ? Math.max(1, Math.round(natH)) : Math.max(1, Math.round(frameH * 2));
+  const requestedW = maintainResolution && natW > frameW ? Math.max(1, Math.round(natW)) : Math.max(1, Math.round(frameW * 2));
+  const requestedH = maintainResolution && natH > frameH ? Math.max(1, Math.round(natH)) : Math.max(1, Math.round(frameH * 2));
+  const safe = getSafeCanvasDims(requestedW, requestedH);
+  const outW = safe.width;
+  const outH = safe.height;
   const canvas = document.createElement("canvas");
   canvas.width = outW;
   canvas.height = outH;
@@ -491,6 +521,51 @@ function parseSvgNumber(value) {
   const n = Number(match[0]);
   return Number.isFinite(n) && n > 0 ? n : null;
 }
+function getPdfJpegQuality() {
+  return Math.max(0.5, Math.min(0.95, Number(__pdfJpegQuality) || 0.82));
+}
+function getCompressedRasterSizing(quality) {
+  if (quality >= 0.9) return { density: 2.25, maxEdge: 2600 };
+  if (quality >= 0.8) return { density: 1.9, maxEdge: 2200 };
+  if (quality >= 0.65) return { density: 1.45, maxEdge: 1700 };
+  return { density: 1.15, maxEdge: 1300 };
+}
+async function decodeImageForPdf(src) {
+  return new Promise((resolve) => {
+    try {
+      const img = new Image();
+      if (!src.startsWith("data:") && !src.startsWith("blob:")) img.crossOrigin = "anonymous";
+      img.onload = async () => {
+        try {
+          if (typeof img.decode === "function") await img.decode();
+        } catch {
+        }
+        resolve((img.naturalWidth || img.width) && (img.naturalHeight || img.height) ? img : null);
+      };
+      img.onerror = () => resolve(null);
+      img.src = src;
+    } catch {
+      resolve(null);
+    }
+  });
+}
+function decodedImageHasAlpha(img, width, height) {
+  try {
+    const sample = document.createElement("canvas");
+    sample.width = Math.min(32, Math.max(1, width));
+    sample.height = Math.min(32, Math.max(1, height));
+    const ctx = sample.getContext("2d");
+    if (!ctx) return false;
+    ctx.clearRect(0, 0, sample.width, sample.height);
+    ctx.drawImage(img, 0, 0, sample.width, sample.height);
+    const pixels = ctx.getImageData(0, 0, sample.width, sample.height).data;
+    for (let i = 3; i < pixels.length; i += 4) {
+      if (pixels[i] < 255) return true;
+    }
+  } catch {
+  }
+  return false;
+}
 function getApproxSvgTransformScale(image) {
   let sx = 1;
   let sy = 1;
@@ -517,6 +592,61 @@ function getApproxSvgTransformScale(image) {
   }
   return { x: Math.max(0.01, Math.abs(sx)), y: Math.max(0.01, Math.abs(sy)) };
 }
+async function rewriteCompressedLiveSvgRasterImages(svg) {
+  if (!__pdfCompressImages || typeof document === "undefined") return;
+  const images = Array.from(svg.querySelectorAll("image")).filter((image) => {
+    const href = getSvgImageHref(image).trim();
+    return /^data:image\/(?:png|jpe?g|webp|avif)[;,]/i.test(href);
+  });
+  if (images.length === 0) return;
+  const jpegQuality = getPdfJpegQuality();
+  const sizing = getCompressedRasterSizing(jpegQuality);
+  let rewritten = 0;
+  for (const image of images) {
+    const href = getSvgImageHref(image).trim();
+    const loaded = await decodeImageForPdf(href);
+    if (!loaded) continue;
+    const naturalW = Math.max(1, Math.round(loaded.naturalWidth || loaded.width || 1));
+    const naturalH = Math.max(1, Math.round(loaded.naturalHeight || loaded.height || 1));
+    const attrW = parseSvgNumber(image.getAttribute("width")) || naturalW;
+    const attrH = parseSvgNumber(image.getAttribute("height")) || naturalH;
+    const transformScale = getApproxSvgTransformScale(image);
+    let targetW = Math.max(1, Math.round(Math.min(naturalW, Math.max(attrW, attrW * transformScale.x * sizing.density))));
+    let targetH = Math.max(1, Math.round(Math.min(naturalH, Math.max(attrH, attrH * transformScale.y * sizing.density))));
+    const longest = Math.max(targetW, targetH);
+    if (longest > sizing.maxEdge) {
+      const scale = sizing.maxEdge / longest;
+      targetW = Math.max(1, Math.round(targetW * scale));
+      targetH = Math.max(1, Math.round(targetH * scale));
+    }
+    const hasAlpha = !/^data:image\/jpe?g[;,]/i.test(href) && decodedImageHasAlpha(loaded, naturalW, naturalH);
+    const canvas = document.createElement("canvas");
+    canvas.width = targetW;
+    canvas.height = targetH;
+    const ctx = canvas.getContext("2d");
+    if (!ctx) continue;
+    if (hasAlpha) {
+      ctx.clearRect(0, 0, targetW, targetH);
+    } else {
+      ctx.fillStyle = "#ffffff";
+      ctx.fillRect(0, 0, targetW, targetH);
+    }
+    ctx.imageSmoothingEnabled = true;
+    try {
+      ctx.imageSmoothingQuality = "high";
+    } catch {
+    }
+    ctx.drawImage(loaded, 0, 0, targetW, targetH);
+    const next = hasAlpha ? canvas.toDataURL("image/png") : canvas.toDataURL("image/jpeg", jpegQuality);
+    image.setAttribute("href", next);
+    if (image.hasAttribute("xlink:href")) image.setAttribute("xlink:href", next);
+    image.setAttribute("data-pixldocs-compressed-pdf-asset", hasAlpha ? "PNG" : "JPEG");
+    rewritten++;
+  }
+  if (rewritten > 0) {
+    console.log(`[client-pdf-export] compressed ${rewritten} live SVG raster image(s) @ q=${jpegQuality}`);
+  }
+}
 async function rewriteSafariInlineJpegImagesToPng(svg) {
   if (!isSafariLikeForInlineJpegSvgPdf() || typeof document === "undefined") return;
   const jpegImages = Array.from(svg.querySelectorAll("image")).filter((image) => /^data:image\/jpe?g[;,]/i.test(getSvgImageHref(image)));
@@ -562,8 +692,7 @@ async function rewriteSafariInlineJpegImagesToPng(svg) {
       const transformScale = getApproxSvgTransformScale(image);
       const renderedW = attrW * transformScale.x;
       const renderedH = attrH * transformScale.y;
-      const density = 2;
-      const maxEdge = 1800;
+      const { density, maxEdge } = getCompressedRasterSizing(getPdfJpegQuality());
       targetW = Math.max(1, Math.round(Math.min(attrW, renderedW * density || attrW)));
       targetH = Math.max(1, Math.round(Math.min(attrH, renderedH * density || attrH)));
       const longest = Math.max(targetW, targetH);
@@ -573,7 +702,6 @@ async function rewriteSafariInlineJpegImagesToPng(svg) {
         targetH = Math.max(1, Math.round(targetH * scale));
       }
     }
-    const outputAsPng = __pdfCompressImages;
     let pngDataUrl = null;
     for (const shrink of __pdfCompressImages ? [1, 0.82, 0.68, 0.55] : [1]) {
       const canvas = document.createElement("canvas");
@@ -584,7 +712,7 @@ async function rewriteSafariInlineJpegImagesToPng(svg) {
       ctx.fillStyle = "#ffffff";
       ctx.fillRect(0, 0, canvas.width, canvas.height);
       ctx.drawImage(loaded, 0, 0, canvas.width, canvas.height);
-      pngDataUrl = outputAsPng ? canvas.toDataURL("image/png") : canvas.toDataURL("image/jpeg", 1);
+      pngDataUrl = canvas.toDataURL("image/jpeg", __pdfCompressImages ? getPdfJpegQuality() : 1);
       if (!__pdfCompressImages || estimateDataUrlBytesForPdf(pngDataUrl) <= 4e6 || shrink === 0.55) break;
     }
     if (blobUrl) URL.revokeObjectURL(blobUrl);
@@ -629,8 +757,7 @@ async function rewriteUnsupportedRasterImagesForSvgPdf(svg) {
         const transformScale = getApproxSvgTransformScale(image);
         const renderedW = attrW * transformScale.x;
         const renderedH = attrH * transformScale.y;
-        const density = 2;
-        const maxEdge = 2200;
+        const { density, maxEdge } = getCompressedRasterSizing(getPdfJpegQuality());
         targetW = Math.max(1, Math.round(Math.min(bitmap.width || attrW, renderedW * density || attrW)));
         targetH = Math.max(1, Math.round(Math.min(bitmap.height || attrH, renderedH * density || attrH)));
         const longest = Math.max(targetW, targetH);
@@ -673,7 +800,7 @@ async function rewriteUnsupportedRasterImagesForSvgPdf(svg) {
       } catch {
       }
       ctx.drawImage(bitmap, 0, 0, targetW, targetH);
-      const jpegQuality = __pdfCompressImages ? Math.max(__pdfJpegQuality, 0.6) : 1;
+      const jpegQuality = __pdfCompressImages ? getPdfJpegQuality() : 1;
       const safeDataUrl = hasAlpha ? canvas.toDataURL("image/png") : canvas.toDataURL("image/jpeg", jpegQuality);
       image.setAttribute("href", safeDataUrl);
       if (image.hasAttribute("xlink:href")) image.setAttribute("xlink:href", safeDataUrl);
@@ -825,6 +952,28 @@ function isInSvgDefinitionSubtree(el) {
   }
   return false;
 }
+async function encodePdfRasterDataUrl(dataUrl, options) {
+  if (!__pdfCompressImages || !(options == null ? void 0 : options.allowJpeg)) return { data: dataUrl, format: "PNG" };
+  const loaded = await decodeImageForPdf(dataUrl);
+  if (!loaded) return { data: dataUrl, format: "PNG" };
+  const w = Math.max(1, Math.round(loaded.naturalWidth || loaded.width || 1));
+  const h = Math.max(1, Math.round(loaded.naturalHeight || loaded.height || 1));
+  if (decodedImageHasAlpha(loaded, w, h)) return { data: dataUrl, format: "PNG" };
+  const canvas = document.createElement("canvas");
+  canvas.width = w;
+  canvas.height = h;
+  const ctx = canvas.getContext("2d");
+  if (!ctx) return { data: dataUrl, format: "PNG" };
+  ctx.fillStyle = "#ffffff";
+  ctx.fillRect(0, 0, w, h);
+  ctx.imageSmoothingEnabled = true;
+  try {
+    ctx.imageSmoothingQuality = "high";
+  } catch {
+  }
+  ctx.drawImage(loaded, 0, 0, w, h);
+  return { data: canvas.toDataURL("image/jpeg", getPdfJpegQuality()), format: "JPEG" };
+}
 function parseInlineSvgStyleDeclarations(styleText) {
   return styleText.split(";").map((part) => part.trim()).filter(Boolean).map((part) => {
     const idx = part.indexOf(":");
@@ -2176,6 +2325,7 @@ async function prepareLiveCanvasSvgForPdf(rawSvg, pageWidth, pageHeight, pageKey
     }
     sanitizeSvgTreeForPdf(svgToDraw);
     await replaceLiveSvgRasterImagesWithOriginalAssets(svgToDraw, options == null ? void 0 : options.originalRasterImagesById);
+    await rewriteCompressedLiveSvgRasterImages(svgToDraw);
     await rewriteUnsupportedRasterImagesForSvgPdf(svgToDraw);
     await rewriteSafariInlineJpegImagesToPng(svgToDraw);
     try {
@@ -2801,7 +2951,7 @@ async function fetchSvgAsElement(imageUrl, colorMap) {
 async function getRecoloredSvgDataUrl(imageUrl, colorMap) {
   if (!colorMap || Object.keys(colorMap).length === 0) return null;
   try {
-    const { getNormalizedSvgUrl } = await import("./index-DOIdbh-Q.js").then((n) => n.a6);
+    const { getNormalizedSvgUrl } = await import("./index-C0tTvSFQ.js").then((n) => n.a6);
     return await getNormalizedSvgUrl(imageUrl, colorMap);
   } catch {
     return null;
@@ -3497,7 +3647,7 @@ function __setPdfJpegQuality(v) {
   if (typeof v === "number" && isFinite(v) && v > 0 && v <= 1) __pdfJpegQuality = v;
 }
 function pdfRasterCompression() {
-  return __pdfCompressImages ? "SLOW" : "NONE";
+  return __pdfCompressImages ? "SLOW" : "FAST";
 }
 function normalizeBgColor(bg) {
   if (!bg || bg === "transparent" || bg === "none") return "#ffffff";
@@ -3547,9 +3697,11 @@ function getTargetPixelSize(bitmap, opts) {
   if (!__pdfCompressImages && !(opts.resolutionMultiplier && opts.resolutionMultiplier > 1)) {
     return { w: bitmap.width, h: bitmap.height };
   }
-  const dpiScale = 1.5 * (opts.resolutionMultiplier ?? 1);
+  const quality = getPdfJpegQuality();
+  const compressedSizing = getCompressedRasterSizing(quality);
+  const dpiScale = (__pdfCompressImages ? compressedSizing.density : 1.5) * (opts.resolutionMultiplier ?? 1);
   const hasMultiplier = !!(opts.resolutionMultiplier && opts.resolutionMultiplier > 1);
-  const maxPx = !__pdfCompressImages ? 1e4 : hasMultiplier ? 4400 : 2200;
+  const maxPx = !__pdfCompressImages ? 1e4 : hasMultiplier ? Math.max(3200, compressedSizing.maxEdge * 1.7) : compressedSizing.maxEdge;
   const capByBitmap = !(opts.resolutionMultiplier && opts.resolutionMultiplier > 1);
   const desiredW = Math.max(1, Math.round((opts.targetWidthPt ?? bitmap.width) * dpiScale));
   const desiredH = Math.max(1, Math.round((opts.targetHeightPt ?? bitmap.height) * dpiScale));
@@ -3579,7 +3731,7 @@ async function rasterizeToDataUrl(blob, opts, out, flattenBackground) {
   }
   ctx.drawImage(bitmap, 0, 0, w, h);
   if (out === "JPEG") {
-    const quality = __pdfCompressImages ? __pdfJpegQuality : 1;
+    const quality = __pdfCompressImages ? getPdfJpegQuality() : 1;
     return canvas.toDataURL("image/jpeg", quality);
   }
   return canvas.toDataURL("image/png");
@@ -3608,7 +3760,7 @@ async function fetchImageAsBase64(imageUrl, opts = {}) {
     }
     let fetchUrl = imageUrl;
     if (imageUrl.startsWith("http://") || imageUrl.startsWith("https://")) {
-      const { isPrivateUrl } = await import("./index-DOIdbh-Q.js").then((n) => n.a6);
+      const { isPrivateUrl } = await import("./index-C0tTvSFQ.js").then((n) => n.a6);
       if (isPrivateUrl(imageUrl)) return null;
       const proxyUrl = new URL(`${API_URL}/image-proxy`);
       proxyUrl.searchParams.set("url", imageUrl);
@@ -3837,6 +3989,7 @@ async function rasterizeCropGroupToPng(liveGroup, frameW, frameH, multiplier = 2
         }
       }
       if (htmlImg) {
+        await ensureImageDecoded(htmlImg);
         const iw = htmlImg.naturalWidth || useNatW;
         const ih = htmlImg.naturalHeight || useNatH;
         const baseScale = Math.max(frameW / iw, frameH / ih);
@@ -3854,39 +4007,42 @@ async function rasterizeCropGroupToPng(liveGroup, frameW, frameH, multiplier = 2
         const srcW = Math.min(Math.ceil(frameW / finalScale), iw - srcX);
         const srcH = Math.min(Math.ceil(frameH / finalScale), ih - srcY);
         if (srcW >= 1 && srcH >= 1) {
+          const safeCrop = getSafeCanvasDims(srcW, srcH);
           const cropCanvas = document.createElement("canvas");
-          cropCanvas.width = srcW;
-          cropCanvas.height = srcH;
+          cropCanvas.width = safeCrop.width;
+          cropCanvas.height = safeCrop.height;
           const ctx = cropCanvas.getContext("2d");
           if (ctx) {
+            const dstW = safeCrop.width;
+            const dstH = safeCrop.height;
             if (bgFill) {
               ctx.fillStyle = bgFill;
-              ctx.fillRect(0, 0, srcW, srcH);
+              ctx.fillRect(0, 0, dstW, dstH);
             } else {
-              ctx.clearRect(0, 0, srcW, srcH);
+              ctx.clearRect(0, 0, dstW, dstH);
             }
-            ctx.drawImage(htmlImg, srcX, srcY, srcW, srcH, 0, 0, srcW, srcH);
+            ctx.drawImage(htmlImg, srcX, srcY, srcW, srcH, 0, 0, dstW, dstH);
             if (shape === "circle" || shape === "roundRect" || shape === "rect") {
               ctx.globalCompositeOperation = "destination-in";
               if (shape === "circle") {
                 ctx.beginPath();
-                ctx.ellipse(srcW / 2, srcH / 2, srcW / 2, srcH / 2, 0, 0, 2 * Math.PI);
+                ctx.ellipse(dstW / 2, dstH / 2, dstW / 2, dstH / 2, 0, 0, 2 * Math.PI);
                 ctx.fill();
               } else {
                 const rx2 = Math.min(
-                  (rxRatio > 0.5 ? rxRatio : rxRatio * minFrameDim) * (srcW / frameW),
-                  srcW / 2,
-                  srcH / 2
+                  (rxRatio > 0.5 ? rxRatio : rxRatio * minFrameDim) * (dstW / frameW),
+                  dstW / 2,
+                  dstH / 2
                 );
                 const r = Math.max(0, rx2);
                 ctx.beginPath();
                 ctx.moveTo(r, 0);
-                ctx.lineTo(srcW - r, 0);
-                if (r > 0) ctx.quadraticCurveTo(srcW, 0, srcW, r);
-                ctx.lineTo(srcW, srcH - r);
-                if (r > 0) ctx.quadraticCurveTo(srcW, srcH, srcW - r, srcH);
-                ctx.lineTo(r, srcH);
-                if (r > 0) ctx.quadraticCurveTo(0, srcH, 0, srcH - r);
+                ctx.lineTo(dstW - r, 0);
+                if (r > 0) ctx.quadraticCurveTo(dstW, 0, dstW, r);
+                ctx.lineTo(dstW, dstH - r);
+                if (r > 0) ctx.quadraticCurveTo(dstW, dstH, dstW - r, dstH);
+                ctx.lineTo(r, dstH);
+                if (r > 0) ctx.quadraticCurveTo(0, dstH, 0, dstH - r);
                 ctx.lineTo(0, r);
                 if (r > 0) ctx.quadraticCurveTo(0, 0, r, 0);
                 ctx.closePath();
@@ -3905,8 +4061,11 @@ async function rasterizeCropGroupToPng(liveGroup, frameW, frameH, multiplier = 2
     const natH = (dims == null ? void 0 : dims.height) ?? (stored == null ? void 0 : stored.naturalHeight) ?? frameH;
     const useNatW = natW > 0 && natH > 0 ? natW : frameW;
     const useNatH = natW > 0 && natH > 0 ? natH : frameH;
-    const outW2 = maintainResolution && useNatW > frameW ? Math.max(1, Math.round(useNatW)) : Math.max(1, Math.round(frameW * multiplier));
-    const outH2 = maintainResolution && useNatH > frameH ? Math.max(1, Math.round(useNatH)) : Math.max(1, Math.round(frameH * multiplier));
+    const reqOutW = maintainResolution && useNatW > frameW ? Math.max(1, Math.round(useNatW)) : Math.max(1, Math.round(frameW * multiplier));
+    const reqOutH = maintainResolution && useNatH > frameH ? Math.max(1, Math.round(useNatH)) : Math.max(1, Math.round(frameH * multiplier));
+    const safeOut = getSafeCanvasDims(reqOutW, reqOutH);
+    const outW2 = safeOut.width;
+    const outH2 = safeOut.height;
     const proxied = getProxiedImageUrl(imageUrl);
     const res = await fetch(proxied);
     if (!res.ok) throw new Error(`Export blob fetch failed: ${res.status}`);
@@ -4498,6 +4657,7 @@ async function drawElement(pdf, element, embeddedFonts, canvasWidth, canvasHeigh
         if (fadedMasked) {
           png = fadedMasked;
         }
+        const encodedMasked = await encodePdfRasterDataUrl(png, { allowJpeg: !fadedMasked });
         if (canUseAdvancedTransforms2 && fabricMatrix && fabricMatrix.length === 6) {
           const mPdf = fabricMatrixToJsPdfAdvancedMatrix(fabricMatrix);
           const localX = -frameW / 2;
@@ -4505,13 +4665,13 @@ async function drawElement(pdf, element, embeddedFonts, canvasWidth, canvasHeigh
           anyPdf2.advancedAPI(() => {
             pdf.saveGraphicsState();
             anyPdf2.setCurrentTransformationMatrix(anyPdf2.Matrix(...mPdf));
-            pdf.addImage(png, "PNG", localX, localY, frameW, frameH, void 0, pdfRasterCompression());
+            pdf.addImage(encodedMasked.data, encodedMasked.format, localX, localY, frameW, frameH, void 0, pdfRasterCompression());
             pdf.restoreGraphicsState();
           });
           pdf.setGState(pdf.GState({ opacity: 1, "stroke-opacity": 1 }));
           return;
         }
-        pdf.addImage(png, "PNG", norm.x, norm.y, frameW, frameH, void 0, pdfRasterCompression());
+        pdf.addImage(encodedMasked.data, encodedMasked.format, norm.x, norm.y, frameW, frameH, void 0, pdfRasterCompression());
         pdf.setGState(pdf.GState({ opacity: 1, "stroke-opacity": 1 }));
         return;
       }
@@ -5018,8 +5178,8 @@ async function drawElementContentCore(pdf, element, norm, x, y, w, h, embeddedFo
           if (croppedPng) {
             try {
               const fadedCrop = await bakeEdgeFadeIntoDataUrl(croppedPng, element);
-              const finalCropPng = fadedCrop || croppedPng;
-              pdf.addImage(finalCropPng, "PNG", x, y, w, h, void 0, pdfRasterCompression());
+              const encodedCrop = await encodePdfRasterDataUrl(fadedCrop || croppedPng, { allowJpeg: !fadedCrop });
+              pdf.addImage(encodedCrop.data, encodedCrop.format, x, y, w, h, void 0, pdfRasterCompression());
               break;
             } catch {
             }
@@ -5227,10 +5387,21 @@ function getExpectedRasterImageIdsForPdfPage(page) {
 function getOriginalRasterImageUrlMapForPdfPage(page) {
   const byId = /* @__PURE__ */ new Map();
   const isSvgUrl = (url) => /\.svg(?:\?|#|$)/i.test(url) || /^data:image\/svg/i.test(url);
+  const hasVisualImageEffect = (item) => {
+    const hasCrop = item.cropPanX != null || item.cropPanY != null || item.cropZoom != null;
+    const hasMask = item.maskSvgUrl || item.clipShape && item.clipShape !== "none" && item.clipShape !== "rectangle";
+    const hasFade = ["Top", "Right", "Bottom", "Left"].some(
+      (side) => item[`fade${side}Amount`] != null || item[`fade${side}Size`] != null || item[`fade${side}Hardness`] != null
+    );
+    const hasFrame = (item.strokeWidth ?? 0) > 0 || !!item.stroke || (item.rx ?? 0) > 0 || (item.ry ?? 0) > 0;
+    const hasShadowOrFilter = item.shadow || item.shadowColor || item.shadowBlur || item.shadowOffsetX || item.shadowOffsetY || item.filter || item.filters;
+    return Boolean(hasCrop || hasMask || hasFade || hasFrame || hasShadowOrFilter);
+  };
   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;
+    if (hasVisualImageEffect(item)) continue;
     byId.set(item.id, src);
   }
   return byId;
@@ -5276,7 +5447,10 @@ async function __exportMultiPagePdfInner(pages, options) {
     unit: "px",
     format: [firstPage.width, firstPage.height],
     hotfixes: ["px_scaling"],
-    compress: __pdfCompressImages
+    // Always keep PDF object/stream compression on. The UI's image-compression
+    // switch controls raster resampling/JPEG quality, not lossless PDF packing;
+    // disabling this made "uncompressed image" PDFs balloon with no quality gain.
+    compress: true
   });
   if (title) {
     pdf.setProperties({ title, creator: "DocuForge" });
@@ -5687,4 +5861,4 @@ export {
   preparePagesForExport,
   rewriteSvgFontsForJsPDFWithSourceMeta
 };
-//# sourceMappingURL=vectorPdfExport-C0GsER0C.js.map
+//# sourceMappingURL=vectorPdfExport-BEGl71uB.js.map