@opendata-ai/openchart-vanilla 7.0.0 → 7.0.3

package/dist/index.js

@@ -642,7 +642,16 @@ function createBarList(container, spec, options) {
       watermark: options?.watermark,
       measureText
     };
-    return compileBarList(currentSpec, compileOpts);
+    const layout = compileBarList(currentSpec, compileOpts);
+    if (layout.rows.length > 0) {
+      const lastRow = layout.rows[layout.rows.length - 1];
+      const contentBottom = lastRow.y + lastRow.height + layout.chrome.bottomHeight + layout.theme.spacing.padding;
+      if (contentBottom < layout.height) {
+        layout.height = contentBottom;
+        layout.area.height = contentBottom - layout.area.y - layout.chrome.bottomHeight - layout.theme.spacing.padding;
+      }
+    }
+    return layout;
   }
   function wireTooltipAndInteraction(svg, layout) {
     const cleanups = [];
@@ -3853,23 +3862,24 @@ function snapKey(x3) {
   return Math.round(x3);
 }
 function collectSeriesGroups(layout) {
-  const groups = [];
+  const byKey = /* @__PURE__ */ new Map();
+  const markTypeByKey = /* @__PURE__ */ new Map();
   for (let i = 0; i < layout.marks.length; i++) {
     const mark = layout.marks[i];
     if ((mark.type === "line" || mark.type === "area") && mark.dataPoints?.length) {
+      const key = mark.seriesKey ?? "__default__";
+      const existingType = markTypeByKey.get(key);
+      if (existingType === "line" && mark.type === "area") continue;
       const color = mark.type === "line" ? mark.stroke : getRepresentativeColor(mark.fill);
       const pointsByX = /* @__PURE__ */ new Map();
       for (const dp of mark.dataPoints) {
         pointsByX.set(snapKey(dp.x), { ...dp });
       }
-      groups.push({
-        seriesKey: mark.seriesKey ?? `${mark.type}-${i}`,
-        color,
-        pointsByX
-      });
+      byKey.set(key, { seriesKey: key, color, pointsByX });
+      markTypeByKey.set(key, mark.type);
     }
   }
-  return groups;
+  return Array.from(byKey.values());
 }
 function collectSnapXs(groups) {
   const seen = /* @__PURE__ */ new Set();