@diagrammo/dgmo 0.92.1 → 0.93.0

package/dist/{chunk-KTGZDMDX.js → chunk-XUTR7GNT.js}

@@ -1,15 +1,14 @@
-import {
-  wrapDescriptionLines
-} from "./chunk-NPWVOFB3.js";
-import {
-  renderInlineText
-} from "./chunk-S7W75MIM.js";
 import {
   ScaleContext
 } from "./chunk-24YPR5EH.js";
 import {
-  renderIntegratedLegend
-} from "./chunk-NMS5XSLX.js";
+  layoutInlineHeader
+} from "./chunk-42UJ23H3.js";
+import {
+  TITLE_FONT_SIZE,
+  TITLE_FONT_WEIGHT,
+  TITLE_Y
+} from "./chunk-VLC6WNRD.js";
 import {
   ARROWHEAD_HEIGHT,
   ARROWHEAD_WIDTH,
@@ -18,25 +17,26 @@ import {
   HAIRLINE_DASH
 } from "./chunk-XCKNFFKM.js";
 import {
-  layoutInlineHeader
-} from "./chunk-42UJ23H3.js";
+  renderIntegratedLegend
+} from "./chunk-NMS5XSLX.js";
 import {
   getLegendExtent,
   getMaxLegendReservedHeight
 } from "./chunk-JILEYZ2V.js";
-import {
-  TITLE_FONT_SIZE,
-  TITLE_FONT_WEIGHT,
-  TITLE_Y
-} from "./chunk-VLC6WNRD.js";
-import {
-  FONT_FAMILY
-} from "./chunk-ICLB27PZ.js";
 import {
   isSequenceBlock,
   isSequenceNote,
   isSequenceSection
-} from "./chunk-B5PEKSRH.js";
+} from "./chunk-VSAKEMDD.js";
+import {
+  wrapDescriptionLines
+} from "./chunk-MB2SQF7N.js";
+import {
+  renderInlineText
+} from "./chunk-65GPEV5V.js";
+import {
+  FONT_FAMILY
+} from "./chunk-ICLB27PZ.js";
 import {
   resolveActiveTagGroup,
   tagAttrKey
@@ -301,10 +301,12 @@ function wrapTextLines(text, maxWidth, fontSize) {
   );
 }
 var labelTextWidth = (boxW) => boxW - 10;
+var PARTICIPANT_LABEL_PAD_V = 2;
+var participantLabelHeight = (lines, fontSize) => lines * (fontSize + 2) + PARTICIPANT_LABEL_PAD_V * 2;
 function splitParticipantLabel(label, maxWidth, fontSize) {
   if (measureText(label, fontSize) <= maxWidth) return [label];
   if (label.includes(" ")) {
-    return wrapLabelWords(label.split(" "), maxWidth, fontSize);
+    return wrapLabelWords(label.split(" "), maxWidth, fontSize, " ");
   }
   if (/[-_:/]/.test(label)) {
     const parts = label.split(/[-_:/]+/);
@@ -316,11 +318,11 @@ function splitParticipantLabel(label, maxWidth, fontSize) {
   }
   return [label];
 }
-function wrapLabelWords(words, maxWidth, fontSize) {
+function wrapLabelWords(words, maxWidth, fontSize, sep = "") {
   const lines = [];
   let current = "";
   for (const word of words) {
-    const test = current ? current + word : word;
+    const test = current ? current + sep + word : word;
     if (measureText(test, fontSize) > maxWidth && current) {
       lines.push(current);
       current = word;
@@ -686,6 +688,37 @@ function isSectionCollapsed(sec, collapsedSections) {
   return collapsedSections?.has(sec.lineNumber) ?? false;
 }
 function layoutSequence(parsed, containerWidth, options) {
+  let layout = layoutSequencePass(parsed, containerWidth, options);
+  if (options?.exportWidth) return layout;
+  const target = containerWidth - 1;
+  let prev = null;
+  for (let i = 0; i < 4 && layout && !layout.ctx.isBelowFloor; i++) {
+    if (layout.svgWidth <= containerWidth) return layout;
+    let factor = layout.ctx.factor * target / layout.svgWidth;
+    if (prev && prev.ctx.factor !== layout.ctx.factor) {
+      const slope = (prev.svgWidth - layout.svgWidth) / (prev.ctx.factor - layout.ctx.factor);
+      if (slope > 0)
+        factor = layout.ctx.factor - (layout.svgWidth - target) / slope;
+    }
+    prev = layout;
+    layout = layoutSequencePass(
+      parsed,
+      containerWidth,
+      options,
+      ScaleContext.fromFactor(factor)
+    );
+  }
+  if (layout && !layout.ctx.isBelowFloor && layout.svgWidth > containerWidth) {
+    layout = layoutSequencePass(
+      parsed,
+      containerWidth,
+      options,
+      ScaleContext.fromFactor(0)
+    );
+  }
+  return layout;
+}
+function layoutSequencePass(parsed, containerWidth, options, fit) {
   const { title, options: parsedOptions } = parsed;
   const effectiveCollapsedGroups = options?.collapsedGroups ? new Set(options.collapsedGroups) : new Set(
     parsed.groups.filter((g) => g.collapsed).map((g) => g.lineNumber)
@@ -752,10 +785,9 @@ function layoutSequence(parsed, containerWidth, options) {
     participants.length * effectiveGap,
     uniformBoxWidth + 40
   );
-  const ctx = options?.exportWidth ? ScaleContext.identity() : ScaleContext.from(containerWidth, idealWidth);
+  const ctx = fit ?? (options?.exportWidth ? ScaleContext.identity() : ScaleContext.from(containerWidth, idealWidth));
   const sGap = ctx.structural(effectiveGap);
   const sBoxW = ctx.structural(uniformBoxWidth);
-  const sBoxH = ctx.structural(PARTICIPANT_BOX_HEIGHT);
   const sTopMargin = ctx.aesthetic(TOP_MARGIN);
   const sTitleHeight = ctx.aesthetic(TITLE_HEIGHT);
   const sParticipantYOffset = ctx.aesthetic(PARTICIPANT_Y_OFFSET);
@@ -777,6 +809,20 @@ function layoutSequence(parsed, containerWidth, options) {
   const sNoteLaneMax = sGap - sActivationWidth - sNoteGap;
   const sLabelFontSize = ctx.text(LABEL_FONT_SIZE);
   const sLabelTextWidth = labelTextWidth(sBoxW);
+  let maxInBoxLines = 1;
+  for (const p of participants) {
+    if (p.type === "actor") continue;
+    const n = splitParticipantLabel(
+      p.label,
+      sLabelTextWidth,
+      sLabelFontSize
+    ).length;
+    maxInBoxLines = Math.max(maxInBoxLines, n);
+  }
+  const sBoxH = Math.max(
+    ctx.structural(PARTICIPANT_BOX_HEIGHT),
+    participantLabelHeight(maxInBoxLines, sLabelFontSize)
+  );
   const participantIndexMap = /* @__PURE__ */ new Map();
   participants.forEach((p, i) => participantIndexMap.set(p.id, i));
   const effectiveNotePosition = (note) => {
@@ -1398,8 +1444,10 @@ function layoutSequence(parsed, containerWidth, options) {
     }
   };
   for (let pass = 0; pass < 4; pass++) {
-    let contentLeft = 0;
-    let contentRight = svgWidth;
+    const extentLeft = offsetX - leftMargin;
+    const extentRight = extentLeft + totalWidth;
+    let contentLeft = extentLeft;
+    let contentRight = extentRight;
     for (const step of renderSteps) {
       const displayLabel = displayMessageLabel(step);
       if (!displayLabel) continue;
@@ -1428,8 +1476,8 @@ function layoutSequence(parsed, containerWidth, options) {
       scanNotes(elements, acc);
       contentRight = acc.right;
     }
-    const neededLeftPad = Math.max(0, -contentLeft);
-    const neededRightPad = Math.max(0, contentRight - svgWidth);
+    const neededLeftPad = Math.max(0, extentLeft - contentLeft);
+    const neededRightPad = Math.max(0, contentRight - extentRight);
     if (neededLeftPad <= 0.5 && neededRightPad <= 0.5) break;
     leftMargin += neededLeftPad;
     rightMargin += neededRightPad;