@opendata-ai/openchart-engine 7.2.0 → 7.2.1

package/dist/index.js

@@ -3932,6 +3932,7 @@ function computeLineLabels(marks, strategy, density = "auto", labelOffsets, spec
 }
 
 // src/charts/line/index.ts
+var AREA_POINT_RADIUS = 3;
 var lineRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const marks = computeLineMarks(spec, scales, chartArea, strategy);
   const lineMarks = marks.filter((m) => m.type === "line");
@@ -3957,7 +3958,8 @@ var areaRenderer = (spec, scales, chartArea, strategy, theme) => {
   const encoding = spec.encoding;
   const hasColor = !!(encoding.color && "field" in encoding.color);
   const lines = hasColor ? linesFromAreas(areas) : computeLineMarks(spec, scales, chartArea, strategy);
-  return [...areas, ...lines];
+  const points = hasColor && spec.markDef.point ? pointsFromAreas(areas, spec.markDef.point) : [];
+  return [...areas, ...lines, ...points];
 };
 function linesFromAreas(areas) {
   return areas.map((a) => ({
@@ -3972,6 +3974,34 @@ function linesFromAreas(areas) {
     aria: { label: `${a.seriesKey ?? "Series"}: line with ${a.topPoints.length} data points` }
   }));
 }
+function pointsFromAreas(areas, pointMode) {
+  const isTransparent = pointMode === "transparent";
+  const isEndpoints = pointMode === "endpoints";
+  const points = [];
+  for (const a of areas) {
+    const stroke = getRepresentativeColor6(a.fill);
+    const lastIdx = a.topPoints.length - 1;
+    for (let i = 0; i < a.topPoints.length; i++) {
+      const pt = a.topPoints[i];
+      const isEndpoint = i === 0 || i === lastIdx;
+      const visible = !isTransparent && (!isEndpoints || isEndpoint);
+      const hollow = isEndpoints && visible;
+      points.push({
+        type: "point",
+        cx: pt.x,
+        cy: pt.y,
+        r: visible ? AREA_POINT_RADIUS : 0,
+        fill: hollow ? "transparent" : stroke,
+        stroke: hollow ? stroke : visible ? "#ffffff" : "transparent",
+        strokeWidth: visible ? 1.5 : 0,
+        fillOpacity: isTransparent ? 0 : 1,
+        data: a.data[i] ?? {},
+        aria: { decorative: true }
+      });
+    }
+  }
+  return points;
+}
 
 // src/charts/pie/compute.ts
 import { isConditionalDef, isGradientDef as isGradientDef4 } from "@opendata-ai/openchart-core";
@@ -10978,7 +11008,7 @@ function buildBandScale(channel, data, rangeStart, rangeEnd) {
 }
 function buildPointScale(channel, data, rangeStart, rangeEnd) {
   const values = channel.scale?.domain ? channel.scale.domain : applyCategoricalSort(uniqueStrings(fieldValues(data, channel.field)), channel.sort);
-  const padding = channel.scale?.padding ?? 0.5;
+  const padding = channel.scale?.padding ?? channel.scale?.paddingOuter ?? 0.5;
   const scale = point4().domain(values).range([rangeStart, rangeEnd]).padding(padding);
   if (channel.scale?.reverse) {
     const [r0, r1] = scale.range();