@opendata-ai/openchart-engine 8.0.0-rc.17 → 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;
@@ -15430,11 +15443,9 @@ function compileLayerIndependent(leaves, layerSpec, options, compileChart2) {
   };
   const xField0 = leaf0.encoding?.x?.field;
   const xField1 = leaf1.encoding?.x?.field;
-  const unionXValues = /* @__PURE__ */ new Set();
-  if (xField0) for (const row of leaf0.data) unionXValues.add(row[xField0]);
-  if (xField1) for (const row of leaf1.data) unionXValues.add(row[xField1]);
-  let leaf0WithUnionX = ensureXDomainCoverage(leaf0, xField0, unionXValues);
-  let leaf1WithUnionX = ensureXDomainCoverage(leaf1, xField1, unionXValues);
+  const union = withUnionXDomain(leaf0, leaf1);
+  let leaf0WithUnionX = union.leaf0;
+  let leaf1WithUnionX = union.leaf1;
   const aligned = alignYDomains(leaf0WithUnionX, leaf1WithUnionX);
   if (aligned) {
     leaf0WithUnionX = withYDomain(leaf0WithUnionX, aligned.domain0);
@@ -15581,20 +15592,75 @@ function compileLayerIndependent(leaves, layerSpec, options, compileChart2) {
     tooltipDescriptors: mergedTooltips
   };
 }
-function ensureXDomainCoverage(leaf, xField, allXValues) {
-  if (!xField || allXValues.size === 0) return leaf;
-  const existingXValues = /* @__PURE__ */ new Set();
-  for (const row of leaf.data) existingXValues.add(row[xField]);
-  const missingRows = [];
-  for (const xVal of allXValues) {
-    if (!existingXValues.has(xVal)) {
-      missingRows.push({ [xField]: xVal });
+function withXDomain(leaf, domain) {
+  if (!leaf.encoding?.x) return leaf;
+  return {
+    ...leaf,
+    encoding: {
+      ...leaf.encoding,
+      x: {
+        ...leaf.encoding.x,
+        scale: {
+          ...leaf.encoding.x.scale,
+          domain
+        }
+      }
     }
+  };
+}
+function withUnionXDomain(leaf0, leaf1) {
+  const xEnc0 = leaf0.encoding?.x;
+  const xEnc1 = leaf1.encoding?.x;
+  const xField0 = xEnc0?.field;
+  const xField1 = xEnc1?.field;
+  if (!xField0 || !xField1) return { leaf0, leaf1 };
+  const xType = xEnc0?.type ?? xEnc1?.type;
+  const pinned0 = xEnc0?.scale?.domain !== void 0;
+  const pinned1 = xEnc1?.scale?.domain !== void 0;
+  if (pinned0 && pinned1) return { leaf0, leaf1 };
+  const values0 = leaf0.data.map((row) => row[xField0]);
+  const values1 = leaf1.data.map((row) => row[xField1]);
+  const allValues = [...values0, ...values1].filter((v) => v != null);
+  if (allValues.length === 0) return { leaf0, leaf1 };
+  let domain;
+  if (xType === "temporal") {
+    let minMs = Number.POSITIVE_INFINITY;
+    let maxMs = Number.NEGATIVE_INFINITY;
+    for (const v of allValues) {
+      const ms = (v instanceof Date ? v : new Date(String(v))).getTime();
+      if (Number.isNaN(ms)) continue;
+      if (ms < minMs) minMs = ms;
+      if (ms > maxMs) maxMs = ms;
+    }
+    if (minMs <= maxMs) {
+      domain = [new Date(minMs).toISOString(), new Date(maxMs).toISOString()];
+    }
+  } else if (xType === "quantitative") {
+    let min4 = Number.POSITIVE_INFINITY;
+    let max4 = Number.NEGATIVE_INFINITY;
+    for (const v of allValues) {
+      const n = typeof v === "number" ? v : Number(v);
+      if (!Number.isFinite(n)) continue;
+      if (n < min4) min4 = n;
+      if (n > max4) max4 = n;
+    }
+    if (min4 <= max4) domain = [min4, max4];
+  } else {
+    const seen = /* @__PURE__ */ new Set();
+    const categories = [];
+    for (const v of allValues) {
+      const s = String(v);
+      if (!seen.has(s)) {
+        seen.add(s);
+        categories.push(s);
+      }
+    }
+    if (categories.length > 0) domain = categories;
   }
-  if (missingRows.length === 0) return leaf;
+  if (domain === void 0) return { leaf0, leaf1 };
   return {
-    ...leaf,
-    data: [...leaf.data, ...missingRows]
+    leaf0: pinned0 ? leaf0 : withXDomain(leaf0, domain),
+    leaf1: pinned1 ? leaf1 : withXDomain(leaf1, domain)
   };
 }
 function alignYDomains(leaf0, leaf1) {