@opendata-ai/openchart-engine 8.0.0-rc.18 → 8.0.0-rc.19

package/dist/index.js

@@ -9087,7 +9087,7 @@ function resolvePosition2(value2, channelType, scale) {
     }
   }
 }
-function computeScatterMarks(spec, scales, _chartArea, _strategy) {
+function computeScatterMarks(spec, scales, _chartArea, _strategy, theme) {
   const encoding = spec.encoding;
   const xChannel = encoding.x;
   const yChannel = encoding.y;
@@ -9105,6 +9105,10 @@ function computeScatterMarks(spec, scales, _chartArea, _strategy) {
   const sizeField = sizeEnc?.field;
   const resolvedSize = buildSizeScale(sizeEnc, spec.data, SIZE_SCALE_DEFAULTS.point);
   const sizeScale = resolvedSize?.scale;
+  const constFill = spec.markDef.fill;
+  const constSize = spec.markDef.size;
+  const bg = theme?.colors?.background;
+  const defaultStroke = bg && bg !== "transparent" ? bg : "#ffffff";
   const keyEnc = encoding.key && "field" in encoding.key ? encoding.key : void 0;
   const keyField = keyEnc?.field;
   const marks = [];
@@ -9119,10 +9123,12 @@ function computeScatterMarks(spec, scales, _chartArea, _strategy) {
     if (isSequentialColor && colorField) {
       const val = Number(row[colorField]);
       color2 = Number.isFinite(val) ? getSequentialColor(scales, val) : getColor(scales, "__default__");
-    } else {
+    } else if (colorField) {
       color2 = getColor(scales, category ?? "__default__");
+    } else {
+      color2 = constFill ?? getColor(scales, "__default__");
     }
-    let radius = DEFAULT_POINT_RADIUS2;
+    let radius = constSize != null ? constSize : DEFAULT_POINT_RADIUS2;
     if (sizeScale && sizeField) {
       const sizeVal = Number(row[sizeField]);
       if (Number.isFinite(sizeVal)) {
@@ -9143,9 +9149,9 @@ function computeScatterMarks(spec, scales, _chartArea, _strategy) {
       cy,
       r: radius,
       fill: color2,
-      stroke: "#ffffff",
-      strokeWidth: 1,
-      fillOpacity: 0.7,
+      stroke: spec.markDef.stroke ?? defaultStroke,
+      strokeWidth: spec.markDef.strokeWidth ?? 1,
+      fillOpacity: spec.markDef.opacity ?? 0.7,
       data: row,
       aria
     });
@@ -9186,7 +9192,7 @@ function linearRegression(points) {
   const intercept = (sumY - slope * sumX) / n;
   return { slope, intercept };
 }
-function computeTrendLine(marks) {
+function computeTrendLine(marks, stroke = TRENDLINE_COLOR, strokeWidth = TRENDLINE_STROKE_WIDTH) {
   if (marks.length < 2) return null;
   const points = marks.map((m) => ({ x: m.cx, y: m.cy }));
   const result = linearRegression(points);
@@ -9209,8 +9215,8 @@ function computeTrendLine(marks) {
       { x: minX, y: y12 },
       { x: maxX, y: y2 }
     ],
-    stroke: TRENDLINE_COLOR,
-    strokeWidth: TRENDLINE_STROKE_WIDTH,
+    stroke,
+    strokeWidth,
     strokeDasharray: TRENDLINE_DASH,
     data: [],
     aria
@@ -9218,13 +9224,20 @@ function computeTrendLine(marks) {
 }
 
 // src/charts/scatter/index.ts
-var scatterRenderer = (spec, scales, chartArea, strategy, _theme) => {
-  const pointMarks = computeScatterMarks(spec, scales, chartArea, strategy);
+var scatterRenderer = (spec, scales, chartArea, strategy, theme) => {
+  const pointMarks = computeScatterMarks(spec, scales, chartArea, strategy, theme);
   const marks = [...pointMarks];
-  if (spec.markDef?.trendline !== false) {
-    const trendLine = computeTrendLine(pointMarks);
+  const trendline = spec.markDef?.trendline;
+  if (trendline !== false) {
+    const config = typeof trendline === "object" ? trendline : void 0;
+    const stroke = config?.stroke ?? theme?.colors?.text;
+    const trendLine = computeTrendLine(pointMarks, stroke, config?.strokeWidth);
     if (trendLine) {
-      marks.unshift(trendLine);
+      if (config?.layer === "above") {
+        marks.push(trendLine);
+      } else {
+        marks.unshift(trendLine);
+      }
     }
   }
   return marks;