@pixldocs/canvas-renderer 0.5.58 → 0.5.60

package/dist/index.d.ts

@@ -254,7 +254,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.57";
+export declare const PACKAGE_VERSION = "0.5.59";
 
 export declare interface PageSettings {
     backgroundColor?: string;

package/dist/index.js

@@ -245,6 +245,56 @@ const WIDTH_BUCKET_PX = 8;
 function bucketWidth(w) {
   return Math.round(w / WIDTH_BUCKET_PX) * WIDTH_BUCKET_PX;
 }
+let measureCanvas = null;
+function getMeasureContext() {
+  if (typeof document === "undefined") return null;
+  measureCanvas ?? (measureCanvas = document.createElement("canvas"));
+  return measureCanvas.getContext("2d");
+}
+function lineToString(line) {
+  return Array.isArray(line) ? line.join("") : String(line ?? "");
+}
+function measureTextLineWithCanvas(textbox, lineText, lineIndex) {
+  var _a, _b, _c, _d, _e;
+  if (!lineText) return 0;
+  const ctx = getMeasureContext();
+  if (!ctx) return null;
+  const tb = textbox;
+  const fontSize = Number(((_a = tb.getValueOfPropertyAt) == null ? void 0 : _a.call(tb, lineIndex, 0, "fontSize")) ?? textbox.fontSize ?? 16);
+  const fontStyle = String(((_b = tb.getValueOfPropertyAt) == null ? void 0 : _b.call(tb, lineIndex, 0, "fontStyle")) ?? textbox.fontStyle ?? "normal");
+  const fontWeight = String(((_c = tb.getValueOfPropertyAt) == null ? void 0 : _c.call(tb, lineIndex, 0, "fontWeight")) ?? textbox.fontWeight ?? "400");
+  const fontFamily = String(((_d = tb.getValueOfPropertyAt) == null ? void 0 : _d.call(tb, lineIndex, 0, "fontFamily")) ?? textbox.fontFamily ?? "Open Sans");
+  const charSpacing = Number(((_e = tb.getValueOfPropertyAt) == null ? void 0 : _e.call(tb, lineIndex, 0, "charSpacing")) ?? textbox.charSpacing ?? 0);
+  ctx.save();
+  ctx.font = `${fontStyle} normal ${fontWeight} ${fontSize}px ${fontFamily}`;
+  const measured = ctx.measureText(lineText).width;
+  ctx.restore();
+  const graphemeCount = Array.from(lineText).length;
+  const spacingWidth = graphemeCount > 1 ? charSpacing / 1e3 * fontSize * (graphemeCount - 1) : 0;
+  return Math.max(0, measured + spacingWidth);
+}
+function getCanvasMeasuredTextboxLineWidths(textbox) {
+  const rawLines = textbox._textLines ?? textbox.textLines ?? [];
+  const fallback = textbox.__lineWidths ?? [];
+  if (!rawLines.length) return fallback;
+  const measured = rawLines.map((line, index) => measureTextLineWithCanvas(textbox, lineToString(line), index));
+  if (measured.some((w) => w == null || Number.isNaN(w))) return fallback;
+  return measured;
+}
+function getTextboxWidthFitMetrics(textbox, targetWidth) {
+  const actualTextboxWidth = Number(textbox.width ?? targetWidth);
+  const dynamicMinWidth = Number(textbox.dynamicMinWidth ?? 0);
+  const lineWidths = getCanvasMeasuredTextboxLineWidths(textbox);
+  const maxLineWidth = lineWidths.length > 0 ? Math.max(...lineWidths) : 0;
+  const widthDidGrow = actualTextboxWidth > targetWidth + 0.5;
+  return {
+    actualTextboxWidth,
+    dynamicMinWidth,
+    maxLineWidth,
+    widthDidGrow,
+    fitsWidth: maxLineWidth <= targetWidth + 1
+  };
+}
 function getCacheKey(element) {
   const widthPx = typeof element.width === "number" ? element.width : 200;
   return JSON.stringify({
@@ -301,11 +351,7 @@ function measureTextHeight(element) {
         const renderedLineCount = ((_a = testTb.textLines) == null ? void 0 : _a.length) || 1;
         const hasNoImplicitWrap = renderedLineCount <= explicitLineCount;
         const fitsHeight = !baseHeight || textHeight <= baseHeight;
-        const actualTextboxWidth = testTb.width ?? measureWidth;
-        const widthDidGrow = actualTextboxWidth > measureWidth + 0.5;
-        const lineWidths = testTb.__lineWidths;
-        const maxLineWidth = lineWidths && lineWidths.length > 0 ? Math.max(...lineWidths) : 0;
-        const fitsWidth = !widthDidGrow && maxLineWidth <= measureWidth + 1;
+        const { fitsWidth } = getTextboxWidthFitMetrics(testTb, measureWidth);
         if (hasNoImplicitWrap && fitsHeight && fitsWidth) break;
         fontSize--;
       }
@@ -5290,20 +5336,16 @@ function createText(element) {
       const renderedLineCount = ((_a = testTextbox.textLines) == null ? void 0 : _a.length) || 1;
       const hasNoImplicitWrap = renderedLineCount <= explicitLineCount;
       const fitsHeight = !baseHeight || textHeight <= baseHeight;
-      const actualTextboxWidth = testTextbox.width ?? fixedWidth;
-      const widthDidGrow = actualTextboxWidth > fixedWidth + 0.5;
-      const lineWidths = testTextbox.__lineWidths;
-      const maxLineWidth = lineWidths && lineWidths.length > 0 ? Math.max(...lineWidths) : 0;
-      const fitsWidth = !widthDidGrow && maxLineWidth <= fixedWidth + 1;
+      const widthMetrics = getTextboxWidthFitMetrics(testTextbox, fixedWidth);
+      const { fitsWidth } = widthMetrics;
       if (debugAutoShrink) {
         lastIter = {
           fontSize,
           renderedLineCount,
           explicitLineCount,
           textHeight,
-          maxLineWidth,
+          ...widthMetrics,
           fixedWidth,
-          widthDidGrow,
           hasNoImplicitWrap,
           fitsHeight,
           fitsWidth
@@ -8854,11 +8896,7 @@ const PageCanvas = forwardRef(
             const renderedLineCount = ((_b = testTextbox.textLines) == null ? void 0 : _b.length) || 1;
             const hasNoImplicitWrap = renderedLineCount <= explicitLineCount;
             const fitsHeight = rH <= 0 || textHeight <= rH;
-            const actualTextboxWidth = testTextbox.width ?? fixedWidth;
-            const widthDidGrow = actualTextboxWidth > fixedWidth + 0.5;
-            const lineWidths = testTextbox.__lineWidths;
-            const maxLineWidth = lineWidths && lineWidths.length > 0 ? Math.max(...lineWidths) : 0;
-            const fitsWidth = !widthDidGrow && maxLineWidth <= fixedWidth + 1;
+            const { fitsWidth } = getTextboxWidthFitMetrics(testTextbox, fixedWidth);
             if (hasNoImplicitWrap && fitsHeight && fitsWidth) {
               break;
             }
@@ -12504,7 +12542,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.57";
+const PACKAGE_VERSION = "0.5.59";
 let __underlineFixInstalled = false;
 function installUnderlineFix(fab) {
   var _a;
@@ -15183,8 +15221,8 @@ async function convertTextDecorationsToLines(svg) {
   let ctx = null;
   try {
     const realDoc = typeof document !== "undefined" ? document : doc;
-    const measureCanvas = realDoc.createElement("canvas");
-    ctx = measureCanvas.getContext("2d");
+    const measureCanvas2 = realDoc.createElement("canvas");
+    ctx = measureCanvas2.getContext("2d");
   } catch {
   }
   const textEls = Array.from(svg.querySelectorAll("text"));