@pixldocs/canvas-renderer 0.4.3 → 0.4.5

package/dist/index.d.ts

@@ -437,6 +437,9 @@ export declare function resolveTemplateData(options: ResolveOptions): Promise<Re
  * CRITICAL: Also sets font-weight to "normal" because the weight is already baked into
  * the jsPDF font name (e.g. JosefinSans-SemiBold). Without this, svg2pdf combines
  * font-weight + font-style into "600normal" which won't match fonts registered with style "normal".
+ *
+ * For Devanagari text: splits <tspan> elements containing mixed scripts into separate
+ * <tspan> children — Latin runs use the original font, Devanagari runs use FONT_FALLBACK_DEVANAGARI.
  */
 export declare function rewriteSvgFontsForJsPDF(svgStr: string): string;
 

package/dist/index.js

@@ -2558,13 +2558,23 @@ const clearFabricCharCache = () => {
 };
 const clearFontCacheAndRerender = (canvas) => {
   clearFabricCharCache();
-  canvas.getObjects().forEach((obj) => {
+  const fixTextbox = (obj) => {
+    var _a;
     if (obj instanceof fabric.Textbox) {
+      const savedWidth = obj.width;
       obj.dirty = true;
       obj.initDimensions();
+      if (savedWidth != null && Math.abs((obj.width ?? 0) - savedWidth) > 0.01) {
+        obj.width = savedWidth;
+      }
+      obj.setCoords();
+    } else if (obj instanceof fabric.Group) {
+      (_a = obj._objects) == null ? void 0 : _a.forEach(fixTextbox);
+      obj.dirty = true;
       obj.setCoords();
     }
-  });
+  };
+  canvas.getObjects().forEach(fixTextbox);
   canvas.requestRenderAll();
 };
 const ensureFontLoaded = async (fontFamily) => {
@@ -11871,8 +11881,47 @@ async function embedFontsForConfig(pdf, config, fontBaseUrl) {
   console.log(`[pdf-fonts] Embedded ${embedded.size} font variants from config`);
   return embedded;
 }
+function isDevanagari(char) {
+  const c = char.codePointAt(0) ?? 0;
+  return c >= 2304 && c <= 2431 || c >= 43232 && c <= 43263 || c >= 7376 && c <= 7423;
+}
+function containsDevanagari(text) {
+  if (!text) return false;
+  for (const char of text) {
+    if (isDevanagari(char)) return true;
+  }
+  return false;
+}
+function isBasicLatinOrLatin1(char) {
+  const c = char.codePointAt(0) ?? 0;
+  return c <= 591;
+}
+function classifyChar(char) {
+  if (isBasicLatinOrLatin1(char)) return "main";
+  if (isDevanagari(char)) return "devanagari";
+  return "symbol";
+}
+function splitIntoRuns(text) {
+  if (!text) return [];
+  const runs = [];
+  let currentType = null;
+  let currentText = "";
+  for (const char of text) {
+    const type = classifyChar(char);
+    if (type !== currentType && currentText) {
+      runs.push({ text: currentText, runType: currentType });
+      currentText = "";
+    }
+    currentType = type;
+    currentText += char;
+  }
+  if (currentText && currentType) {
+    runs.push({ text: currentText, runType: currentType });
+  }
+  return runs;
+}
 function rewriteSvgFontsForJsPDF(svgStr) {
-  var _a;
+  var _a, _b;
   const parser = new DOMParser();
   const doc = parser.parseFromString(svgStr, "image/svg+xml");
   const textEls = doc.querySelectorAll("text, tspan, textPath");
@@ -11893,6 +11942,17 @@ function rewriteSvgFontsForJsPDF(svgStr) {
     }
     return null;
   };
+  const resolveWeightNum = (weightRaw) => {
+    const parsedWeight = Number.parseInt(weightRaw, 10);
+    return Number.isFinite(parsedWeight) ? parsedWeight : /bold/i.test(weightRaw) ? 700 : /medium/i.test(weightRaw) ? 500 : /semi/i.test(weightRaw) ? 600 : /light/i.test(weightRaw) ? 300 : 400;
+  };
+  const buildStyleString = (existingStyle, fontName) => {
+    const stylePairs = existingStyle.split(";").map((part) => part.trim()).filter(Boolean).filter((part) => !/^font-family\s*:/i.test(part) && !/^font-weight\s*:/i.test(part) && !/^font-style\s*:/i.test(part));
+    stylePairs.push(`font-family: ${fontName}`);
+    stylePairs.push(`font-weight: normal`);
+    stylePairs.push(`font-style: normal`);
+    return stylePairs.join("; ");
+  };
   for (const el of textEls) {
     const inlineStyle = el.getAttribute("style") || "";
     const rawFf = resolveInheritedValue(el, "font-family");
@@ -11901,19 +11961,50 @@ function rewriteSvgFontsForJsPDF(svgStr) {
     if (!isFontAvailable(clean)) continue;
     const weightRaw = resolveInheritedValue(el, "font-weight") || "400";
     const styleRaw = resolveInheritedValue(el, "font-style") || "normal";
-    const parsedWeight = Number.parseInt(weightRaw, 10);
-    const weight = Number.isFinite(parsedWeight) ? parsedWeight : /bold/i.test(weightRaw) ? 700 : /medium/i.test(weightRaw) ? 500 : /semi/i.test(weightRaw) ? 600 : /light/i.test(weightRaw) ? 300 : 400;
+    const weight = resolveWeightNum(weightRaw);
     const resolved = resolveFontWeight(weight);
     const isItalic = /italic|oblique/i.test(styleRaw);
     const jsPdfName = getEmbeddedJsPDFFontName(clean, resolved, isItalic);
-    el.setAttribute("font-family", jsPdfName);
-    el.setAttribute("font-weight", "normal");
-    el.setAttribute("font-style", "normal");
-    const stylePairs = inlineStyle.split(";").map((part) => part.trim()).filter(Boolean).filter((part) => !/^font-family\s*:/i.test(part) && !/^font-weight\s*:/i.test(part) && !/^font-style\s*:/i.test(part));
-    stylePairs.push(`font-family: ${jsPdfName}`);
-    stylePairs.push(`font-weight: normal`);
-    stylePairs.push(`font-style: normal`);
-    el.setAttribute("style", stylePairs.join("; "));
+    const directText = Array.from(el.childNodes).filter((n) => n.nodeType === 3).map((n) => n.textContent || "").join("");
+    const hasDevanagari = containsDevanagari(directText);
+    if (hasDevanagari && directText.length > 0) {
+      const devanagariWeight = resolveFontWeight(weight);
+      const devanagariJsPdfName = getEmbeddedJsPDFFontName(FONT_FALLBACK_DEVANAGARI, devanagariWeight);
+      const symbolJsPdfName = isFontAvailable(FONT_FALLBACK_SYMBOLS) ? getEmbeddedJsPDFFontName(FONT_FALLBACK_SYMBOLS, 400) : jsPdfName;
+      const childNodes = Array.from(el.childNodes);
+      for (const node of childNodes) {
+        if (node.nodeType !== 3 || !node.textContent) continue;
+        const runs = splitIntoRuns(node.textContent);
+        if (runs.length <= 1 && ((_b = runs[0]) == null ? void 0 : _b.runType) !== "devanagari") continue;
+        const fragment = doc.createDocumentFragment();
+        for (const run of runs) {
+          const tspan = doc.createElementNS("http://www.w3.org/2000/svg", "tspan");
+          let runFont;
+          if (run.runType === "devanagari") {
+            runFont = devanagariJsPdfName;
+          } else if (run.runType === "symbol") {
+            runFont = symbolJsPdfName;
+          } else {
+            runFont = jsPdfName;
+          }
+          tspan.setAttribute("font-family", runFont);
+          tspan.setAttribute("font-weight", "normal");
+          tspan.setAttribute("font-style", "normal");
+          tspan.textContent = run.text;
+          fragment.appendChild(tspan);
+        }
+        el.replaceChild(fragment, node);
+      }
+      el.setAttribute("font-family", jsPdfName);
+      el.setAttribute("font-weight", "normal");
+      el.setAttribute("font-style", "normal");
+      el.setAttribute("style", buildStyleString(inlineStyle, jsPdfName));
+    } else {
+      el.setAttribute("font-family", jsPdfName);
+      el.setAttribute("font-weight", "normal");
+      el.setAttribute("font-style", "normal");
+      el.setAttribute("style", buildStyleString(inlineStyle, jsPdfName));
+    }
   }
   return new XMLSerializer().serializeToString(doc.documentElement);
 }