@opendata-ai/openchart-engine 7.5.0 → 7.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opendata-ai/openchart-engine",
-  "version": "7.5.0",
+  "version": "7.6.0",
   "description": "Headless compiler for openchart: spec validation, data compilation, scales, and layout",
   "license": "Apache-2.0",
   "author": "Riley Hilliard",
@@ -48,7 +48,7 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@opendata-ai/openchart-core": "7.5.0",
+    "@opendata-ai/openchart-core": "7.6.0",
     "d3-array": "^3.2.0",
     "d3-format": "^3.1.2",
     "d3-interpolate": "^3.0.0",

package/src/charts/scatter/__tests__/compute.test.ts

@@ -3,6 +3,7 @@ import { describe, expect, it } from 'vitest';
 import type { NormalizedChartSpec } from '../../../compiler/types';
 import { computeScales } from '../../../layout/scales';
 import { computeScatterMarks } from '../compute';
+import { scatterRenderer } from '../index';
 import { computeTrendLine } from '../trendline';
 
 // ---------------------------------------------------------------------------
@@ -462,3 +463,26 @@ describe('computeTrendLine', () => {
     expect(computeTrendLine([])).toBeNull();
   });
 });
+
+describe('trendline opt-out', () => {
+  it('renders a trend line by default', () => {
+    const spec = makeBasicScatterSpec();
+    const scales = computeScales(spec, chartArea, spec.data);
+    const marks = scatterRenderer(spec, scales, chartArea, fullStrategy, undefined as never);
+
+    expect(marks.some((m) => m.type === 'line')).toBe(true);
+  });
+
+  it('suppresses the trend line when mark.trendline is false', () => {
+    const base = makeBasicScatterSpec();
+    const spec: NormalizedChartSpec = {
+      ...base,
+      markDef: { type: 'point', trendline: false },
+    };
+    const scales = computeScales(spec, chartArea, spec.data);
+    const marks = scatterRenderer(spec, scales, chartArea, fullStrategy, undefined as never);
+
+    expect(marks.some((m) => m.type === 'line')).toBe(false);
+    expect(marks.every((m) => m.type === 'point')).toBe(true);
+  });
+});

package/src/charts/scatter/index.ts

@@ -23,11 +23,16 @@ export const scatterRenderer: ChartRenderer = (spec, scales, chartArea, strategy
   const pointMarks = computeScatterMarks(spec, scales, chartArea, strategy);
   const marks: Mark[] = [...pointMarks];
 
-  // Add trend line if there are enough points
-  const trendLine = computeTrendLine(pointMarks);
-  if (trendLine) {
-    // Trend line goes behind points
-    marks.unshift(trendLine);
+  // Regression trend line renders by default but is opt-out via
+  // `mark: { type: 'point', trendline: false }`. Rendering it unconditionally
+  // competed with author-drawn reference lines (e.g. a manual x=y diagonal),
+  // so a chart could show two diagonals.
+  if (spec.markDef?.trendline !== false) {
+    const trendLine = computeTrendLine(pointMarks);
+    if (trendLine) {
+      // Trend line goes behind points
+      marks.unshift(trendLine);
+    }
   }
 
   return marks;