@diagrammo/dgmo 0.87.0 → 0.88.0

package/dist/{chunk-AGO3PFGS.js → chunk-MVCPO6LI.js}

@@ -72,10 +72,10 @@ import * as d3Scale from "d3-scale";
 import * as d3Selection from "d3-selection";
 var BAR_H = 22;
 var ROW_GAP = 6;
-var GROUP_GAP = 14;
 var MILESTONE_SIZE = 10;
 var MIN_LEFT_MARGIN = 120;
 var BOTTOM_MARGIN = 40;
+var BOTTOM_AXIS_LABEL_RESERVE = 30;
 var RIGHT_MARGIN = 20;
 var LABEL_PAD = 8;
 var LABEL_GAP = 5;
@@ -213,9 +213,11 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
   const ctx = exportDims ? ScaleContext.identity() : ScaleContext.from(containerWidth, idealWidth);
   const sBarH = ctx.structural(BAR_H);
   const sRowGap = ctx.structural(ROW_GAP);
-  const sGroupGap = ctx.structural(GROUP_GAP);
   const sMilestoneSize = ctx.structural(MILESTONE_SIZE);
-  const sBottomMargin = ctx.aesthetic(BOTTOM_MARGIN);
+  const sBottomMargin = Math.max(
+    ctx.aesthetic(BOTTOM_MARGIN),
+    BOTTOM_AXIS_LABEL_RESERVE
+  );
   const sRightMargin = ctx.aesthetic(RIGHT_MARGIN);
   const sLabelPad = ctx.structural(LABEL_PAD);
   const sLabelGap = ctx.structural(LABEL_GAP);
@@ -225,10 +227,10 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
   const sTitleY = ctx.aesthetic(TITLE_Y);
   const sHeaderRowH = ctx.structural(HEADER_ROW_H);
   const sContentTopPad = ctx.aesthetic(CONTENT_TOP_PAD);
-  const sTopDateLabelReserve = ctx.structural(topDateLabelReserve);
+  const sTopDateLabelReserve = topDateLabelReserve;
   const sSprintLabelReserve = ctx.structural(sprintLabelReserve);
   const sTitleHeight = ctx.aesthetic(titleHeight);
-  const sTagLegendReserve = ctx.structural(tagLegendReserve);
+  const sTagLegendReserve = tagLegendReserve;
   const inlineRequested = resolved.options.legendInline === true && resolved.tagGroups.length > 0;
   const legendExtent = inlineRequested ? getLegendExtent(
     {
@@ -267,15 +269,17 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
   const sTodayLabelY = sTodayReserve ? -(sTopDateLabelReserve + sHeaderRowH / 2) : 0;
   const sMarkerLabelY = sMarkerReserve ? -(sTopDateLabelReserve + sTodayReserve + sHeaderRowH / 2) : 0;
   const sEraLabelY = sEraReserve ? -(sTopDateLabelReserve + sTodayReserve + sMarkerReserve + sHeaderRowH / 2) : 0;
-  const sContentH = isTagMode ? totalRows * (sBarH + sRowGap) : totalRows * (sBarH + sRowGap) + sGroupGap * resolved.groups.length;
+  const sContentH = isTagMode ? totalRows * (sBarH + sRowGap) : totalRows * (sBarH + sRowGap);
   const sInnerHeight = sContentTopPad + sContentH;
   const sOuterHeight = sMarginTop + sInnerHeight + sBottomMargin;
   const sprintRightPad = resolved.sprints.length > 0 ? 50 : 0;
-  const innerWidth = containerWidth - leftMargin - sRightMargin - sprintRightPad;
-  const svg = d3Selection.select(container).append("svg").attr("viewBox", `0 0 ${containerWidth} ${sOuterHeight}`).attr("width", exportDims ? containerWidth : "100%").attr("preserveAspectRatio", "xMidYMin meet").attr("font-family", FONT_FAMILY).style("overflow", "visible");
+  const containerHeight = options?.fitToContainer ? container.clientHeight : 0;
+  const layoutWidth = !exportDims && containerHeight > 0 && sOuterHeight > containerHeight ? containerWidth * sOuterHeight / containerHeight : containerWidth;
+  const innerWidth = layoutWidth - leftMargin - sRightMargin - sprintRightPad;
+  const svg = d3Selection.select(container).append("svg").attr("viewBox", `0 0 ${layoutWidth} ${sOuterHeight}`).attr("width", exportDims ? containerWidth : "100%").attr("preserveAspectRatio", "xMidYMin meet").attr("font-family", FONT_FAMILY).style("overflow", "visible");
   const g = svg.append("g").attr("transform", `translate(${leftMargin}, ${sMarginTop})`);
   if (showTitle) {
-    svg.append("text").attr("class", "chart-title").attr("x", header.titleX).attr("y", sTitleY).attr("text-anchor", header.titleAnchor).attr("font-size", sTitleFontSize).attr("font-weight", TITLE_FONT_WEIGHT).attr("fill", palette.text).text(title);
+    svg.append("text").attr("class", "chart-title").attr("x", header.inline ? header.titleX : layoutWidth / 2).attr("y", sTitleY).attr("text-anchor", header.titleAnchor).attr("font-size", sTitleFontSize).attr("font-weight", TITLE_FONT_WEIGHT).attr("fill", palette.text).text(title);
   }
   function drawLegend() {
     svg.selectAll(".gantt-tag-legend-container").remove();
@@ -362,7 +366,8 @@ function renderGantt(container, resolved, palette, isDark, options, exportDims)
   drawLegend();
   const startTime = dateToFractionalYear(resolved.startDate);
   const endTime = dateToFractionalYear(resolved.endDate);
-  const domainPad = Math.max((endTime - startTime) * 0.02, 0.01);
+  const span = endTime - startTime;
+  const domainPad = span > 0 ? span * 0.02 : 1 / 365;
   const domainMin = startTime - domainPad;
   const domainMax = endTime + domainPad;
   const xScale = d3Scale.scaleLinear().domain([domainMin, domainMax]).range([0, innerWidth]);