@milaboratories/miplots4 1.0.170 → 1.0.172

package/dist/scatterplot/ChartRenderer.js

@@ -1,14 +1,14 @@
 var st = Object.defineProperty;
 var ot = (a, t, i) => t in a ? st(a, t, { enumerable: !0, configurable: !0, writable: !0, value: i }) : a[t] = i;
-var S = (a, t, i) => ot(a, typeof t != "symbol" ? t + "" : t, i);
-import { j as v } from "../_virtual/jsx-runtime.js";
+var M = (a, t, i) => ot(a, typeof t != "symbol" ? t + "" : t, i);
+import { j as F } from "../_virtual/jsx-runtime.js";
 import { c as nt } from "../_virtual/client.js";
 import { Error as at } from "../common/Error.js";
 import { DataFrameProvider as ht } from "../common/useDataFrame.js";
 import { DEFAULT_HEIGHT as X, DEFAULT_WIDTH as G, TITLE_LINE_HEIGHT as rt, MIN_LEGEND_GRADIENT_HEIGHT as lt, MAX_LEGEND_GRADIENT_HEIGHT as ct, MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as mt, BLACK as et, TITLE_MARGIN as dt } from "../constants.js";
 import { FACET_TITLE_LINE as pt } from "../discrete/constants.js";
 import { splitTextByWidth as V } from "../utils/splitTextByWidth.js";
-import { isContinuousAes as q } from "../types/common.js";
+import { isContinuousAes as Q } from "../types/common.js";
 import "../types/discrete.js";
 import "../types/scatterplot.js";
 import "../types/heatmap.js";
@@ -16,28 +16,28 @@ import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
 import { arrangeLegendParts as ut } from "../utils/arrangeLegendParts.js";
-import { getContinuousColorScale as gt } from "../utils/getContinuousColorScale.js";
-import { getContinuousLegendTicks as ft } from "../utils/getContinuousLegendTicks.js";
-import { TextMeasurer as Tt } from "../utils/TextMeasurer/TextMeasurer.js";
-import { ChartsGroup as Ct } from "./components/ChartsGroup.js";
-import { MIN_MARGIN as D, PADDINGS as P, DEFAULT_DOT_AES as A, LEGEND_OFFSET as Et, TICK_OFFSET as F, DEFAULT_TICKS_SIZE as Q, MIN_PADDING as U, FACET_TITLE_OFFSET as Mt, TITLE_LINE as O, FACET_AXIS_OFFSET as Z } from "./constants.js";
-import { createAesGetter as Y } from "./utils/createAesGetter.js";
-import { getTicksAndFormat as xt } from "./utils/getTicksAndFormat.js";
-import { isContinuousAxis as $ } from "./utils/isNumericScale.js";
+import { getSizeLegendItem as gt } from "../utils/getSizeLegendItem.js";
+import { getContinuousColorScale as ft } from "../utils/getContinuousColorScale.js";
+import { getContinuousLegendTicks as Tt } from "../utils/getContinuousLegendTicks.js";
+import { TextMeasurer as Ct } from "../utils/TextMeasurer/TextMeasurer.js";
+import { ChartsGroup as Et } from "./components/ChartsGroup.js";
+import { MIN_MARGIN as H, PADDINGS as P, DEFAULT_DOT_AES as Y, LEGEND_OFFSET as Mt, TICK_OFFSET as v, DEFAULT_TICKS_SIZE as Z, MIN_PADDING as U, FACET_TITLE_OFFSET as xt, TITLE_LINE as O, FACET_AXIS_OFFSET as $ } from "./constants.js";
+import { createAesGetter as D } from "./utils/createAesGetter.js";
+import { getTicksAndFormat as St } from "./utils/getTicksAndFormat.js";
+import { isContinuousAxis as q } from "./utils/isNumericScale.js";
 import { createMultilineDiscreteLabels as J } from "../utils/createMultilineDiscreteLabels.js";
 import { measureMultilineDiscreteLabels as k } from "../utils/measureMultilineDiscreteLabels.js";
 import B from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/linear.js";
 import { point as y } from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/band.js";
 import K from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/log.js";
-import St from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/ordinal.js";
+import Nt from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/ordinal.js";
 import bt from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/symlog.js";
-import { sqrt as Nt } from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/pow.js";
 function tt(a, t) {
   if (a === void 0)
     return !0;
   {
     const i = a.domain(), s = a.range(), e = t.domain(), o = t.range();
-    if (i.length !== e.length || i.some((f, T) => f !== e[T]) || s[0] !== o[0] || s[1] !== o[1])
+    if (i.length !== e.length || i.some((g, f) => g !== e[f]) || s[0] !== o[0] || s[1] !== o[1])
       return !0;
   }
   return !1;
@@ -46,13 +46,13 @@ function zt(a, t, i, s) {
   const e = [];
   return a % i === i - 1 && e.push("right"), a % i === 0 && e.push("left"), a < i && e.push("top"), (Math.ceil((a + 1) / i) === s || Math.ceil((a + 1) / i) === s - 1 && a % i > (t - 1) % i) && e.push("bottom"), e;
 }
-function wt(a, t, i, s, e, o, f, T, x, d) {
-  const I = a.scale === "discrete", w = t.scale === "discrete", h = o.includes("left") || !(d != null && d.sharedY), n = o.includes("left") && t.title !== "", r = o.includes("bottom") || !(d != null && d.sharedX), g = o.includes("bottom") && a.title !== "", E = t.hiddenLabels ? 0 : w ? i.leftAxisCaptionsWidthByColumns[T] + 2 * F : i.yAxisCaptionsWidth + 2 * F, l = (t.showTicks ? Q : 0) + F, m = n ? O : 0, C = a.hiddenLabels ? 0 : I ? i.bottomAxisCaptionsWidthByRows[f] + 2 * F : i.xAxisCaptionsWidth + 2 * F, M = a.showTicks ? Q : 0, H = g ? O : 0, p = E + l + m + Z, c = C + M + H + Z, W = Math.max(...s.map((u) => e[u].length));
+function wt(a, t, i, s, e, o, g, f, C, c) {
+  const I = a.scale === "discrete", w = t.scale === "discrete", h = o.includes("left") || !(c != null && c.sharedY), n = o.includes("left") && t.title !== "", r = o.includes("bottom") || !(c != null && c.sharedX), T = o.includes("bottom") && a.title !== "", x = t.hiddenLabels ? 0 : w ? i.leftAxisCaptionsWidthByColumns[f] + 2 * v : i.yAxisCaptionsWidth + 2 * v, m = (t.showTicks ? Z : 0) + v, p = n ? O : 0, E = a.hiddenLabels ? 0 : I ? i.bottomAxisCaptionsWidthByRows[g] + 2 * v : i.xAxisCaptionsWidth + 2 * v, S = a.showTicks ? Z : 0, A = T ? O : 0, u = x + m + p + $, l = E + S + A + $, W = Math.max(...s.map((d) => e[d].length));
   return {
-    left: h ? p : U,
-    top: W === 0 ? 0 : Mt * 2 + W * pt,
-    bottom: r ? c + 8 : U,
-    right: x ? 0 : U
+    left: h ? u : U,
+    top: W === 0 ? 0 : xt * 2 + W * pt,
+    bottom: r ? l + 8 : U,
+    right: C ? 0 : U
   };
 }
 function Wt(a, t, i) {
@@ -66,14 +66,14 @@ function It(a, t) {
   return [i, s];
 }
 function Lt(a, t, i, s) {
-  const e = i.find((f) => f.type === "dots"), o = i.find((f) => f.type === "curve");
+  const e = i.find((g) => g.type === "dots"), o = i.find((g) => g.type === "curve");
   return {
-    dotShape: Y(a, t, (e == null ? void 0 : e.aes.dotShape) ?? A.shape, "dotShape"),
-    dotColor: Y(a, t, (e == null ? void 0 : e.aes.dotFill) ?? A.color, "dotFill"),
-    dotSize: Y(a, t, (e == null ? void 0 : e.aes.dotSize) ?? A.size, "dotSize"),
-    lineShape: Y(a, t, (o == null ? void 0 : o.aes.lineShape) ?? "solid", "lineShape"),
-    lineColor: Y(a, t, (o == null ? void 0 : o.aes.lineColor) ?? et, "lineColor"),
-    trendColor: Y(a, t, (s == null ? void 0 : s.color) ?? A.color, "fillColor")
+    dotShape: D(a, t, (e == null ? void 0 : e.aes.dotShape) ?? Y.shape, "dotShape"),
+    dotColor: D(a, t, (e == null ? void 0 : e.aes.dotFill) ?? Y.color, "dotFill"),
+    dotSize: D(a, t, (e == null ? void 0 : e.aes.dotSize) ?? Y.size, "dotSize"),
+    lineShape: D(a, t, (o == null ? void 0 : o.aes.lineShape) ?? "solid", "lineShape"),
+    lineColor: D(a, t, (o == null ? void 0 : o.aes.lineColor) ?? et, "lineColor"),
+    trendColor: D(a, t, (s == null ? void 0 : s.color) ?? Y.color, "fillColor")
   };
 }
 const Rt = Math.cos(Math.PI / 4), _t = 5;
@@ -82,18 +82,18 @@ function it(a, t) {
 }
 class ci {
   constructor() {
-    S(this, "reactRoot", null);
-    S(this, "parentNode", null);
-    S(this, "rootNode", null);
-    S(this, "component", /* @__PURE__ */ v.jsx(v.Fragment, {}));
-    S(this, "margins", {
-      top: D,
-      bottom: D,
-      left: D,
-      right: D
+    M(this, "reactRoot", null);
+    M(this, "parentNode", null);
+    M(this, "rootNode", null);
+    M(this, "component", /* @__PURE__ */ F.jsx(F.Fragment, {}));
+    M(this, "margins", {
+      top: H,
+      bottom: H,
+      left: H,
+      right: H
     });
-    S(this, "chartsDimensions", {});
-    S(this, "chartSizes", {
+    M(this, "chartsDimensions", {});
+    M(this, "chartSizes", {
       chartWidth: G,
       // width of single chart
       chartHeight: X,
@@ -107,13 +107,13 @@ class ci {
       totalHeight: X
       // width of all charts in charts height, plus bottom axis, plus top title
     });
-    S(this, "columnsCount", 1);
-    S(this, "rowsCount", 1);
-    S(this, "scales", {
+    M(this, "columnsCount", 1);
+    M(this, "rowsCount", 1);
+    M(this, "scales", {
       x: { null: B().domain([0, 1]).range([0, G]) },
       y: { null: B().domain([0, 1]).range([X, 0]) }
     });
-    S(this, "captionsSizes", {
+    M(this, "captionsSizes", {
       xAxisCaptionsWidth: 30,
       yAxisCaptionsWidth: 100,
       bottomAxisCaptionsWidthByRows: [],
@@ -121,13 +121,13 @@ class ci {
       bottomCaptionsTail: 0,
       leftCaptionsTail: 0
     });
-    S(this, "facetTitles", {});
+    M(this, "facetTitles", {});
     // can be multiline
-    S(this, "mainTitle", []);
+    M(this, "mainTitle", []);
     // can be multiline
-    S(this, "discreteAxesLabels", { x: {}, y: {} });
+    M(this, "discreteAxesLabels", { x: {}, y: {} });
     // only for discrete axes, by facets, can be multiline
-    S(this, "legend", { width: 0, height: 0, items: [] });
+    M(this, "legend", { width: 0, height: 0, items: [] });
   }
   clear() {
     var t;
@@ -143,30 +143,30 @@ class ci {
     this.chartSizes.chartWidth = t.width, this.chartSizes.chartHeight = t.height;
   }
   updateChartDimensions(t, i, s, e) {
-    const { chartWidth: o, chartHeight: f } = this.chartSizes;
-    let T = 0, x = 0;
-    const d = Wt(t, this.rowsCount, this.columnsCount);
+    const { chartWidth: o, chartHeight: g } = this.chartSizes;
+    let f = 0, C = 0;
+    const c = Wt(t, this.rowsCount, this.columnsCount);
     this.chartsDimensions = t.reduce((h, n, r) => {
-      const [g, E] = It(r, this.columnsCount), l = zt(r, t.length, this.columnsCount, this.rowsCount), m = wt(
+      const [T, x] = It(r, this.columnsCount), m = zt(r, t.length, this.columnsCount, this.rowsCount), p = wt(
         s,
         e,
         this.captionsSizes,
-        d[g],
+        c[T],
         this.facetTitles,
-        l,
-        g,
-        E,
-        E === this.columnsCount - 1,
+        m,
+        T,
+        x,
+        x === this.columnsCount - 1,
         i
-      ), C = o + m.left + m.right, M = f + m.top + m.bottom;
+      ), E = o + p.left + p.right, S = g + p.top + p.bottom;
       return h[n] = {
-        left: T,
-        top: x,
-        chartEdgeSides: l,
-        padding: m,
-        inner: { width: o, height: f },
-        outer: { width: C, height: M }
-      }, T += C, E === this.columnsCount - 1 && (T = 0, x += M), h;
+        left: f,
+        top: C,
+        chartEdgeSides: m,
+        padding: p,
+        inner: { width: o, height: g },
+        outer: { width: E, height: S }
+      }, f += E, x === this.columnsCount - 1 && (f = 0, C += S), h;
     }, {});
     const I = Math.max(
       ...t.map((h) => this.chartsDimensions[h].outer.width + this.chartsDimensions[h].left)
@@ -175,74 +175,74 @@ class ci {
     );
     this.chartSizes.chartsWidth = I, this.chartSizes.chartsHeight = w;
   }
-  updateViewport(t, i, s, e, o, f, T, x) {
-    const d = t.length, I = Math.min(i.nRows ?? d, d), w = Math.min(i.nCols ?? d, d);
-    this.columnsCount = i.nRows ? Math.ceil(d / I) : w, this.rowsCount = Math.ceil(d / this.columnsCount);
-    let [h, n] = [1 / 0, -1 / 0], [r, g] = [1 / 0, -1 / 0];
-    const E = t.reduce((p, c) => {
-      const W = T[c], { minX: u, minY: b, maxX: N, maxY: z } = W;
-      return h = Math.min(h, u), r = Math.min(r, b), n = Math.max(n, N), g = Math.max(g, z), p[c] = { minX: u, maxX: N, minY: b, maxY: z }, p;
-    }, {}), l = {}, m = {};
-    let C = !1, M = !1;
-    t.forEach((p) => {
-      let c;
-      if (!$(s))
-        c = y().range([0, this.chartSizes.chartWidth]).domain(o.keys ?? []).padding(0.5);
+  updateViewport(t, i, s, e, o, g, f, C) {
+    const c = t.length, I = Math.min(i.nRows ?? c, c), w = Math.min(i.nCols ?? c, c);
+    this.columnsCount = i.nRows ? Math.ceil(c / I) : w, this.rowsCount = Math.ceil(c / this.columnsCount);
+    let [h, n] = [1 / 0, -1 / 0], [r, T] = [1 / 0, -1 / 0];
+    const x = t.reduce((u, l) => {
+      const W = f[l], { minX: d, minY: N, maxX: b, maxY: z } = W;
+      return h = Math.min(h, d), r = Math.min(r, N), n = Math.max(n, b), T = Math.max(T, z), u[l] = { minX: d, maxX: b, minY: N, maxY: z }, u;
+    }, {}), m = {}, p = {};
+    let E = !1, S = !1;
+    t.forEach((u) => {
+      let l;
+      if (!q(s))
+        l = y().range([0, this.chartSizes.chartWidth]).domain(o.keys ?? []).padding(0.5);
       else {
-        c = s.scale === "log" ? K() : B();
-        const u = E[p];
-        let b = s.lowerValue ? Number(s.lowerValue) : i.sharedX ? h : u.minX, N = s.upperValue ? Number(s.upperValue) : i.sharedX ? n : u.maxX;
+        l = s.scale === "log" ? K() : B();
+        const d = x[u];
+        let N = s.lowerValue ? Number(s.lowerValue) : i.sharedX ? h : d.minX, b = s.upperValue ? Number(s.upperValue) : i.sharedX ? n : d.maxX;
         if (typeof s.symmetricRange < "u") {
           const R = s.symmetricRange;
-          if (R >= b && R <= N) {
-            const _ = Math.max(R - b, N - R);
-            b = R - _, N = R + _;
+          if (R >= N && R <= b) {
+            const _ = Math.max(R - N, b - R);
+            N = R - _, b = R + _;
           }
         }
-        const z = [0, this.chartSizes.chartWidth], L = c.copy().domain([b, N]).range([P.LEFT, this.chartSizes.chartWidth - P.RIGHT]);
-        c.domain([L.invert(0), L.invert(this.chartSizes.chartWidth)]).range(z).nice();
+        const z = [0, this.chartSizes.chartWidth], L = l.copy().domain([N, b]).range([P.LEFT, this.chartSizes.chartWidth - P.RIGHT]);
+        l.domain([L.invert(0), L.invert(this.chartSizes.chartWidth)]).range(z).nice();
       }
-      const W = this.scales.x[p];
-      l[p] = c, C = C || tt(W, c);
+      const W = this.scales.x[u];
+      m[u] = l, E = E || tt(W, l);
     });
-    const H = t.reduce((p, c) => {
-      const W = x ? x[c] : [];
-      return p[c] = W.reduce(
-        (u, b) => {
-          const N = b.bounded ? b.xBounds : this.scales.x[c].domain(), z = b.getInterval(N[0]), L = b.getInterval(N[1]);
-          return u.minY = Math.min(u.minY, isNaN(z.left) ? u.minY : z.left, isNaN(L.left) ? u.minY : L.left), u.maxY = Math.max(u.maxY, isNaN(z.right) ? u.maxY : z.right, isNaN(L.right) ? u.maxY : L.right), u;
+    const A = t.reduce((u, l) => {
+      const W = C ? C[l] : [];
+      return u[l] = W.reduce(
+        (d, N) => {
+          const b = N.bounded ? N.xBounds : this.scales.x[l].domain(), z = N.getInterval(b[0]), L = N.getInterval(b[1]);
+          return d.minY = Math.min(d.minY, isNaN(z.left) ? d.minY : z.left, isNaN(L.left) ? d.minY : L.left), d.maxY = Math.max(d.maxY, isNaN(z.right) ? d.maxY : z.right, isNaN(L.right) ? d.maxY : L.right), d;
         },
         { minY: 1 / 0, maxY: -1 / 0 }
-      ), r = Math.min(r, p[c].minY), g = Math.max(g, p[c].maxY), p;
+      ), r = Math.min(r, u[l].minY), T = Math.max(T, u[l].maxY), u;
     }, {});
-    t.forEach((p) => {
-      let c;
-      if (!$(e))
-        c = y().range([this.chartSizes.chartHeight, 0]).domain(f.keys ?? []).padding(0.5);
+    t.forEach((u) => {
+      let l;
+      if (!q(e))
+        l = y().range([this.chartSizes.chartHeight, 0]).domain(g.keys ?? []).padding(0.5);
       else {
-        c = e.scale === "log" ? K() : B();
-        const u = E[p], b = H[p];
-        let N = e.lowerValue ? Number(e.lowerValue) : i.sharedY ? r : Math.min(u.minY, b.minY), z = e.upperValue ? Number(e.upperValue) : i.sharedY ? g : Math.max(u.maxY, b.maxY);
+        l = e.scale === "log" ? K() : B();
+        const d = x[u], N = A[u];
+        let b = e.lowerValue ? Number(e.lowerValue) : i.sharedY ? r : Math.min(d.minY, N.minY), z = e.upperValue ? Number(e.upperValue) : i.sharedY ? T : Math.max(d.maxY, N.maxY);
         if (typeof e.symmetricRange < "u") {
           const _ = e.symmetricRange;
-          if (_ >= N && _ <= z) {
-            const j = Math.max(_ - N, z - _);
-            N = _ - j, z = _ + j;
+          if (_ >= b && _ <= z) {
+            const j = Math.max(_ - b, z - _);
+            b = _ - j, z = _ + j;
           }
         }
-        const L = [this.chartSizes.chartHeight, 0], R = c.copy().domain([N, z]).range([this.chartSizes.chartHeight - P.BOTTOM, P.TOP]);
-        c.domain([R.invert(this.chartSizes.chartHeight), R.invert(0)]).range(L).nice();
+        const L = [this.chartSizes.chartHeight, 0], R = l.copy().domain([b, z]).range([this.chartSizes.chartHeight - P.BOTTOM, P.TOP]);
+        l.domain([R.invert(this.chartSizes.chartHeight), R.invert(0)]).range(L).nice();
       }
-      const W = this.scales.y[p];
-      m[p] = c, M = M || tt(W, c);
-    }), C && (this.scales.x = l), M && (this.scales.y = m);
+      const W = this.scales.y[u];
+      p[u] = l, S = S || tt(W, l);
+    }), E && (this.scales.x = m), S && (this.scales.y = p);
   }
   updateCaptionsSize(t, i, s, e) {
-    const o = new Tt("600 14px Manrope");
-    function f(n) {
+    const o = new Ct("600 14px Manrope");
+    function g(n) {
       return Math.max(...n.map((r) => o.getTextWidth(r)));
     }
-    let T = 0, x = 0, d = [], I = [], w = 0, h = 0;
+    let f = 0, C = 0, c = [], I = [], w = 0, h = 0;
     if (i.scale === "discrete") {
       const n = k(
         t,
@@ -253,7 +253,7 @@ class ci {
         "vertical",
         this.scales.x
       );
-      T = n.xTail, d = n.axisCaptionsWidthByRows;
+      f = n.xTail, c = n.axisCaptionsWidthByRows;
     } else
       w = 20;
     if (s.scale === "discrete") {
@@ -266,19 +266,19 @@ class ci {
         "horizontal",
         this.scales.y
       );
-      x = n.yTail, I = n.axisCaptionsWidthByColumns;
+      C = n.yTail, I = n.axisCaptionsWidthByColumns;
     } else
       Object.values(this.scales.y).forEach((n) => {
-        const { ticks: r, format: g } = xt(n, e);
-        h = Math.max(h, f(r.map(g)));
+        const { ticks: r, format: T } = St(n, e);
+        h = Math.max(h, g(r.map(T)));
       });
     this.captionsSizes = {
       xAxisCaptionsWidth: i.hiddenLabels ? 0 : it(w, i),
       yAxisCaptionsWidth: s.hiddenLabels ? 0 : it(h, s),
-      bottomAxisCaptionsWidthByRows: d,
+      bottomAxisCaptionsWidthByRows: c,
       leftAxisCaptionsWidthByColumns: I,
-      bottomCaptionsTail: T,
-      leftCaptionsTail: x
+      bottomCaptionsTail: f,
+      leftCaptionsTail: C
     };
   }
   createMainTitle(t, i) {
@@ -315,10 +315,10 @@ class ci {
   updateMargins(t) {
     const i = rt * this.mainTitle.length, s = i > 0 ? i + dt * 2 : 0, e = this.chartsDimensions[t[0]], o = this.chartsDimensions[t[t.length - 1]];
     this.margins = {
-      top: Math.max(s, D),
-      bottom: Math.max(D, this.captionsSizes.leftCaptionsTail - o.padding.bottom),
-      left: Math.max(D, this.captionsSizes.bottomCaptionsTail - e.padding.left),
-      right: this.legend.width + D
+      top: Math.max(s, H),
+      bottom: Math.max(H, this.captionsSizes.leftCaptionsTail - o.padding.bottom),
+      left: Math.max(H, this.captionsSizes.bottomCaptionsTail - e.padding.left),
+      right: this.legend.width + H
     }, this.chartSizes.totalWidth = this.margins.left + this.chartSizes.chartsWidth + this.margins.right, this.chartSizes.totalHeight = this.margins.top + Math.max(this.chartSizes.chartsHeight, this.legend.height) + this.margins.bottom;
   }
   updateLegendSize(t, i, s, e) {
@@ -326,10 +326,10 @@ class ci {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const o = [], f = { width: 0, height: 0, left: 0, top: 0 }, T = Math.min(
+    const o = [], g = { width: 0, height: 0, left: 0, top: 0 }, f = Math.min(
       Math.max(this.chartSizes.chartHeight, lt),
       ct
-    ), x = Math.max(this.chartSizes.chartHeight, T);
+    ), C = Math.max(this.chartSizes.chartHeight, f);
     if (s.forEach((h) => {
       const n = i[h.value];
       if (n.usedAes.length === 0 || !n.aesMap)
@@ -339,39 +339,36 @@ class ci {
         return;
       }
       const r = {};
-      n.values.forEach((l) => {
-        r[l] || (r[l] = { ...A }), n.usedAes.forEach((m) => {
-          (m === "dotFill" || m === "lineColor") && (r[l].color = n.aesMap(l, m) ?? et), m === "dotShape" && (r[l].shape = n.aesMap(l, m) ?? "21"), m === "dotSize" && (r[l].size = n.aesMap(l, m) ?? 3);
+      n.values.forEach((m) => {
+        r[m] || (r[m] = { ...Y }), n.usedAes.forEach((p) => {
+          (p === "dotFill" || p === "lineColor") && (r[m].color = n.aesMap(m, p) ?? et), p === "dotShape" && (r[m].shape = n.aesMap(m, p) ?? "21"), p === "dotSize" && (r[m].size = n.aesMap(m, p) ?? 3);
         });
       });
-      const g = h.label ?? h.value, E = St().domain(n.values).range(n.values.map((l) => r[l])).unknown(A);
-      o.push({ ...f, id: h.value, type: "dots", title: g, scale: E, values: n.values, labels: n.labels });
+      const T = h.label ?? h.value, x = Nt().domain(n.values).range(n.values.map((m) => r[m])).unknown(Y);
+      o.push({ ...g, id: h.value, type: "dots", title: T, scale: x, values: n.values, labels: n.labels });
     }), e.forEach((h) => {
-      if (h.type === "dots" && q(h.aes.dotFill)) {
-        const { domain: n, range: r, columnName: g, type: E = "linear" } = h.aes.dotFill, l = g.label ?? g.value, m = gt(r, n, "linear"), C = (E === "log" ? bt() : B()).domain(n).range([T, 0]), M = ft(C, n);
-        o.push({ ...f, id: "dotFill", type: "continuous", title: l, scale: m, tickPositionScale: C, values: M });
-      }
-      if (h.type === "dots" && q(h.aes.dotSize)) {
-        const { columnName: n, domain: r, range: g } = h.aes.dotSize, E = n.label ?? n.value, l = Nt(r, g), m = l.ticks(3), C = l.tickFormat(3), M = m.reduce((H, p) => (H[String(p)] = C(p), H), {});
-        o.push({ ...f, id: n.value, type: "size", title: E, scale: l, values: m, labels: M });
+      if (h.type === "dots" && Q(h.aes.dotFill)) {
+        const { domain: n, range: r, columnName: T, type: x = "linear" } = h.aes.dotFill, m = T.label ?? T.value, p = ft(r, n, "linear"), E = (x === "log" ? bt() : B()).domain(n).range([f, 0]), S = Tt(E, n);
+        o.push({ ...g, id: "dotFill", type: "continuous", title: m, scale: p, tickPositionScale: E, values: S });
       }
+      h.type === "dots" && Q(h.aes.dotSize) && o.push(gt(h.aes.dotSize));
     }), !o.length) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const d = ut(o, x, T), w = d.reduce((h, n) => Math.max(h, n.left + n.width), 0) + Et;
+    const c = ut(o, C, f), w = c.reduce((h, n) => Math.max(h, n.left + n.width), 0) + Mt;
     this.legend = {
       width: w,
-      height: x,
-      items: d
+      height: C,
+      items: c
     };
   }
-  render(t, i, s, e, o, f, T, x, d, I, w, h, n, r, g, E, l, m) {
-    var u;
-    const { xAxis: C, yAxis: M, size: H, title: p, legend: c } = s;
-    this.updateChartSizes(H), this.updateViewport(o, e, C, M, E, l, T, x), this.createAxisLabels(o, C, M, E, l), this.updateCaptionsSize(o, C, M, I.y), this.createFacetTitles(o, f), this.updateChartDimensions(o, e, C, M), this.updateLegendSize(c, w, n, r), this.createMainTitle(o, p), this.updateMargins(o);
-    const W = /* @__PURE__ */ v.jsx(ht, { dataFrame: t, children: /* @__PURE__ */ v.jsx(
-      Ct,
+  render(t, i, s, e, o, g, f, C, c, I, w, h, n, r, T, x, m, p) {
+    var d;
+    const { xAxis: E, yAxis: S, size: A, title: u, legend: l } = s;
+    this.updateChartSizes(A), this.updateViewport(o, e, E, S, x, m, f, C), this.createAxisLabels(o, E, S, x, m), this.updateCaptionsSize(o, E, S, I.y), this.createFacetTitles(o, g), this.updateChartDimensions(o, e, E, S), this.updateLegendSize(l, w, n, r), this.createMainTitle(o, u), this.updateMargins(o);
+    const W = /* @__PURE__ */ F.jsx(ht, { dataFrame: t, children: /* @__PURE__ */ F.jsx(
+      Et,
       {
         settingsId: i,
         chartSettings: s,
@@ -380,27 +377,27 @@ class ci {
         chartSizes: this.chartSizes,
         chartsDimensions: this.chartsDimensions,
         scales: this.scales,
-        groupedDots: T,
-        trendsData: x,
+        groupedDots: f,
+        trendsData: C,
         legendData: this.legend,
         columnsCount: this.columnsCount,
         margins: this.margins,
-        keyColumn: d,
+        keyColumn: c,
         mainTitle: this.mainTitle,
         facetTitles: this.facetTitles,
         captionsSizes: this.captionsSizes,
         onlyPositive: I,
         layersData: h,
-        aesGetters: Lt(t, w, r, g),
-        onTooltipHintSwitch: m,
+        aesGetters: Lt(t, w, r, T),
+        onTooltipHintSwitch: p,
         discreteAxesLabels: this.discreteAxesLabels
       }
     ) });
-    this.component = W, (u = this.reactRoot) == null || u.render(W);
+    this.component = W, (d = this.reactRoot) == null || d.render(W);
   }
   renderError(t) {
     var i;
-    (i = this.reactRoot) == null || i.render(/* @__PURE__ */ v.jsx(at, { message: t }));
+    (i = this.reactRoot) == null || i.render(/* @__PURE__ */ F.jsx(at, { message: t }));
   }
 }
 export {