@opendata-ai/openchart-engine 7.0.0 → 7.0.2

package/dist/index.js

@@ -7477,11 +7477,12 @@ function normalizeSpec(spec, warnings = []) {
     `Unknown spec shape. Expected mark (chart), layer, type: 'table', type: 'graph', type: 'sankey', type: 'tilemap', or type: 'barlist'.`
   );
 }
-function flattenLayers(spec, parentData, parentEncoding, parentTransforms, parentWatermark) {
+function flattenLayers(spec, parentData, parentEncoding, parentTransforms, parentWatermark, parentEndpointLabels) {
   const resolvedData = spec.data ?? parentData;
   const resolvedEncoding = parentEncoding && spec.encoding ? { ...parentEncoding, ...spec.encoding } : spec.encoding ?? parentEncoding;
   const resolvedTransforms = [...parentTransforms ?? [], ...spec.transform ?? []];
   const resolvedWatermark = spec.watermark ?? parentWatermark;
+  const resolvedEndpointLabels = spec.endpointLabels ?? parentEndpointLabels;
   const leaves = [];
   for (const child of spec.layer) {
     if (isLayerSpec(child)) {
@@ -7491,7 +7492,8 @@ function flattenLayers(spec, parentData, parentEncoding, parentTransforms, paren
           resolvedData,
           resolvedEncoding,
           resolvedTransforms,
-          resolvedWatermark
+          resolvedWatermark,
+          resolvedEndpointLabels
         )
       );
     } else {
@@ -7504,7 +7506,8 @@ function flattenLayers(spec, parentData, parentEncoding, parentTransforms, paren
         encoding: mergedEncoding,
         transform: mergedTransforms.length > 0 ? mergedTransforms : void 0,
         // Inherit parent watermark if child doesn't explicitly set one
-        ...child.watermark === void 0 && resolvedWatermark !== void 0 ? { watermark: resolvedWatermark } : {}
+        ...child.watermark === void 0 && resolvedWatermark !== void 0 ? { watermark: resolvedWatermark } : {},
+        ...child.endpointLabels === void 0 && resolvedEndpointLabels !== void 0 ? { endpointLabels: resolvedEndpointLabels } : {}
       });
     }
   }
@@ -9169,7 +9172,8 @@ function buildPrimarySpec(leaves, layerSpec) {
     theme: layerSpec.theme ?? leaves[0].theme,
     darkMode: layerSpec.darkMode ?? leaves[0].darkMode,
     watermark: layerSpec.watermark ?? leaves[0].watermark,
-    hiddenSeries: layerSpec.hiddenSeries ?? leaves[0].hiddenSeries
+    hiddenSeries: layerSpec.hiddenSeries ?? leaves[0].hiddenSeries,
+    endpointLabels: layerSpec.endpointLabels ?? leaves[0].endpointLabels
   };
   return primary;
 }
@@ -10332,11 +10336,12 @@ function getSparklinePad(spec) {
   const dotPad = 4;
   const dotRight = point5 === "last" || point5 === true || point5 === "endpoints" || point5 === "transparent";
   const dotLeft = point5 === "first" || point5 === true || point5 === "endpoints" || point5 === "transparent";
+  const hasDots = dotRight || dotLeft;
   return {
     left: dotLeft ? Math.max(strokePad, dotPad) : strokePad,
     right: dotRight ? Math.max(strokePad, dotPad) : strokePad,
-    top: strokePad,
-    bottom: strokePad
+    top: hasDots ? Math.max(strokePad, dotPad) : strokePad,
+    bottom: hasDots ? Math.max(strokePad, dotPad) : strokePad
   };
 }
 function computeDimensions(spec, options, legendLayout, theme, strategy, watermark = true) {
@@ -10429,7 +10434,7 @@ function computeDimensions(spec, options, legendLayout, theme, strategy, waterma
   const wantsMetrics = !!spec.metrics && spec.metrics.length > 0 && chromeMode !== "hidden";
   const tentativeMetricsHeight = wantsMetrics ? metricBarHeight() : 0;
   const margins = {
-    top: topPad + chrome.topHeight + tentativeMetricsHeight + topAxisGap,
+    top: topPad + chrome.topHeight + tentativeMetricsHeight,
     right: hPad + (isRadial ? hPad : axisMargin),
     bottom: padding + chrome.bottomHeight + xAxisHeight,
     left: hPad + (isRadial ? hPad : axisMargin)
@@ -10584,6 +10589,7 @@ function computeDimensions(spec, options, legendLayout, theme, strategy, waterma
       margins.top += legendLayout.bounds.height + gap;
     }
   }
+  margins.top += topAxisGap;
   let chartArea = {
     x: margins.left,
     y: margins.top,
@@ -10604,13 +10610,13 @@ function computeDimensions(spec, options, legendLayout, theme, strategy, waterma
       bottomLegendReservation
     );
     const fallbackTopAxisGap = isRadial && fallbackChrome.topHeight === 0 ? 0 : axisMargin + inlineTickOverhang;
-    const newTop = topPad + fallbackChrome.topHeight + fallbackTopAxisGap + tentativeMetricsHeight;
+    const newTop = topPad + fallbackChrome.topHeight + tentativeMetricsHeight;
     const topDelta = margins.top - newTop;
     const newBottom = padding + fallbackChrome.bottomHeight + xAxisHeight;
     const bottomDelta = margins.bottom - newBottom;
     if (topDelta > 0 || bottomDelta > 0) {
       const gap = legendGap(width);
-      margins.top = newTop + ("entries" in legendLayout && legendLayout.entries.length > 0 && legendLayout.position === "top" ? legendLayout.bounds.height + gap : 0);
+      margins.top = newTop + ("entries" in legendLayout && legendLayout.entries.length > 0 && legendLayout.position === "top" ? legendLayout.bounds.height + gap : 0) + fallbackTopAxisGap;
       margins.bottom = newBottom;
       chartArea = {
         x: margins.left,
@@ -14167,10 +14173,14 @@ function compileChart(spec, options) {
     const gap = legendGap(options.width);
     switch (legendLayout.position) {
       case "top":
+        legendArea.x = theme.spacing.padding;
+        legendArea.width = options.width - theme.spacing.padding * 2;
         legendArea.y -= legendLayout.bounds.height + gap;
         legendArea.height += legendLayout.bounds.height + gap;
         break;
       case "bottom":
+        legendArea.x = theme.spacing.padding;
+        legendArea.width = options.width - theme.spacing.padding * 2;
         legendArea.height += legendLayout.bounds.height + gap + dims.xAxisHeight;
         break;
       case "right":