@diagrammo/dgmo 0.93.0 → 0.95.0

package/dist/{chunk-ZTLMEBAC.js → chunk-E7F76M3U.js}

@@ -1,7 +1,7 @@
 import {
   drawCylinderCard,
   drawQueueCard
-} from "./chunk-KRU2LCIP.js";
+} from "./chunk-IHN6WDEY.js";
 import {
   CYLINDER_RY,
   QUEUE_CAP
@@ -9,7 +9,7 @@ import {
 import {
   WHITEBOARD_COLORS,
   WHITEBOARD_NOTE_COLOR
-} from "./chunk-P7TRFL4P.js";
+} from "./chunk-R46N5KR4.js";
 import {
   renderChartTitle
 } from "./chunk-6XLMTAEX.js";
@@ -132,6 +132,17 @@ function pieceContains(p, px, py) {
 function whiteboardShapeContains(shape, point) {
   return piecesOf(shape).some((p) => pieceContains(p, point.x, point.y));
 }
+function whiteboardLabelPosition(shape, elements) {
+  if (shape.labelPosition) return shape.labelPosition;
+  return shape.shape === "rectangle" && whiteboardEnclosesAny(shape, elements) ? "top" : "middle";
+}
+function whiteboardEnclosesAny(outer, elements) {
+  const x1 = outer.x + outer.width;
+  const y1 = outer.y + outer.height;
+  return elements.some(
+    (el) => el !== outer && (el.kind === "shape" || el.kind === "note" || el.kind === "image") && el.x >= outer.x && el.y >= outer.y && el.x + el.width <= x1 && el.y + el.height <= y1 && !(el.x === outer.x && el.y === outer.y && el.width === outer.width && el.height === outer.height)
+  );
+}
 function whiteboardShapeAt(point, elements) {
   for (let i = elements.length - 1; i >= 0; i--) {
     const el = elements[i];
@@ -331,9 +342,35 @@ function whiteboardSegmentMidpoint(s) {
     y: (s.y1 + 2 * s.cy + s.y2) / 4
   };
 }
+var DRAW_BAND = {
+  image: 0,
+  shape: 1,
+  note: 1,
+  arrow: 1,
+  line: 1,
+  text: 2,
+  ink: 3
+};
+function whiteboardDrawBand(el) {
+  return DRAW_BAND[el.kind];
+}
+function whiteboardDrawOrder(elements) {
+  const key = elements.map((el, i) => {
+    if (el.kind !== "arrow" && el.kind !== "line") return i;
+    const { from, to } = whiteboardConnectorAttachments(el, elements);
+    const last = Math.max(from, to);
+    return last > i ? last + 0.5 : i;
+  });
+  return elements.map((_, i) => i).sort(
+    (a, b) => DRAW_BAND[elements[a].kind] - DRAW_BAND[elements[b].kind] || key[a] - key[b] || a - b
+  );
+}
 
 // src/whiteboard/label.ts
 var WHITEBOARD_LABEL_FONT = 14;
+var WHITEBOARD_CONTAINER_FONT = 16;
+var WHITEBOARD_CONTAINER_WEIGHT = 600;
+var CONTAINER_GAP = 4;
 var WHITEBOARD_NOTE_FONT = 12;
 var WHITEBOARD_LABEL_LINE = 1.25;
 var LABEL_PAD = 8;
@@ -370,20 +407,22 @@ function wrapWhiteboardLabel(label, box) {
   const font = "kind" in box && box.kind === "note" ? WHITEBOARD_NOTE_FONT : WHITEBOARD_LABEL_FONT;
   return label.split("\n").flatMap((line) => line ? wrapTextToWidth(line, font, width) : [""]);
 }
-function fitWhiteboardLabel(label, box) {
+function fitWhiteboardLabel(label, box, opts = {}) {
   const isNote = "kind" in box && box.kind === "note";
-  const full = isNote ? WHITEBOARD_NOTE_FONT : WHITEBOARD_LABEL_FONT;
+  const full = opts.font ?? (isNote ? WHITEBOARD_NOTE_FONT : WHITEBOARD_LABEL_FONT);
   const pad = isNote ? WHITEBOARD_NOTE_PAD : LABEL_PAD;
   if (!label) return { lines: [], font: full, top: pad };
+  const bold = opts.bold ?? false;
   const width = whiteboardLabelWidth(box);
-  const height = whiteboardLabelHeight(box);
+  const height = opts.height ?? whiteboardLabelHeight(box);
+  const measure = (l, font2) => measureText(l, font2, { bold });
   const wrap = (font2, hardBreak) => label.split("\n").flatMap(
-    (line) => line ? wrapTextToWidth(line, font2, width, { hardBreak }) : [""]
+    (line) => line ? wrapTextToWidth(line, font2, width, { hardBreak, bold }) : [""]
   );
   const tall = (n, font2) => n * font2 * WHITEBOARD_LABEL_LINE > height;
   for (let font2 = full; font2 >= WHITEBOARD_LABEL_MIN_FONT; font2--) {
     const lines2 = wrap(font2, false);
-    if (!tall(lines2.length, font2) && lines2.every((l) => measureText(l, font2) <= width))
+    if (!tall(lines2.length, font2) && lines2.every((l) => measure(l, font2) <= width))
       return { lines: lines2, font: font2, top: pad };
   }
   const font = WHITEBOARD_LABEL_MIN_FONT;
@@ -399,11 +438,76 @@ function fitWhiteboardLabel(label, box) {
   if (lines.length <= room) return { lines, font, top };
   const kept = lines.slice(0, room);
   let last = kept[room - 1];
-  while (last && measureText(`${last}\u2026`, font) > width)
+  while (last && measure(`${last}\u2026`, font) > width)
     last = [...last].slice(0, -1).join("");
   kept[room - 1] = `${last.trimEnd()}\u2026`;
   return { lines: kept, font, top };
 }
+function whiteboardLabelCentreY(box, position, blockHeight) {
+  if (position === "middle") return box.y + box.height / 2;
+  const innerTop = box.y + (box.height - whiteboardLabelHeight(box)) / 2;
+  return innerTop + blockHeight / 2;
+}
+function whiteboardShapeLabel(el, elements, text = el.label) {
+  const block = (n, font2) => n * font2 * WHITEBOARD_LABEL_LINE;
+  const top = whiteboardLabelPosition(el, elements) === "top";
+  const inset = (el.height - whiteboardLabelHeight(el)) / 2;
+  const innerTop = el.y + inset;
+  const innerBottom = el.y + el.height - inset;
+  const spans = [];
+  for (const o of elements) {
+    if (o === el) continue;
+    if (o.kind !== "shape" && o.kind !== "note" && o.kind !== "image") continue;
+    const ox1 = o.x + o.width;
+    const oy1 = o.y + o.height;
+    const overlaps = o.x < el.x + el.width && ox1 > el.x && o.y < el.y + el.height && oy1 > el.y;
+    const encloses = o.x <= el.x && o.y <= el.y && ox1 >= el.x + el.width && oy1 >= el.y + el.height;
+    if (overlaps && !encloses)
+      spans.push([o.y - CONTAINER_GAP, oy1 + CONTAINER_GAP]);
+  }
+  spans.sort((a, b) => a[0] - b[0]);
+  const strips = [];
+  let from = innerTop;
+  for (const [y0, y1] of spans) {
+    if (y0 > from) strips.push([from, Math.min(y0, innerBottom)]);
+    from = Math.max(from, y1);
+  }
+  if (from < innerBottom) strips.push([from, innerBottom]);
+  const floorLine = block(1, WHITEBOARD_LABEL_MIN_FONT);
+  const roomy = strips.filter(([a, b]) => b - a >= floorLine);
+  const font = top ? WHITEBOARD_CONTAINER_FONT : WHITEBOARD_LABEL_FONT;
+  const opts = top ? { font, bold: true } : {};
+  const into = ([a, b], centre) => {
+    const fit2 = fitWhiteboardLabel(text, el, { ...opts, height: b - a });
+    const h = block(fit2.lines.length, fit2.font);
+    const cy = Math.min(Math.max(centre, a + h / 2), b - h / 2);
+    return { lines: fit2.lines, font: fit2.font, bold: top, cy, onEdge: false };
+  };
+  if (top) {
+    const first = roomy[0];
+    if (first?.[0] === innerTop) return into(first, -Infinity);
+    const last = roomy.at(-1);
+    if (last?.[1] === innerBottom) return into(last, Infinity);
+  } else {
+    const mid = el.y + el.height / 2;
+    const strip = roomy.find(([a, b]) => a <= mid && mid <= b) ?? roomy.reduce(
+      (best, s) => !best || s[1] - s[0] > best[1] - best[0] ? s : best,
+      void 0
+    );
+    if (strip) return into(strip, mid);
+  }
+  const fit = fitWhiteboardLabel(text.replace(/\n/g, " "), el, {
+    ...opts,
+    height: block(1, font)
+  });
+  return {
+    lines: fit.lines.slice(0, 1),
+    font: fit.font,
+    bold: top,
+    cy: el.y,
+    onEdge: true
+  };
+}
 
 // src/whiteboard/renderer.ts
 function visibleWhiteboardIndices(parsed, options = {}) {
@@ -477,8 +581,8 @@ var SAFE_IMAGE_HREF_RE = /^(https?:|blob:|data:image\/)/i;
 function labelLines(label) {
   return label.split("\n");
 }
-function widest(lines, font) {
-  return Math.max(0, ...lines.map((l) => measureText(l, font)));
+function widest(lines, font, bold = false) {
+  return Math.max(0, ...lines.map((l) => measureText(l, font, { bold })));
 }
 function grow(b, x0, y0, x1, y1) {
   b.minX = Math.min(b.minX, x0, x1);
@@ -498,6 +602,7 @@ function whiteboardBounds(parsed, options = {}) {
     maxY: -Infinity
   };
   const elements = visibleWhiteboardElements(parsed, options);
+  const labelAt = placeConnectorLabels(elements, parsed.elements);
   for (const el of elements) {
     switch (el.kind) {
       case "shape":
@@ -527,7 +632,7 @@ function whiteboardBounds(parsed, options = {}) {
         }
         if (el.label) {
           const lines = labelLines(el.label);
-          const { x: mx, y: my } = whiteboardSegmentMidpoint(s);
+          const { x: mx, y: my } = labelAt.get(el);
           const hw = widest(lines, WHITEBOARD_LABEL_FONT) / 2 + 4;
           const hh = WHITEBOARD_LABEL_FONT + (lines.length - 1) * WHITEBOARD_LABEL_FONT * WHITEBOARD_LABEL_LINE / 2;
           grow(b, mx - hw, my - hh, mx + hw, my + hh);
@@ -578,6 +683,78 @@ function curveTrim(s, end, len) {
   }
   return (near + far) / 2;
 }
+var LABEL_SLIDE_STEP = 0.05;
+var LABEL_SLIDE_TRIES = 8;
+var LABEL_CLEAR = 5;
+function boxesOverlap(a, b) {
+  return a.x0 < b.x1 && b.x0 < a.x1 && a.y0 < b.y1 && b.y0 < a.y1;
+}
+function connectorLabelBox(lines, x, y) {
+  const hw = widest(lines, WHITEBOARD_LABEL_FONT) / 2 + LABEL_CLEAR;
+  const hh = lines.length * WHITEBOARD_LABEL_FONT * WHITEBOARD_LABEL_LINE / 2 + LABEL_CLEAR;
+  return { x0: x - hw, y0: y - hh, x1: x + hw, y1: y + hh };
+}
+function authoredTextBoxes(elements, all) {
+  const boxes = [];
+  for (const el of elements) {
+    if (el.kind === "text") {
+      const lines = labelLines(el.text);
+      boxes.push({
+        x0: el.x,
+        y0: el.y,
+        x1: el.x + widest(lines, WHITEBOARD_TEXT_FONT),
+        y1: el.y + lines.length * WHITEBOARD_TEXT_FONT * WHITEBOARD_LABEL_LINE
+      });
+    } else if (el.kind === "note") {
+      boxes.push({
+        x0: el.x,
+        y0: el.y,
+        x1: el.x + el.width,
+        y1: el.y + Math.max(el.height, noteTextHeight(el))
+      });
+    } else if (el.kind === "shape" && el.label) {
+      const { lines, font, bold, cy } = whiteboardShapeLabel(el, all);
+      if (lines.length === 0) continue;
+      const cx = el.x + el.width / 2 + whiteboardLabelShift(el);
+      const hh = lines.length * font * WHITEBOARD_LABEL_LINE / 2;
+      const hw = widest(lines, font, bold) / 2;
+      boxes.push({ x0: cx - hw, y0: cy - hh, x1: cx + hw, y1: cy + hh });
+    }
+  }
+  return boxes;
+}
+function placeConnectorLabels(elements, all) {
+  const placed = /* @__PURE__ */ new Map();
+  const taken = authoredTextBoxes(elements, all);
+  for (const el of elements) {
+    if (el.kind !== "arrow" && el.kind !== "line" || !el.label) continue;
+    const lines = labelLines(el.label);
+    const s = clipWhiteboardConnector(el, elements);
+    const mid = whiteboardSegmentMidpoint(s);
+    let at = mid;
+    const clears = (p) => {
+      const box = connectorLabelBox(lines, p.x, p.y);
+      return !taken.some((t) => boxesOverlap(box, t));
+    };
+    if (!clears(mid)) {
+      search: for (let k = 1; k <= LABEL_SLIDE_TRIES; k++) {
+        for (const t of [
+          0.5 - k * LABEL_SLIDE_STEP,
+          0.5 + k * LABEL_SLIDE_STEP
+        ]) {
+          const p = segmentPoint(s, t);
+          if (clears(p)) {
+            at = p;
+            break search;
+          }
+        }
+      }
+    }
+    placed.set(el, at);
+    taken.push(connectorLabelBox(lines, at.x, at.y));
+  }
+  return placed;
+}
 function whiteboardConnectorPaint(s, heads) {
   const polygon = (tip, ux, uy, head) => {
     const bx = tip.x - ux * head;
@@ -665,6 +842,7 @@ function renderWhiteboard(container, parsed, palette, isDark, options = {}) {
   const titleOffset = showTitle ? TITLE_BAND : 0;
   const elements = visibleWhiteboardElements(parsed, options);
   const b = whiteboardBounds(parsed, options);
+  const labelAt = placeConnectorLabels(elements, parsed.elements);
   const contentW = b.maxX - b.minX;
   const contentH = b.maxY - b.minY;
   const titleW = showTitle ? measureText(parsed.title, TITLE_FONT_SIZE, { bold: true }) : 0;
@@ -708,11 +886,16 @@ function renderWhiteboard(container, parsed, palette, isDark, options = {}) {
   }
   const canvas = svg.append("g").attr("class", "whiteboard-canvas").attr("transform", `translate(${round2(tx)},${round2(ty)})`);
   const halo = palette.bg;
-  const centredLabel = (g, { lines, font }, cx, cy, color, ground) => {
+  const centredLabel = (g, {
+    lines,
+    font,
+    bold
+  }, cx, cy, color, ground) => {
     if (lines.length === 0) return;
     const lh = font * WHITEBOARD_LABEL_LINE;
     const top = cy - lines.length * lh / 2 + lh * BASELINE;
     const t = g.append("text").attr("class", "whiteboard-label").attr("text-anchor", "middle").attr("font-size", font).attr("fill", color).attr("stroke", ground).attr("stroke-width", LABEL_HALO).attr("stroke-linejoin", "round").attr("paint-order", "stroke");
+    if (bold) t.attr("font-weight", WHITEBOARD_CONTAINER_WEIGHT);
     appendLines(t, lines, cx, top, lh);
   };
   const drawImage = (g, el) => {
@@ -753,13 +936,14 @@ function renderWhiteboard(container, parsed, palette, isDark, options = {}) {
             drawQueueCard(inner, el.width, el.height, fill, stroke);
           }
         }
+        const label = whiteboardShapeLabel(el, parsed.elements);
         centredLabel(
           g,
-          fitWhiteboardLabel(el.label, el),
+          label,
           cx + whiteboardLabelShift(el),
-          cy,
+          label.cy,
           labelColor,
-          fill === "none" ? halo : fill
+          label.onEdge || fill === "none" ? halo : fill
         );
         break;
       }
@@ -814,7 +998,7 @@ function renderWhiteboard(container, parsed, palette, isDark, options = {}) {
         }
         if (el.label) {
           const lines = labelLines(el.label);
-          const mid = whiteboardSegmentMidpoint(s);
+          const mid = labelAt.get(el);
           const mx = round2(mid.x);
           const lh = WHITEBOARD_LABEL_FONT * WHITEBOARD_LABEL_LINE;
           const firstY = mid.y + WHITEBOARD_LABEL_FONT * 0.35 - (lines.length - 1) * lh / 2;
@@ -851,17 +1035,8 @@ function renderWhiteboard(container, parsed, palette, isDark, options = {}) {
   };
   for (const el of inDrawOrder(elements)) drawElement(el);
 }
-var DRAW_BAND = {
-  image: 0,
-  shape: 1,
-  note: 2,
-  arrow: 3,
-  line: 3,
-  text: 4,
-  ink: 5
-};
 function inDrawOrder(elements) {
-  return elements.map((el, i) => ({ el, i })).sort((a, b) => DRAW_BAND[a.el.kind] - DRAW_BAND[b.el.kind] || a.i - b.i).map(({ el }) => el);
+  return whiteboardDrawOrder(elements).map((i) => elements[i]);
 }
 function appendLines(t, lines, x, firstY, lh) {
   lines.forEach((ln, i) => {
@@ -876,12 +1051,17 @@ function round2(n) {
 export {
   whiteboardNoteFold,
   whiteboardShapeContains,
+  whiteboardLabelPosition,
   whiteboardShapeAt,
   whiteboardConnectorAttachments,
   clipWhiteboardConnector,
   whiteboardBendHandle,
   whiteboardBendFor,
   whiteboardSegmentMidpoint,
+  whiteboardDrawBand,
+  whiteboardDrawOrder,
+  WHITEBOARD_CONTAINER_FONT,
+  WHITEBOARD_CONTAINER_WEIGHT,
   WHITEBOARD_NOTE_FONT,
   WHITEBOARD_LABEL_MIN_FONT,
   whiteboardLabelWidth,
@@ -889,6 +1069,8 @@ export {
   whiteboardLabelHeight,
   wrapWhiteboardLabel,
   fitWhiteboardLabel,
+  whiteboardLabelCentreY,
+  whiteboardShapeLabel,
   visibleWhiteboardIndices,
   visibleWhiteboardElements,
   IMAGE_NOT_UPLOADED,

package/dist/{chunk-AUS7V54P.js → chunk-ERT7XDQW.js}

@@ -1,6 +1,6 @@
 import {
   acyclicOrient
-} from "./chunk-EJS3K44P.js";
+} from "./chunk-VGAMBOOC.js";
 
 // src/swimlane/layout.ts
 var MARGIN = 30;

package/dist/{chunk-WK5QEYFA.js → chunk-EXHXTMVR.js}

@@ -1,14 +1,14 @@
 import {
   searchPlacement
-} from "./chunk-LDDDKWL6.js";
+} from "./chunk-2J2CWWWK.js";
 import {
   noteCanvasShift,
   placeNotes,
   resolveNotes
-} from "./chunk-NJJCTEBM.js";
+} from "./chunk-KLBTJEIK.js";
 import {
   noteBoxSize
-} from "./chunk-D6PVMUCX.js";
+} from "./chunk-67N26CER.js";
 
 // src/graph/layout.ts
 import dagre from "@dagrejs/dagre";

package/dist/{chunk-YXXIRM4C.js → chunk-FWVE373X.js}

@@ -6,7 +6,7 @@ import {
 } from "./chunk-VLC6WNRD.js";
 import {
   parseInlineMarkdown
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";
@@ -82,7 +82,7 @@ function renderGoalForExport(container, parsed, palette, isDark, exportDims) {
   renderGoal(container, parsed, palette, isDark, exportDims);
 }
 function displayLen(token) {
-  return token.replace(/\[(.+?)\]\((.+?)\)/g, "$1").replace(/\*\*|__|\*|_|`/g, "").length;
+  return token.replace(/\[([^[\]\n\r]+)\]\((?:[^()\n\r]|\([^()\n\r]*\))+\)/g, "$1").replace(/\*\*|__|\*|_|`/g, "").length;
 }
 function wrapText(text, maxChars) {
   const words = text.split(/\s+/);

package/dist/{chunk-EQWC76GQ.js → chunk-GWQRTA5W.js}

@@ -8,10 +8,10 @@ import {
 } from "./chunk-VLC6WNRD.js";
 import {
   wrapDescriptionLines
-} from "./chunk-MB2SQF7N.js";
+} from "./chunk-7WEYXYLC.js";
 import {
   renderInlineText
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";

package/dist/{chunk-GJXMG4S3.js → chunk-HHVIE45A.js}

@@ -3,7 +3,7 @@ import {
   mapLegendConfig,
   mapLegendGroups,
   parsePathRings
-} from "./chunk-4RY5D5RE.js";
+} from "./chunk-AM42TLSZ.js";
 import {
   buildSwatches
 } from "./chunk-T7NWBVSC.js";

package/dist/{chunk-4FT5KQ7H.js → chunk-IGJEKO2P.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-CN4RDJDV.js";
 import {
   layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+} from "./chunk-UIEKW4SG.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,

package/dist/{chunk-KRU2LCIP.js → chunk-IHN6WDEY.js}

@@ -43,7 +43,7 @@ import {
 } from "./chunk-IYULMRBE.js";
 import {
   renderInlineText
-} from "./chunk-65GPEV5V.js";
+} from "./chunk-QKPOIJBT.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";

package/dist/{chunk-QT3KDDXK.js → chunk-IN7XI6NO.js}

@@ -4,11 +4,6 @@ import {
   wrapTextToWidth
 } from "./chunk-KAO7JL4I.js";
 
-// src/boxes-and-lines/node-metrics.ts
-var PHI = 1.618;
-var NODE_HEIGHT = 60;
-var NODE_WIDTH = Math.round(NODE_HEIGHT * PHI);
-
 // src/boxes-and-lines/label-placement.ts
 import { curveBasis } from "d3-shape";
 var EDGE_LABEL_FONT_SIZE = 11;
@@ -426,8 +421,6 @@ function placeEdgeLabels(layout, opts) {
 }
 
 export {
-  NODE_HEIGHT,
-  NODE_WIDTH,
   EDGE_LABEL_FONT_SIZE,
   BOX_CLEAR_PAD,
   LABEL_REACH_WIDE,

package/dist/{chunk-NMK7KJZZ.js → chunk-IQN2NGEU.js}

@@ -1,6 +1,6 @@
 import {
   layoutERDiagram
-} from "./chunk-TNV4F5WA.js";
+} from "./chunk-7IALGIOI.js";
 import {
   serializeSvg
 } from "./chunk-CYRB2JTN.js";
@@ -9,7 +9,7 @@ import {
 } from "./chunk-24YPR5EH.js";
 import {
   layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+} from "./chunk-UIEKW4SG.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -28,14 +28,14 @@ import {
 } from "./chunk-JILEYZ2V.js";
 import {
   parseERDiagram
-} from "./chunk-Q7Y6JQ3R.js";
+} from "./chunk-S4SJ4LLY.js";
 import {
   NOTE_BADGE_RADIUS,
   noteConnectorPoints,
   renderNoteBadge,
   renderNoteBox,
   renderNoteConnector
-} from "./chunk-D6PVMUCX.js";
+} from "./chunk-67N26CER.js";
 import {
   FONT_FAMILY
 } from "./chunk-ICLB27PZ.js";

package/dist/{chunk-M6ZQAFPD.js → chunk-IY62DXT2.js}

@@ -7,7 +7,7 @@ import {
 import {
   resolveNotes,
   tryCollectNote
-} from "./chunk-NJJCTEBM.js";
+} from "./chunk-KLBTJEIK.js";
 import {
   displayName,
   normalizeName

package/dist/{chunk-4WQX55VX.js → chunk-IZHGT5HD.js}

@@ -3,14 +3,14 @@ import {
   capLabelColumn,
   computeTimeTicks,
   showFullOnHover
-} from "./chunk-VSOZZYLK.js";
+} from "./chunk-NERQSSYD.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
 import {
   INLINE_HEADER_PAD,
   layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+} from "./chunk-UIEKW4SG.js";
 import {
   TITLE_FONT_SIZE,
   TITLE_FONT_WEIGHT,
@@ -1448,10 +1448,14 @@ function renderErasAndMarkers(g, svg, resolved, xScale, innerHeight, palette, er
     const eraEndDate = parseDateStringToDate(era.endDate);
     const eraG = g.append("g").attr("class", "gantt-era-group").attr("data-line-number", String(era.lineNumber));
     const eraRect = eraG.append("rect").attr("class", "gantt-era").attr("x", sx).attr("y", 0).attr("width", ex - sx).attr("height", innerHeight).attr("fill", color).attr("opacity", baseEraOpacity);
-    const eraLabelMaxW = Math.max(0, ex - sx - 8);
+    const [plotStart, plotEnd] = xScale.range();
+    const vsx = Math.max(sx, plotStart);
+    const vex = Math.min(ex, plotEnd);
+    if (vex <= vsx) continue;
+    const eraLabelMaxW = Math.max(0, vex - vsx - 8);
     const eraDisplayLabel = truncateLegendText(era.label, 10, eraLabelMaxW);
     const eraTruncated = eraDisplayLabel !== era.label;
-    const eraLabel = eraG.append("text").attr("class", "gantt-era-label").attr("x", (sx + ex) / 2).attr("y", eraLabelY).attr("text-anchor", "middle").attr("font-size", 10).attr("fill", color).attr("opacity", 0.7).style("cursor", "pointer").text(eraDisplayLabel);
+    const eraLabel = eraG.append("text").attr("class", "gantt-era-label").attr("x", (vsx + vex) / 2).attr("y", eraLabelY).attr("text-anchor", "middle").attr("font-size", 10).attr("fill", color).attr("opacity", 0.7).style("cursor", "pointer").text(eraDisplayLabel);
     eraG.on("mouseenter", () => {
       g.selectAll(".gantt-task").attr(
         "opacity",
@@ -2105,6 +2109,18 @@ function dateToFractionalYear(d) {
   const fraction = (d.getTime() - startOfYear.getTime()) / (endOfYear.getTime() - startOfYear.getTime());
   return y + fraction;
 }
+function fractionalYearToDate(frac) {
+  const y = Math.floor(frac);
+  const startOfYear = new Date(y, 0, 1);
+  const endOfYear = new Date(y + 1, 0, 1);
+  return new Date(
+    startOfYear.getTime() + (frac - y) * (endOfYear.getTime() - startOfYear.getTime())
+  );
+}
+var EXACT_FRACTIONAL_YEAR = {
+  toFractionalYear: dateToFractionalYear,
+  fromFractionalYear: fractionalYearToDate
+};
 function diamondPoints(cx, cy, size) {
   const half = size / 2;
   return `${cx},${cy - half} ${cx + half},${cy} ${cx},${cy + half} ${cx - half},${cy}`;
@@ -2188,7 +2204,17 @@ function renderTimeScaleHorizontal(g, scale, _innerWidth, innerHeight, textColor
   const domain = scale.domain();
   const domainMin = domain[0];
   const domainMax = domain[1];
-  const ticks = computeTimeTicks(domainMin, domainMax, scale);
+  const ticks = computeTimeTicks(
+    domainMin,
+    domainMax,
+    scale,
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    void 0,
+    EXACT_FRACTIONAL_YEAR
+  );
   if (ticks.length < 2) return;
   const tickLen = 6;
   const opacity = 0.4;