@opendata-ai/openchart-engine 6.1.1 → 6.1.2

package/dist/index.js

@@ -7226,6 +7226,23 @@ function computeDimensions(spec, options, legendLayout, theme, strategy) {
       }
     }
   }
+  if (spec.annotations.length > 0 && encoding.x) {
+    const xField = encoding.x.field;
+    let maxX;
+    for (const row of spec.data) {
+      const v = row[xField];
+      if (v != null && (maxX == null || String(v) >= String(maxX))) maxX = v;
+    }
+    if (maxX != null) {
+      const maxXStr = String(maxX);
+      for (const ann of spec.annotations) {
+        if (ann.type === "text" && String(ann.x) === maxXStr) {
+          const textWidth = estimateTextWidth8(ann.text, ann.fontSize ?? 11, ann.fontWeight ?? 600);
+          margins.right = Math.max(margins.right, padding + textWidth + 12);
+        }
+      }
+    }
+  }
   if (encoding.y && !isRadial) {
     if (spec.markType === "bar" || spec.markType === "circle" || encoding.y.type === "nominal" || encoding.y.type === "ordinal") {
       const yField = encoding.y.field;
@@ -7240,18 +7257,28 @@ function computeDimensions(spec, options, legendLayout, theme, strategy) {
       }
     } else if (encoding.y.type === "quantitative" || encoding.y.type === "temporal") {
       const yField = encoding.y.field;
+      const yAxisFormat = encoding.y.axis?.format;
       let maxAbsVal = 0;
       for (const row of spec.data) {
         const v = Number(row[yField]);
         if (Number.isFinite(v) && Math.abs(v) > maxAbsVal) maxAbsVal = Math.abs(v);
       }
       let sampleLabel;
-      if (maxAbsVal >= 1e9) sampleLabel = "1.5B";
-      else if (maxAbsVal >= 1e6) sampleLabel = "1.5M";
-      else if (maxAbsVal >= 1e3) sampleLabel = "1.5K";
-      else if (maxAbsVal >= 100) sampleLabel = "100";
-      else if (maxAbsVal >= 10) sampleLabel = "10";
-      else sampleLabel = "0.0";
+      if (yAxisFormat) {
+        try {
+          const fmt = format(yAxisFormat);
+          sampleLabel = fmt(maxAbsVal);
+        } catch {
+          sampleLabel = String(maxAbsVal);
+        }
+      } else {
+        if (maxAbsVal >= 1e9) sampleLabel = "1.5B";
+        else if (maxAbsVal >= 1e6) sampleLabel = "1.5M";
+        else if (maxAbsVal >= 1e3) sampleLabel = "1.5K";
+        else if (maxAbsVal >= 100) sampleLabel = "100";
+        else if (maxAbsVal >= 10) sampleLabel = "10";
+        else sampleLabel = "0.0";
+      }
       const negPrefix = spec.data.some((r) => Number(r[yField]) < 0) ? "-" : "";
       const labelEst = negPrefix + sampleLabel;
       const labelWidth = estimateTextWidth8(
@@ -7262,7 +7289,8 @@ function computeDimensions(spec, options, legendLayout, theme, strategy) {
       margins.left = Math.max(margins.left, padding + labelWidth + 10);
     }
   }
-  if (encoding.y?.axis && encoding.y.axis.label && !isRadial) {
+  const yAxis = encoding.y?.axis;
+  if (yAxis && (yAxis.title || yAxis.label) && !isRadial) {
     const rotatedLabelMargin = 45 + Math.ceil(theme.fonts.sizes.body / 2) + 4;
     margins.left = Math.max(margins.left, padding + rotatedLabelMargin);
   }