@opendata-ai/openchart-engine 7.4.1 → 7.6.0

package/dist/index.js

@@ -7408,13 +7408,16 @@ function computeScatterMarks(spec, scales, _chartArea, _strategy) {
   const colorEnc = encoding.color && "field" in encoding.color ? encoding.color : void 0;
   const isSequentialColor = colorEnc?.type === "quantitative";
   const colorField = colorEnc?.field;
-  const sizeField = encoding.size && "field" in encoding.size ? encoding.size.field : void 0;
+  const sizeEnc = encoding.size && "field" in encoding.size ? encoding.size : void 0;
+  const sizeField = sizeEnc?.field;
   let sizeScale;
   if (sizeField) {
     const sizeValues = spec.data.map((d) => Number(d[sizeField])).filter((v) => Number.isFinite(v));
-    const sizeMin = min2(sizeValues) ?? 0;
-    const sizeMax = max2(sizeValues) ?? 1;
-    sizeScale = sqrt2().domain([sizeMin, sizeMax]).range([MIN_BUBBLE_RADIUS, MAX_BUBBLE_RADIUS]);
+    const explicitDomain = sizeEnc?.scale?.domain;
+    const [sizeMin, sizeMax] = explicitDomain ?? [min2(sizeValues) ?? 0, max2(sizeValues) ?? 1];
+    const explicitRange = sizeEnc?.scale?.range;
+    const [radiusMin, radiusMax] = explicitRange ?? [MIN_BUBBLE_RADIUS, MAX_BUBBLE_RADIUS];
+    sizeScale = sqrt2().domain([sizeMin, sizeMax]).range([radiusMin, radiusMax]).clamp(true);
   }
   const marks = [];
   for (const row of spec.data) {
@@ -7520,9 +7523,11 @@ function computeTrendLine(marks) {
 var scatterRenderer = (spec, scales, chartArea, strategy, _theme) => {
   const pointMarks = computeScatterMarks(spec, scales, chartArea, strategy);
   const marks = [...pointMarks];
-  const trendLine = computeTrendLine(pointMarks);
-  if (trendLine) {
-    marks.unshift(trendLine);
+  if (spec.markDef?.trendline !== false) {
+    const trendLine = computeTrendLine(pointMarks);
+    if (trendLine) {
+      marks.unshift(trendLine);
+    }
   }
   return marks;
 };