@diagrammo/dgmo 0.95.0 → 0.96.0

package/dist/{chunk-YQMIKX54.js → chunk-RIK6WUMO.js}

@@ -3,7 +3,7 @@ import {
   getSimpleChartLegendGroups,
   parseChart,
   parseExtendedChart
-} from "./chunk-H6BT45SN.js";
+} from "./chunk-P2GNNEMN.js";
 import {
   computeQuadrantPointLabels,
   rectCircleOverlap,
@@ -28,7 +28,7 @@ import {
 } from "./chunk-2CW5ZTNH.js";
 import {
   layoutInlineHeader
-} from "./chunk-UIEKW4SG.js";
+} from "./chunk-R5L5E3TC.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -43,7 +43,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   tagAttrKey
-} from "./chunk-4SACN2C5.js";
+} from "./chunk-LGUFJ7Y2.js";
 import {
   LEGEND_DOT_R,
   LEGEND_ENTRY_FONT_SIZE,
@@ -376,6 +376,8 @@ var LABEL_ROTATE_DEG = 40;
 var NEVER_THIN_MAX = 12;
 var LABEL_GAP = 8;
 var LABEL_LINE_HEIGHT = 1.25;
+var ROTATED_LABEL_PAD = 12;
+var MIN_CAPPED_LABEL_W = 40;
 function spreadIndices(total, count) {
   if (total <= 0) return /* @__PURE__ */ new Set();
   if (total === 1 || count <= 1) return /* @__PURE__ */ new Set([0]);
@@ -416,7 +418,7 @@ function planCategoryLabels(labels, slot, font = TICK_FONT) {
   return {
     rotate: true,
     stride,
-    height: Math.round(widest * Math.sin(rad)) + 12,
+    height: Math.round(widest * Math.sin(rad)) + ROTATED_LABEL_PAD,
     keep: all(stride)
   };
 }
@@ -425,29 +427,41 @@ function rotatedLeftReach(first, plan, font) {
   const rad = LABEL_ROTATE_DEG * Math.PI / 180;
   return measureText(first, font) * Math.cos(rad) + font * 0.8 * Math.sin(rad);
 }
-function planLabelsFitLeft(labels, mLeft0, plotWFor, slotFor, firstOffset, font = TICK_FONT) {
+function planLabelsFitLeft(labels, mLeft0, plotWFor, slotFor, firstOffset, font = TICK_FONT, maxHeight = Infinity) {
   const EDGE = 4;
-  let mLeft = mLeft0;
-  let plotW = plotWFor(mLeft);
-  let plan = planCategoryLabels(labels, slotFor(plotW), font);
-  for (let i = 0; i < 6; i++) {
-    const reach = rotatedLeftReach(labels[0], plan, font);
-    const need = Math.ceil(reach + EDGE - firstOffset(plotW));
-    const next = Math.max(mLeft0, need);
-    if (next === mLeft) break;
-    mLeft = next;
-    plotW = plotWFor(mLeft);
-    plan = planCategoryLabels(labels, slotFor(plotW), font);
-  }
-  return { mLeft, plotW, plan };
+  const settle = (shown) => {
+    let mLeft = mLeft0;
+    let plotW = plotWFor(mLeft);
+    let plan = planCategoryLabels(shown, slotFor(plotW), font);
+    for (let i = 0; i < 6; i++) {
+      const reach = rotatedLeftReach(shown[0], plan, font);
+      const need = Math.ceil(reach + EDGE - firstOffset(plotW));
+      const next = Math.max(mLeft0, need);
+      if (next === mLeft) break;
+      mLeft = next;
+      plotW = plotWFor(mLeft);
+      plan = planCategoryLabels(shown, slotFor(plotW), font);
+    }
+    return { mLeft, plotW, plan, shown };
+  };
+  const fit = settle(labels);
+  if (!fit.plan.rotate || fit.plan.height <= maxHeight) return fit;
+  const rad = LABEL_ROTATE_DEG * Math.PI / 180;
+  const maxW = Math.max(
+    MIN_CAPPED_LABEL_W,
+    Math.floor((maxHeight - ROTATED_LABEL_PAD) / Math.sin(rad))
+  );
+  return settle(labels.map((t) => truncateText(t, font, maxW)));
 }
 function labelSurvives(plan, i) {
   return plan.keep.has(i);
 }
-function drawCategoryLabels(svg, labels, plan, xFor, baseline, textColor, font = TICK_FONT) {
+function drawCategoryLabels(svg, labels, plan, xFor, baseline, textColor, font = TICK_FONT, full = labels) {
   labels.forEach((label, i) => {
     if (!labelSurvives(plan, i)) return;
     const t = svg.append("text").attr("class", "dgmo-tick").attr("fill", textColor).attr("font-size", font).attr("font-family", FONT_FAMILY).text(label);
+    const whole = full[i];
+    if (whole !== void 0 && whole !== label) t.append("title").text(whole);
     if (plan.rotate) {
       t.attr(
         "transform",
@@ -462,6 +476,8 @@ function drawCategoryLabels(svg, labels, plan, xFor, baseline, textColor, font =
 // src/charts-d3/bar.ts
 import { scaleBand, scaleLinear } from "d3-scale";
 import { max as d3max, min as d3min } from "d3-array";
+var LABEL_REGION_SHARE = 0.35;
+var PLOT_MIN_SHARE = 0.6;
 function seriesValues(pt, seriesCount) {
   const out = [pt.value];
   for (let s = 1; s < seriesCount; s++) out.push(pt.extraValues?.[s - 1] ?? 0);
@@ -507,24 +523,38 @@ function renderBar(svg, chart, width, height, colors, palette, isDark, textColor
   const hiVal = Math.max(0, maxVal);
   const loVal = Math.min(0, minVal);
   const niceMax = hiVal === 0 && loVal === 0 ? 1 : hiVal;
-  const leftLabels = horizontal ? data.map((d) => d.label) : [fmtNum(niceMax), fmtNum(niceMax / 2), fmtNum(loVal), fmtNum(loVal / 2)];
-  const mLeft0 = computeLeftMargin(chart.ylabel, leftLabels);
   const catLabels = data.map((d) => d.label);
+  const sideShown = horizontal ? catLabels.map(
+    (t) => truncateText(t, TICK_FONT, width * LABEL_REGION_SHARE)
+  ) : catLabels;
+  const leftLabels = horizontal ? sideShown : [fmtNum(niceMax), fmtNum(niceMax / 2), fmtNum(loVal), fmtNum(loVal / 2)];
+  const mLeft0 = computeLeftMargin(chart.ylabel, leftLabels);
+  const mTop = top + 8;
+  const xTitleBand = chart.xlabel ? 40 : 18;
+  const labelCap = Math.floor(
+    Math.min(
+      height * LABEL_REGION_SHARE,
+      height * (1 - PLOT_MIN_SHARE) - mTop - xTitleBand
+    )
+  );
   const fit = horizontal ? null : planLabelsFitLeft(
     catLabels,
     mLeft0,
     (ml) => width - ml - 32,
     (pw) => data.length === 0 ? Infinity : pw / data.length,
     // scaleBand padding 0.3: first centre sits 0.65 steps in
-    (pw) => pw / (data.length + 0.3) * 0.65
+    (pw) => pw / (data.length + 0.3) * 0.65,
+    TICK_FONT,
+    labelCap
   );
   const mLeft = fit ? fit.mLeft : mLeft0;
   const plotW = fit ? fit.plotW : width - mLeft - 32;
   const labelPlan = fit?.plan ?? planCategoryLabels(catLabels, Infinity);
+  const shown = fit?.shown ?? sideShown;
   const m = {
-    top: top + 8,
+    top: mTop,
     right: 32,
-    bottom: horizontal ? 64 : Math.max(64, labelPlan.height + (chart.xlabel ? 40 : 18)),
+    bottom: horizontal ? 64 : Math.max(64, labelPlan.height + xTitleBand),
     left: mLeft
   };
   const plotH = height - m.top - m.bottom;
@@ -545,18 +575,21 @@ function renderBar(svg, chart, width, height, colors, palette, isDark, textColor
     }
   }
   if (horiz) {
-    for (const d of data) {
+    data.forEach((d, i) => {
       const c = (cat(d.label) ?? 0) + cat.bandwidth() / 2;
-      svg.append("text").attr("x", m.left - 10).attr("y", c + 4).attr("text-anchor", "end").attr("fill", textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(d.label);
-    }
+      const t = svg.append("text").attr("x", m.left - 10).attr("y", c + 4).attr("text-anchor", "end").attr("fill", textColor).attr("font-size", TICK_FONT).attr("font-family", FONT_FAMILY).text(shown[i]);
+      if (shown[i] !== d.label) t.append("title").text(d.label);
+    });
   } else {
     drawCategoryLabels(
       svg,
-      data.map((d) => d.label),
+      shown,
       labelPlan,
       (i) => (cat(data[i].label) ?? 0) + cat.bandwidth() / 2,
       m.top + plotH,
-      textColor
+      textColor,
+      TICK_FONT,
+      catLabels
     );
   }
   const zero = val(0);

package/dist/{chunk-BH2SF4TT.js → chunk-RTRORHSP.js}

@@ -17,7 +17,7 @@ import {
 } from "./chunk-ICLB27PZ.js";
 import {
   fillModeFromOptions
-} from "./chunk-TIIZIAGS.js";
+} from "./chunk-FUYEXLAN.js";
 import {
   CHAR_WIDTH_RATIO,
   measureText