@pixldocs/canvas-renderer 0.5.40 → 0.5.42

package/dist/index.d.ts

@@ -221,7 +221,7 @@ export declare function normalizeFontFamily(fontStack: string): string;
  * Package version banner. Bump alongside package.json so we can confirm
  * (via browser:log) that the deployed bundle matches the expected build.
  */
-export declare const PACKAGE_VERSION = "0.5.40";
+export declare const PACKAGE_VERSION = "0.5.42";
 
 export declare interface PageSettings {
     backgroundColor?: string;
@@ -249,6 +249,8 @@ export declare interface PdfFromFormOptions {
     themeId?: string;
     /** Whether to inject watermark. Default: auto (true for paid templates, false for free). */
     watermark?: boolean;
+    /** Customize watermark text/opacity/fontSize/angle. Defaults preserve current behavior. */
+    watermarkOptions?: WatermarkOptions;
     /** Optional prefetched rows from a trusted server to skip browser-side REST fetching. */
     prefetched?: ResolveFromFormOptions['prefetched'];
     /** PDF document title */
@@ -418,6 +420,8 @@ export declare interface RenderFromFormOptions extends Omit<RenderOptions, 'page
     themeId?: string;
     /** Whether to inject watermark on preview. Default: auto (true for paid templates, false for free). */
     watermark?: boolean;
+    /** Customize watermark text/opacity/fontSize/angle. Defaults preserve current behavior. */
+    watermarkOptions?: WatermarkOptions;
     /** Optional prefetched rows from a trusted server to skip browser-side REST fetching. */
     prefetched?: ResolveFromFormOptions['prefetched'];
 }
@@ -638,4 +642,12 @@ export declare function warmResolvedTemplateForPreview(config: TemplateConfig, o
  */
 export declare function warmTemplateFromForm(options: ResolveFromFormOptions & WarmOptions): Promise<void>;
 
+/** Watermark appearance overrides (mirrors src/lib/canvasWatermark WatermarkOptions). */
+declare interface WatermarkOptions {
+    text?: string;
+    opacity?: number;
+    fontSize?: number;
+    angle?: number;
+}
+
 export { }

package/dist/index.js

@@ -4782,6 +4782,157 @@ function calculateScaleSnapGuides(scalingObj, corner, canvas, canvasWidth, canva
     return true;
   });
 }
+const PD_BG_KEY = "__pdBg";
+const PATCHED_KEY = "__pdBgPatched";
+function extractTextBgConfig(element) {
+  return {
+    color: element.textBgColor,
+    padding: Math.max(0, Number(element.textBgPadding ?? 0)) || 0,
+    rxTL: Math.max(0, Number(element.textBgRxTL ?? 0)) || 0,
+    rxTR: Math.max(0, Number(element.textBgRxTR ?? 0)) || 0,
+    rxBR: Math.max(0, Number(element.textBgRxBR ?? 0)) || 0,
+    rxBL: Math.max(0, Number(element.textBgRxBL ?? 0)) || 0
+  };
+}
+function hasTextBackground(cfg) {
+  if (!cfg) return false;
+  const c = (cfg.color || "").toString().trim().toLowerCase();
+  return !!c && c !== "transparent" && c !== "none" && c !== "rgba(0,0,0,0)";
+}
+function buildTextShadow(element) {
+  const color = element.textShadowColor;
+  const blur = Number(element.textShadowBlur ?? 0);
+  const ox = Number(element.textShadowOffsetX ?? 0);
+  const oy = Number(element.textShadowOffsetY ?? 0);
+  if (!color || color === "transparent") return null;
+  if (blur === 0 && ox === 0 && oy === 0) return null;
+  return new fabric.Shadow({
+    color,
+    blur: blur || 0,
+    offsetX: ox || 0,
+    offsetY: oy || 0,
+    affectStroke: false,
+    nonScaling: false
+  });
+}
+function buildRoundedRectPath2D(ctx, x, y, w, h, rTL, rTR, rBR, rBL) {
+  const maxR = Math.min(w, h) / 2;
+  const tl = Math.min(Math.max(0, rTL), maxR);
+  const tr = Math.min(Math.max(0, rTR), maxR);
+  const br = Math.min(Math.max(0, rBR), maxR);
+  const bl = Math.min(Math.max(0, rBL), maxR);
+  ctx.beginPath();
+  ctx.moveTo(x + tl, y);
+  ctx.lineTo(x + w - tr, y);
+  if (tr > 0) ctx.quadraticCurveTo(x + w, y, x + w, y + tr);
+  ctx.lineTo(x + w, y + h - br);
+  if (br > 0) ctx.quadraticCurveTo(x + w, y + h, x + w - br, y + h);
+  ctx.lineTo(x + bl, y + h);
+  if (bl > 0) ctx.quadraticCurveTo(x, y + h, x, y + h - bl);
+  ctx.lineTo(x, y + tl);
+  if (tl > 0) ctx.quadraticCurveTo(x, y, x + tl, y);
+  ctx.closePath();
+}
+function applyTextBackground(obj, cfg) {
+  var _a;
+  obj[PD_BG_KEY] = { ...cfg };
+  if (obj[PATCHED_KEY]) return;
+  obj[PATCHED_KEY] = true;
+  const originalRender = obj._render.bind(obj);
+  obj._render = function(ctx) {
+    const bg = this[PD_BG_KEY];
+    if (hasTextBackground(bg)) {
+      const w = this.width ?? 0;
+      const h = this.height ?? 0;
+      const pad = Math.max(0, Number(bg.padding ?? 0));
+      const x = -w / 2 - pad;
+      const y = -h / 2 - pad;
+      const bgW = w + pad * 2;
+      const bgH = h + pad * 2;
+      ctx.save();
+      buildRoundedRectPath2D(
+        ctx,
+        x,
+        y,
+        bgW,
+        bgH,
+        bg.rxTL ?? 0,
+        bg.rxTR ?? 0,
+        bg.rxBR ?? 0,
+        bg.rxBL ?? 0
+      );
+      ctx.fillStyle = bg.color;
+      ctx.fill();
+      ctx.restore();
+    }
+    originalRender(ctx);
+  };
+  const originalToObject = obj.toObject.bind(obj);
+  obj.toObject = function(propertiesToInclude) {
+    const out = originalToObject(propertiesToInclude);
+    const bg = this[PD_BG_KEY];
+    if (hasTextBackground(bg)) {
+      out.__pdBg = { ...bg };
+    }
+    return out;
+  };
+  const originalToSVG = (_a = obj.toSVG) == null ? void 0 : _a.bind(obj);
+  if (typeof originalToSVG === "function") {
+    obj.toSVG = function(reviver) {
+      const svg = originalToSVG(reviver);
+      const bg = this[PD_BG_KEY];
+      if (!hasTextBackground(bg)) return svg;
+      const w = this.width ?? 0;
+      const h = this.height ?? 0;
+      const pad = Math.max(0, Number(bg.padding ?? 0));
+      const x = -w / 2 - pad;
+      const y = -h / 2 - pad;
+      const bgW = w + pad * 2;
+      const bgH = h + pad * 2;
+      const d = buildRoundedRectPathD(
+        x,
+        y,
+        bgW,
+        bgH,
+        bg.rxTL ?? 0,
+        bg.rxTR ?? 0,
+        bg.rxBR ?? 0,
+        bg.rxBL ?? 0
+      );
+      const fill = bg.color;
+      const bgPath = `<path d="${d}" fill="${escapeXmlAttr(fill)}" />`;
+      const openTagMatch = svg.match(/^\s*<g\b[^>]*>/);
+      if (openTagMatch) {
+        const openTag = openTagMatch[0];
+        return svg.replace(openTag, openTag + bgPath);
+      }
+      return `<g>${bgPath}${svg}</g>`;
+    };
+  }
+}
+function buildRoundedRectPathD(x, y, w, h, rTL, rTR, rBR, rBL) {
+  const maxR = Math.min(w, h) / 2;
+  const tl = Math.min(Math.max(0, rTL), maxR);
+  const tr = Math.min(Math.max(0, rTR), maxR);
+  const br = Math.min(Math.max(0, rBR), maxR);
+  const bl = Math.min(Math.max(0, rBL), maxR);
+  const fmt = (n) => Number.isFinite(n) ? Number(n.toFixed(3)) : 0;
+  const parts = [];
+  parts.push(`M ${fmt(x + tl)} ${fmt(y)}`);
+  parts.push(`L ${fmt(x + w - tr)} ${fmt(y)}`);
+  if (tr > 0) parts.push(`Q ${fmt(x + w)} ${fmt(y)} ${fmt(x + w)} ${fmt(y + tr)}`);
+  parts.push(`L ${fmt(x + w)} ${fmt(y + h - br)}`);
+  if (br > 0) parts.push(`Q ${fmt(x + w)} ${fmt(y + h)} ${fmt(x + w - br)} ${fmt(y + h)}`);
+  parts.push(`L ${fmt(x + bl)} ${fmt(y + h)}`);
+  if (bl > 0) parts.push(`Q ${fmt(x)} ${fmt(y + h)} ${fmt(x)} ${fmt(y + h - bl)}`);
+  parts.push(`L ${fmt(x)} ${fmt(y + tl)}`);
+  if (tl > 0) parts.push(`Q ${fmt(x)} ${fmt(y)} ${fmt(x + tl)} ${fmt(y)}`);
+  parts.push("Z");
+  return parts.join(" ");
+}
+function escapeXmlAttr(s) {
+  return String(s).replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 const TRIANGLE_STROKE_MITER_LIMIT = 1e6;
 const toSafeNumber = (value, fallback = 0) => Number.isFinite(value) ? Math.max(0, Number(value)) : fallback;
 function normalizeShapeType(shapeType) {
@@ -5082,6 +5233,9 @@ function createText(element) {
     textbox.setCoords();
   }
   textbox.dirty = true;
+  applyTextBackground(textbox, extractTextBgConfig(element));
+  const shadow = buildTextShadow(element);
+  if (shadow) textbox.set("shadow", shadow);
   return textbox;
 }
 function createLine(element) {
@@ -7694,7 +7848,19 @@ const PageCanvas = forwardRef(
                 const resolvedSizeForCompare = (pageChildren == null ? void 0 : pageChildren.length) ? getNodeBounds(element, pageChildren) : { width: typeof element.width === "number" ? element.width : 0, height: typeof element.height === "number" ? element.height : 0 };
                 const fabricText = existingObj.text ?? "";
                 const storeText = element.text ?? "";
-                const otherPropsChanged = Math.abs((existingObj.width ?? 0) - resolvedSizeForCompare.width) > 0.1 || Math.abs((existingObj.height ?? 0) - resolvedSizeForCompare.height) > 0.1 || Math.abs((existingObj.angle ?? 0) - (element.angle ?? 0)) > 0.1 || Math.abs((existingObj.scaleX ?? 1) - (element.scaleX ?? 1)) > 0.01 || Math.abs((existingObj.scaleY ?? 1) - (element.scaleY ?? 1)) > 0.01 || (existingObj.flipX ?? false) !== (element.flipX ?? false) || (existingObj.flipY ?? false) !== (element.flipY ?? false) || fabricText !== storeText || existingObj.fill !== (element.fill ?? "") || existingObj.stroke !== (element.stroke ?? "") || Math.abs((existingObj.strokeWidth ?? 0) - (element.strokeWidth ?? 0)) > 0.01 || Math.abs((existingObj.opacity ?? 1) - (element.opacity ?? 1)) > 0.01 || (existingObj.fontSize ?? 0) !== (element.fontSize ?? 0) || (existingObj.fontFamily ?? "") !== (element.fontFamily ?? "") || // CRITICAL: Detect gradient fill/stroke changes — serialise to JSON for deep comparison
+                const otherPropsChanged = Math.abs((existingObj.width ?? 0) - resolvedSizeForCompare.width) > 0.1 || Math.abs((existingObj.height ?? 0) - resolvedSizeForCompare.height) > 0.1 || Math.abs((existingObj.angle ?? 0) - (element.angle ?? 0)) > 0.1 || Math.abs((existingObj.scaleX ?? 1) - (element.scaleX ?? 1)) > 0.01 || Math.abs((existingObj.scaleY ?? 1) - (element.scaleY ?? 1)) > 0.01 || (existingObj.flipX ?? false) !== (element.flipX ?? false) || (existingObj.flipY ?? false) !== (element.flipY ?? false) || fabricText !== storeText || existingObj.fill !== (element.fill ?? "") || existingObj.stroke !== (element.stroke ?? "") || Math.abs((existingObj.strokeWidth ?? 0) - (element.strokeWidth ?? 0)) > 0.01 || Math.abs((existingObj.opacity ?? 1) - (element.opacity ?? 1)) > 0.01 || (existingObj.fontSize ?? 0) !== (element.fontSize ?? 0) || (existingObj.fontFamily ?? "") !== (element.fontFamily ?? "") || // Detect text background + shadow changes so panel edits flow into Fabric.
+                JSON.stringify({
+                  c: element.textBgColor ?? null,
+                  p: element.textBgPadding ?? 0,
+                  tl: element.textBgRxTL ?? 0,
+                  tr: element.textBgRxTR ?? 0,
+                  br: element.textBgRxBR ?? 0,
+                  bl: element.textBgRxBL ?? 0,
+                  sc: element.textShadowColor ?? null,
+                  sb: element.textShadowBlur ?? 0,
+                  sx: element.textShadowOffsetX ?? 0,
+                  sy: element.textShadowOffsetY ?? 0
+                }) !== (existingObj.__lastTextBgShadowJson ?? "") || // CRITICAL: Detect gradient fill/stroke changes — serialise to JSON for deep comparison
                 JSON.stringify(element.fillGradient || null) !== (existingObj.__lastFillGradientJson ?? "null") || JSON.stringify(element.strokeGradient || null) !== (existingObj.__lastStrokeGradientJson ?? "null");
                 const forceApplyFromPanel = syncTriggeredByPanelRef.current;
                 const noPropsOrPositionChanged = !positionChanged && !otherPropsChanged;
@@ -8589,6 +8755,26 @@ const PageCanvas = forwardRef(
         }
         obj.setCoords();
         obj.dirty = true;
+        try {
+          applyTextBackground(obj, extractTextBgConfig(element));
+          const shadow = buildTextShadow(element);
+          obj.set("shadow", shadow ?? null);
+          obj.__lastTextBgShadowJson = JSON.stringify({
+            c: element.textBgColor ?? null,
+            p: element.textBgPadding ?? 0,
+            tl: element.textBgRxTL ?? 0,
+            tr: element.textBgRxTR ?? 0,
+            br: element.textBgRxBR ?? 0,
+            bl: element.textBgRxBL ?? 0,
+            sc: element.textShadowColor ?? null,
+            sb: element.textShadowBlur ?? 0,
+            sx: element.textShadowOffsetX ?? 0,
+            sy: element.textShadowOffsetY ?? 0
+          });
+          obj.dirty = true;
+        } catch (err) {
+          console.warn("[text-bg] failed to apply background/shadow", err);
+        }
       } else if (!isImage && !isLine) {
         if (obj instanceof fabric.Circle) {
           obj.set({
@@ -12053,7 +12239,7 @@ function PixldocsPreview(props) {
     !canvasSettled && /* @__PURE__ */ jsx("div", { style: { position: "absolute", inset: 0, display: "flex", alignItems: "center", justifyContent: "center", minHeight: 200 }, children: /* @__PURE__ */ jsx("div", { style: { color: "#888", fontSize: 14 }, children: "Loading preview..." }) })
   ] });
 }
-const PACKAGE_VERSION = "0.5.40";
+const PACKAGE_VERSION = "0.5.42";
 let __underlineFixInstalled = false;
 function installUnderlineFix(fab) {
   var _a;
@@ -12208,7 +12394,7 @@ class PixldocsRenderer {
    * This is the primary external API for the package.
    */
   async renderFromForm(options) {
-    const { templateId, formSchemaId, sectionState, themeId, watermark, prefetched, ...renderOpts } = options;
+    const { templateId, formSchemaId, sectionState, themeId, watermark, watermarkOptions, prefetched, ...renderOpts } = options;
     const resolved = await resolveFromForm({
       templateId,
       formSchemaId,
@@ -12221,8 +12407,8 @@ class PixldocsRenderer {
     const shouldWatermark = watermark ?? resolved.price > 0;
     let configToRender = resolved.config;
     if (shouldWatermark) {
-      const { injectWatermark } = await import("./canvasWatermark-CM85x4k7.js");
-      configToRender = injectWatermark(configToRender);
+      const { injectWatermark } = await import("./canvasWatermark-pkhacGge.js");
+      configToRender = injectWatermark(configToRender, watermarkOptions);
     }
     return this.renderAllPages(configToRender, renderOpts);
   }
@@ -12261,7 +12447,7 @@ class PixldocsRenderer {
    * Resolve from V2 sectionState and return SVGs for all pages (for server vector PDF).
    */
   async renderSvgsFromForm(options) {
-    const { templateId, formSchemaId, sectionState, themeId, watermark, prefetched } = options;
+    const { templateId, formSchemaId, sectionState, themeId, watermark, watermarkOptions, prefetched } = options;
     const resolved = await resolveFromForm({
       templateId,
       formSchemaId,
@@ -12274,8 +12460,8 @@ class PixldocsRenderer {
     const shouldWatermark = watermark ?? resolved.price > 0;
     let configToRender = resolved.config;
     if (shouldWatermark) {
-      const { injectWatermark } = await import("./canvasWatermark-CM85x4k7.js");
-      configToRender = injectWatermark(configToRender);
+      const { injectWatermark } = await import("./canvasWatermark-pkhacGge.js");
+      configToRender = injectWatermark(configToRender, watermarkOptions);
     }
     return this.renderAllPageSvgs(configToRender);
   }
@@ -12293,7 +12479,7 @@ class PixldocsRenderer {
    * This is the primary PDF export API — mirrors renderFromForm() but returns a PDF.
    */
   async renderPdfFromForm(options) {
-    const { templateId, formSchemaId, sectionState, themeId, watermark, prefetched, title, fontBaseUrl } = options;
+    const { templateId, formSchemaId, sectionState, themeId, watermark, watermarkOptions, prefetched, title, fontBaseUrl } = options;
     const resolved = await resolveFromForm({
       templateId,
       formSchemaId,
@@ -12306,8 +12492,8 @@ class PixldocsRenderer {
     const shouldWatermark = watermark ?? resolved.price > 0;
     let configToRender = resolved.config;
     if (shouldWatermark) {
-      const { injectWatermark } = await import("./canvasWatermark-CM85x4k7.js");
-      configToRender = injectWatermark(configToRender);
+      const { injectWatermark } = await import("./canvasWatermark-pkhacGge.js");
+      configToRender = injectWatermark(configToRender, watermarkOptions);
     }
     const svgs = await this.renderAllPageSvgs(configToRender);
     const { assemblePdfFromSvgs: assemblePdfFromSvgs2 } = await Promise.resolve().then(() => pdfExport);