@milaboratories/graph-maker 1.1.136 → 1.1.138

package/dist/node_modules/@milaboratories/miplots4/dist/scatterplot/ChartRenderer.js

@@ -1,91 +1,91 @@
-import { j as F } from "../node_modules/react/jsx-runtime.js";
-import { Error as k } from "../common/Error.js";
-import { DEFAULT_HEIGHT as _, DEFAULT_WIDTH as b, TITLE_LINE_HEIGHT as P, MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as j, BLACK as G, TITLE_MARGIN as U } from "../constants.js";
-import { FACET_TITLE_LINE as B } from "../discrete/constants.js";
-import { splitTextByWidth as L } from "../discrete/utils/splitTextByWidth.js";
-import { PADDINGS as W, MIN_MARGIN as y, DEFAULT_DOT_AES as A, LEGEND_OFFSET as K, TICK_OFFSET as Y, DEFAULT_TICKS_SIZE as R, MIN_PADDING as I, FACET_TITLE_OFFSET as q, FACET_AXIS_OFFSET as $, TITLE_LINE as O } from "./constants.js";
-import { createAesGetter as w } from "./utils/createAesGetter.js";
-import { getTicksAndFormat as Q } from "./utils/getTicksAndFormat.js";
-import { isContinuousAes as V } from "../types/common.js";
+import { j as L } from "../node_modules/react/jsx-runtime.js";
+import { Error as K } from "../common/Error.js";
+import { DEFAULT_HEIGHT as $, DEFAULT_WIDTH as R, TITLE_LINE_HEIGHT as q, MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as J, BLACK as B, TITLE_MARGIN as Q } from "../constants.js";
+import { FACET_TITLE_LINE as Z } from "../discrete/constants.js";
+import { splitTextByWidth as O } from "../discrete/utils/splitTextByWidth.js";
+import { PADDINGS as X, MIN_MARGIN as D, DEFAULT_DOT_AES as _, LEGEND_OFFSET as tt, TICK_OFFSET as G, DEFAULT_TICKS_SIZE as V, MIN_PADDING as H, FACET_TITLE_OFFSET as et, FACET_AXIS_OFFSET as k, TITLE_LINE as P } from "./constants.js";
+import { createAesGetter as Y } from "./utils/createAesGetter.js";
+import { getTicksAndFormat as it } from "./utils/getTicksAndFormat.js";
+import { isContinuousAes as j } from "../types/common.js";
 import "../types/discrete.js";
 import "../types/scatterplot.js";
 import "../types/heatmap.js";
 import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
-import { getContinuousColorScale as Z } from "../utils/getContinuousColorScale.js";
-import { getContinuousLegendTicks as J } from "../utils/getContinuousLegendTicks.js";
-import { TextMeasurer as tt } from "../utils/TextMeasurer.js";
-import { createRoot as et } from "../node_modules/react-dom/client.js";
-import { ChartsGroup as it } from "./components/ChartsGroup.js";
-import { arrangeLegendParts as st } from "../utils/arrangeLegendParts.js";
-import D from "../node_modules/d3-scale/src/linear.js";
-import X from "../node_modules/d3-scale/src/log.js";
-import at from "../node_modules/d3-scale/src/ordinal.js";
-import ot from "../node_modules/d3-scale/src/symlog.js";
-import { sqrt as ht } from "../node_modules/d3-scale/src/pow.js";
-var rt = Object.defineProperty, nt = (l, t, e) => t in l ? rt(l, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : l[t] = e, C = (l, t, e) => nt(l, typeof t != "symbol" ? t + "" : t, e);
-function lt(l, t, e, i) {
+import { getContinuousColorScale as st } from "../utils/getContinuousColorScale.js";
+import { getContinuousLegendTicks as at } from "../utils/getContinuousLegendTicks.js";
+import { TextMeasurer as ot } from "../utils/TextMeasurer.js";
+import { createRoot as nt } from "../node_modules/react-dom/client.js";
+import { ChartsGroup as rt } from "./components/ChartsGroup.js";
+import { arrangeLegendParts as ht } from "../utils/arrangeLegendParts.js";
+import W from "../node_modules/d3-scale/src/linear.js";
+import U from "../node_modules/d3-scale/src/log.js";
+import lt from "../node_modules/d3-scale/src/ordinal.js";
+import ct from "../node_modules/d3-scale/src/symlog.js";
+import { sqrt as mt } from "../node_modules/d3-scale/src/pow.js";
+var dt = Object.defineProperty, ut = (r, t, e) => t in r ? dt(r, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : r[t] = e, v = (r, t, e) => ut(r, typeof t != "symbol" ? t + "" : t, e);
+function pt(r, t, e, i) {
   const s = [];
-  return l % e === e - 1 && s.push("right"), l % e === 0 && s.push("left"), l < e && s.push("top"), (Math.ceil((l + 1) / e) === i || Math.ceil((l + 1) / e) === i - 1 && l % e > (t - 1) % e) && s.push("bottom"), s;
+  return r % e === e - 1 && s.push("right"), r % e === 0 && s.push("left"), r < e && s.push("top"), (Math.ceil((r + 1) / e) === i || Math.ceil((r + 1) / e) === i - 1 && r % e > (t - 1) % e) && s.push("bottom"), s;
 }
-function ct(l, t, e, i, s, n, p) {
-  const g = n.includes("left") || !(p != null && p.sharedY), v = n.includes("left") && t.title !== "", M = n.includes("bottom") || !(p != null && p.sharedX), z = n.includes("bottom") && l.title !== "", c = e.yAxisCaptionsWidth + 2 * Y, r = (t.showTicks ? R : 0) + Y, u = v ? O + I : 0, S = e.xAxisCaptionsWidth + 2 * Y, E = l.showTicks ? R : 0, o = z ? O + I : 0, a = c + r + u + $, d = S + E + o + $, h = Math.max(...i.map((m) => s[m].length));
+function gt(r, t, e, i, s, o, u) {
+  const p = o.includes("left") || !(u != null && u.sharedY), y = o.includes("left") && t.title !== "", F = o.includes("bottom") || !(u != null && u.sharedX), N = o.includes("bottom") && r.title !== "", h = e.yAxisCaptionsWidth + 2 * G, a = (t.showTicks ? V : 0) + G, d = y ? P + H : 0, T = e.xAxisCaptionsWidth + 2 * G, z = r.showTicks ? V : 0, l = N ? P + H : 0, c = h + a + d + k, f = T + z + l + k, x = Math.max(...i.map((m) => s[m].length));
   return {
-    left: g ? a : I,
-    top: h === 0 ? 0 : q * 2 + h * B,
-    bottom: M ? d + 8 : I,
-    right: I
+    left: p ? c : H,
+    top: x === 0 ? 0 : et * 2 + x * Z,
+    bottom: F ? f + 8 : H,
+    right: H
   };
 }
-function mt(l, t, e) {
+function ft(r, t, e) {
   const i = [];
   for (let s = 0; s < t; s++)
-    i.push(l.slice(s * e, s * e + e));
+    i.push(r.slice(s * e, s * e + e));
   return i;
 }
-function dt(l, t) {
-  const e = Math.floor(l / t), i = l - e * t;
+function St(r, t) {
+  const e = Math.floor(r / t), i = r - e * t;
   return [e, i];
 }
-function ut(l, t, e) {
-  const i = t.find((n) => n.type === "dots"), s = t.find((n) => n.type === "curve");
+function xt(r, t, e) {
+  const i = t.find((o) => o.type === "dots"), s = t.find((o) => o.type === "curve");
   return {
-    dotShape: w(l, (i == null ? void 0 : i.aes.dotShape) ?? A.shape, "dotShape"),
-    dotColor: w(l, (i == null ? void 0 : i.aes.dotFill) ?? A.color, "dotFill"),
-    dotSize: w(l, (i == null ? void 0 : i.aes.dotSize) ?? A.size, "dotSize"),
-    lineShape: w(l, (s == null ? void 0 : s.aes.lineShape) ?? "solid", "lineShape"),
-    lineColor: w(l, (s == null ? void 0 : s.aes.lineColor) ?? G, "lineColor"),
-    trendColor: w(l, (e == null ? void 0 : e.color) ?? A.color, "fillColor")
+    dotShape: Y(r, (i == null ? void 0 : i.aes.dotShape) ?? _.shape, "dotShape"),
+    dotColor: Y(r, (i == null ? void 0 : i.aes.dotFill) ?? _.color, "dotFill"),
+    dotSize: Y(r, (i == null ? void 0 : i.aes.dotSize) ?? _.size, "dotSize"),
+    lineShape: Y(r, (s == null ? void 0 : s.aes.lineShape) ?? "solid", "lineShape"),
+    lineColor: Y(r, (s == null ? void 0 : s.aes.lineColor) ?? B, "lineColor"),
+    trendColor: Y(r, (e == null ? void 0 : e.color) ?? _.color, "fillColor")
   };
 }
-class Ot {
+class Pt {
   constructor() {
-    C(this, "reactRoot", null), C(this, "parentNode", null), C(this, "rootNode", null), C(this, "component", /* @__PURE__ */ F.jsx(F.Fragment, {})), C(this, "margins", {
-      top: y,
-      bottom: y,
-      left: y,
-      right: y
-    }), C(this, "chartsDimensions", {}), C(this, "chartSizes", {
-      chartWidth: b,
+    v(this, "reactRoot", null), v(this, "parentNode", null), v(this, "rootNode", null), v(this, "component", /* @__PURE__ */ L.jsx(L.Fragment, {})), v(this, "margins", {
+      top: D,
+      bottom: D,
+      left: D,
+      right: D
+    }), v(this, "chartsDimensions", {}), v(this, "chartSizes", {
+      chartWidth: R,
       // width of single chart
-      chartHeight: _,
+      chartHeight: $,
       // height of single chart
-      chartsWidth: b,
+      chartsWidth: R,
       // width of all charts in charts row
-      chartsHeight: _,
+      chartsHeight: $,
       // width of all charts in charts column, without axes
-      totalWidth: b,
+      totalWidth: R,
       // width of all charts in charts row, plus left axis, plus legend
-      totalHeight: _
+      totalHeight: $
       // width of all charts in charts height, plus bottom axis, plus top title
-    }), C(this, "columnsCount", 1), C(this, "rowsCount", 1), C(this, "scales", {
-      x: { null: D().domain([0, 10]).range([0, b]) },
-      y: { null: D().domain([0, 10]).range([_, 0]) }
-    }), C(this, "captionsSizes", {
+    }), v(this, "columnsCount", 1), v(this, "rowsCount", 1), v(this, "scales", {
+      x: { null: W().domain([0, 10]).range([0, R]) },
+      y: { null: W().domain([0, 10]).range([$, 0]) }
+    }), v(this, "captionsSizes", {
       xAxisCaptionsWidth: 30,
       yAxisCaptionsWidth: 100
-    }), C(this, "facetTitles", {}), C(this, "mainTitle", []), C(this, "legend", { width: 0, height: 0, items: [] });
+    }), v(this, "facetTitles", {}), v(this, "mainTitle", []), v(this, "legend", { width: 0, height: 0, items: [] });
   }
   clear() {
     var t;
@@ -95,94 +95,107 @@ class Ot {
     });
   }
   init(t) {
-    this.parentNode === null && (this.parentNode = t, this.rootNode = document.createElement("div"), this.parentNode.appendChild(this.rootNode), this.reactRoot = et(this.rootNode));
+    this.parentNode === null && (this.parentNode = t, this.rootNode = document.createElement("div"), this.parentNode.appendChild(this.rootNode), this.reactRoot = nt(this.rootNode));
   }
   updateChartSizes(t) {
     this.chartSizes.chartWidth = t.width, this.chartSizes.chartHeight = t.height;
   }
   updateChartDimensions(t, e, i, s) {
-    const { chartWidth: n, chartHeight: p } = this.chartSizes;
-    let g = 0, v = 0;
-    this.chartsDimensions = t.reduce((c, r, u) => {
-      const [S, E] = dt(u, this.columnsCount), o = lt(u, t.length, this.columnsCount, this.rowsCount), a = ct(
+    const { chartWidth: o, chartHeight: u } = this.chartSizes;
+    let p = 0, y = 0;
+    this.chartsDimensions = t.reduce((h, a, d) => {
+      const [T, z] = St(d, this.columnsCount), l = pt(d, t.length, this.columnsCount, this.rowsCount), c = gt(
         i,
         s,
         this.captionsSizes,
-        mt(t, this.rowsCount, this.columnsCount)[S],
+        ft(t, this.rowsCount, this.columnsCount)[T],
         this.facetTitles,
-        o,
+        l,
         e
-      ), d = n + a.left + a.right, h = p + a.top + a.bottom;
-      return c[r] = {
-        left: g,
-        top: v,
-        chartEdgeSides: o,
-        padding: a,
-        inner: { width: n, height: p },
-        outer: { width: d, height: h }
-      }, g += d, E === this.columnsCount - 1 && (g = 0, v += h), c;
+      ), f = o + c.left + c.right, x = u + c.top + c.bottom;
+      return h[a] = {
+        left: p,
+        top: y,
+        chartEdgeSides: l,
+        padding: c,
+        inner: { width: o, height: u },
+        outer: { width: f, height: x }
+      }, p += f, z === this.columnsCount - 1 && (p = 0, y += x), h;
     }, {});
-    const M = Math.max(
-      ...t.map((c) => this.chartsDimensions[c].outer.width + this.chartsDimensions[c].left)
-    ), z = Math.max(
-      ...t.map((c) => this.chartsDimensions[c].outer.height + this.chartsDimensions[c].top)
+    const F = Math.max(
+      ...t.map((h) => this.chartsDimensions[h].outer.width + this.chartsDimensions[h].left)
+    ), N = Math.max(
+      ...t.map((h) => this.chartsDimensions[h].outer.height + this.chartsDimensions[h].top)
     );
-    this.chartSizes.chartsWidth = M, this.chartSizes.chartsHeight = z;
+    this.chartSizes.chartsWidth = F, this.chartSizes.chartsHeight = N;
   }
-  updateViewport(t, e, i, s, n, p) {
-    const g = t.length, v = Math.min(e.nRows ?? g, g), M = Math.min(e.nCols ?? g, g);
-    this.columnsCount = e.nRows ? Math.ceil(g / v) : M, this.rowsCount = Math.ceil(g / this.columnsCount);
-    let [z, c] = [1 / 0, -1 / 0], [r, u] = [1 / 0, -1 / 0];
-    const S = t.reduce((o, a) => {
-      const d = n[a], { minX: h, minY: m, maxX: f, maxY: T } = d;
-      return z = Math.min(z, h), r = Math.min(r, m), c = Math.max(c, f), u = Math.max(u, T), o[a] = { minX: h, maxX: f, minY: m, maxY: T }, o;
-    }, {});
-    t.forEach((o) => {
-      const a = i.scale === "log" ? X() : D(), d = S[o];
-      let h = i.lowerValue ? Number(i.lowerValue) : e.sharedX ? z : d.minX, m = i.upperValue ? Number(i.upperValue) : e.sharedX ? c : d.maxX;
+  updateViewport(t, e, i, s, o, u) {
+    const p = t.length, y = Math.min(e.nRows ?? p, p), F = Math.min(e.nCols ?? p, p);
+    this.columnsCount = e.nRows ? Math.ceil(p / y) : F, this.rowsCount = Math.ceil(p / this.columnsCount);
+    let [N, h] = [1 / 0, -1 / 0], [a, d] = [1 / 0, -1 / 0];
+    const T = t.reduce((m, n) => {
+      const E = o[n], { minX: g, minY: S, maxX: A, maxY: w } = E;
+      return N = Math.min(N, g), a = Math.min(a, S), h = Math.max(h, A), d = Math.max(d, w), m[n] = { minX: g, maxX: A, minY: S, maxY: w }, m;
+    }, {}), z = {}, l = {};
+    let c = !1, f = !1;
+    t.forEach((m) => {
+      const n = i.scale === "log" ? U() : W(), E = T[m];
+      let g = i.lowerValue ? Number(i.lowerValue) : e.sharedX ? N : E.minX, S = i.upperValue ? Number(i.upperValue) : e.sharedX ? h : E.maxX;
       if (typeof i.symmetricRange < "u") {
-        const x = i.symmetricRange;
-        if (x >= h && x <= m) {
-          const N = Math.max(x - h, m - x);
-          h = x - N, m = x + N;
+        const M = i.symmetricRange;
+        if (M >= g && M <= S) {
+          const C = Math.max(M - g, S - M);
+          g = M - C, S = M + C;
         }
       }
-      const f = [0, this.chartSizes.chartWidth], T = a.copy().domain([h, m]).range([W.LEFT, this.chartSizes.chartWidth - W.RIGHT]);
-      a.domain([T.invert(0), T.invert(this.chartSizes.chartWidth)]).range(f).nice(), this.scales.x[o] = a;
+      const A = [0, this.chartSizes.chartWidth], w = n.copy().domain([g, S]).range([X.LEFT, this.chartSizes.chartWidth - X.RIGHT]);
+      n.domain([w.invert(0), w.invert(this.chartSizes.chartWidth)]).range(A).nice();
+      const I = this.scales.x[m];
+      if (I && !c) {
+        const M = I.domain(), C = I.domain();
+        (M[0] !== n.domain()[0] || M[1] !== n.domain()[1] || C[0] !== n.range()[0] || C[1] !== n.range()[1]) && (c = !0);
+      }
+      z[m] = n;
     });
-    const E = t.reduce((o, a) => {
-      const d = p ? p[a] : [];
-      return o[a] = d.reduce(
-        (h, m) => {
-          const f = m.bounded ? m.xBounds : this.scales.x[a].domain(), T = m.getInterval(f[0]), x = m.getInterval(f[1]);
-          return h.minY = Math.min(h.minY, isNaN(T.left) ? h.minY : T.left, isNaN(x.left) ? h.minY : x.left), h.maxY = Math.max(h.maxY, isNaN(T.right) ? h.maxY : T.right, isNaN(x.right) ? h.maxY : x.right), h;
+    const x = t.reduce((m, n) => {
+      const E = u ? u[n] : [];
+      return m[n] = E.reduce(
+        (g, S) => {
+          const A = S.bounded ? S.xBounds : this.scales.x[n].domain(), w = S.getInterval(A[0]), I = S.getInterval(A[1]);
+          return g.minY = Math.min(g.minY, isNaN(w.left) ? g.minY : w.left, isNaN(I.left) ? g.minY : I.left), g.maxY = Math.max(g.maxY, isNaN(w.right) ? g.maxY : w.right, isNaN(I.right) ? g.maxY : I.right), g;
         },
         { minY: 1 / 0, maxY: -1 / 0 }
-      ), r = Math.min(r, o[a].minY), u = Math.max(u, o[a].maxY), o;
+      ), a = Math.min(a, m[n].minY), d = Math.max(d, m[n].maxY), m;
     }, {});
-    t.forEach((o) => {
-      const a = s.scale === "log" ? X() : D(), d = S[o], h = E[o];
-      let m = s.lowerValue ? Number(s.lowerValue) : e.sharedY ? r : Math.min(d.minY, h.minY), f = s.upperValue ? Number(s.upperValue) : e.sharedY ? u : Math.max(d.maxY, h.maxY);
+    t.forEach((m) => {
+      const n = s.scale === "log" ? U() : W(), E = T[m], g = x[m];
+      let S = s.lowerValue ? Number(s.lowerValue) : e.sharedY ? a : Math.min(E.minY, g.minY), A = s.upperValue ? Number(s.upperValue) : e.sharedY ? d : Math.max(E.maxY, g.maxY);
       if (typeof s.symmetricRange < "u") {
-        const N = s.symmetricRange;
-        if (N >= m && N <= f) {
-          const H = Math.max(N - m, f - N);
-          m = N - H, f = N + H;
+        const C = s.symmetricRange;
+        if (C >= S && C <= A) {
+          const b = Math.max(C - S, A - C);
+          S = C - b, A = C + b;
         }
       }
-      const T = [this.chartSizes.chartHeight, 0], x = a.copy().domain([m, f]).range([this.chartSizes.chartHeight - W.BOTTOM, W.TOP]);
-      a.domain([x.invert(this.chartSizes.chartHeight), x.invert(0)]).range(T).nice(), this.scales.y[o] = a;
-    });
+      const w = [this.chartSizes.chartHeight, 0], I = n.copy().domain([S, A]).range([this.chartSizes.chartHeight - X.BOTTOM, X.TOP]);
+      n.domain([I.invert(this.chartSizes.chartHeight), I.invert(0)]).range(w).nice();
+      const M = this.scales.y[m];
+      if (M && !f) {
+        const C = M.domain(), b = M.domain();
+        (C[0] !== n.domain()[0] || C[1] !== n.domain()[1] || b[0] !== n.range()[0] || b[1] !== n.range()[1]) && (f = !0);
+      }
+      l[m] = n;
+    }), c && (this.scales.x = z), f && (this.scales.y = l);
   }
   updateCaptionsSize(t) {
-    const e = new tt("600 14px Arial");
+    const e = new ot("600 14px Arial");
     let i = 0;
-    function s(n) {
-      return Math.max(...n.map((p) => e.getTextWidth(p)));
+    function s(o) {
+      return Math.max(...o.map((u) => e.getTextWidth(u)));
     }
-    Object.values(this.scales.y).forEach((n) => {
-      const { ticks: p, format: g } = Q(n, t);
-      i = Math.max(i, s(p.map(g)));
+    Object.values(this.scales.y).forEach((o) => {
+      const { ticks: u, format: p } = it(o, t);
+      i = Math.max(i, s(u.map(p)));
     }), this.captionsSizes = {
       xAxisCaptionsWidth: 20,
       yAxisCaptionsWidth: i
@@ -190,22 +203,22 @@ class Ot {
   }
   createMainTitle(t, e) {
     const i = this.chartsDimensions[t[0]], s = this.chartsDimensions[t[t.length - 1]];
-    this.mainTitle = L(
+    this.mainTitle = O(
       e.name,
       this.chartSizes.chartsWidth - i.padding.left - s.padding.right,
       20
     );
   }
   createFacetTitles(t, e) {
-    this.facetTitles = t.reduce((i, s, n) => (e[n].length === 1 && e[n][0] === "null" ? i[s] = [] : i[s] = L(e[n].join(", "), this.chartSizes.chartWidth, 14), i), {});
+    this.facetTitles = t.reduce((i, s, o) => (e[o].length === 1 && e[o][0] === "null" ? i[s] = [] : i[s] = O(e[o].join(", "), this.chartSizes.chartWidth, 14), i), {});
   }
   updateMargins() {
-    const t = P * this.mainTitle.length, e = t > 0 ? t + U * 2 : 0;
+    const t = q * this.mainTitle.length, e = t > 0 ? t + Q * 2 : 0;
     this.margins = {
-      top: Math.max(e, y),
-      bottom: y,
-      left: y,
-      right: this.legend.width + y
+      top: Math.max(e, D),
+      bottom: D,
+      left: D,
+      right: this.legend.width + D
     }, 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, e, i, s) {
@@ -213,50 +226,50 @@ class Ot {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const n = [], p = { width: 0, height: 0, left: 0, top: 0 };
-    if (i.forEach((c) => {
-      const r = e[c.value];
-      if (r.usedAes.length === 0 || !r.aesMap)
+    const o = [], u = { width: 0, height: 0, left: 0, top: 0 };
+    if (i.forEach((h) => {
+      const a = e[h.value];
+      if (a.usedAes.length === 0 || !a.aesMap)
         return;
-      if (r.values.length > j) {
-        console.warn(`Too many values for discrete legend (${r.values.length})`);
+      if (a.values.length > J) {
+        console.warn(`Too many values for discrete legend (${a.values.length})`);
         return;
       }
-      const u = {};
-      r.values.forEach((o) => {
-        u[o] || (u[o] = { ...A }), r.usedAes.forEach((a) => {
-          var d, h, m;
-          (a === "dotFill" || a === "lineColor") && (u[o].color = ((d = r.aesMap[o]) == null ? void 0 : d[a]) ?? G), a === "dotShape" && (u[o].shape = ((h = r.aesMap[o]) == null ? void 0 : h[a]) ?? "21"), a === "dotSize" && (u[o].size = ((m = r.aesMap[o]) == null ? void 0 : m[a]) ?? 3);
+      const d = {};
+      a.values.forEach((l) => {
+        d[l] || (d[l] = { ..._ }), a.usedAes.forEach((c) => {
+          var f, x, m;
+          (c === "dotFill" || c === "lineColor") && (d[l].color = ((f = a.aesMap[l]) == null ? void 0 : f[c]) ?? B), c === "dotShape" && (d[l].shape = ((x = a.aesMap[l]) == null ? void 0 : x[c]) ?? "21"), c === "dotSize" && (d[l].size = ((m = a.aesMap[l]) == null ? void 0 : m[c]) ?? 3);
         });
       });
-      const S = c.label ?? c.value, E = at().domain(r.values).range(r.values.map((o) => u[o])).unknown(A);
-      n.push({ ...p, id: c.value, type: "dots", title: S, scale: E, values: r.values, labels: r.labels });
-    }), s.forEach((c) => {
-      if (c.type === "dots" && V(c.aes.dotFill)) {
-        const { domain: r, range: u, columnName: S, type: E = "linear" } = c.aes.dotFill, o = S.label ?? S.value, a = Z(u, r, "linear"), d = (E === "log" ? ot() : D()).domain(r).range([this.chartSizes.chartHeight, 0]), h = J(d, r);
-        n.push({ ...p, id: "dotFill", type: "continuous", title: o, scale: a, tickPositionScale: d, values: h });
+      const T = h.label ?? h.value, z = lt().domain(a.values).range(a.values.map((l) => d[l])).unknown(_);
+      o.push({ ...u, id: h.value, type: "dots", title: T, scale: z, values: a.values, labels: a.labels });
+    }), s.forEach((h) => {
+      if (h.type === "dots" && j(h.aes.dotFill)) {
+        const { domain: a, range: d, columnName: T, type: z = "linear" } = h.aes.dotFill, l = T.label ?? T.value, c = st(d, a, "linear"), f = (z === "log" ? ct() : W()).domain(a).range([this.chartSizes.chartHeight, 0]), x = at(f, a);
+        o.push({ ...u, id: "dotFill", type: "continuous", title: l, scale: c, tickPositionScale: f, values: x });
       }
-      if (c.type === "dots" && V(c.aes.dotSize)) {
-        const { columnName: r, domain: u, range: S } = c.aes.dotSize, E = r.label ?? r.value, o = ht(u, S), a = o.ticks(3), d = o.tickFormat(3), h = a.reduce((m, f) => (m[String(f)] = d(f), m), {});
-        n.push({ ...p, id: r.value, type: "size", title: E, scale: o, values: a, labels: h });
+      if (h.type === "dots" && j(h.aes.dotSize)) {
+        const { columnName: a, domain: d, range: T } = h.aes.dotSize, z = a.label ?? a.value, l = mt(d, T), c = l.ticks(3), f = l.tickFormat(3), x = c.reduce((m, n) => (m[String(n)] = f(n), m), {});
+        o.push({ ...u, id: a.value, type: "size", title: z, scale: l, values: c, labels: x });
       }
-    }), !n.length) {
+    }), !o.length) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const g = st(n, this.chartSizes.chartHeight), v = g[g.length - 1], M = v.left + v.width + K, z = this.chartSizes.chartHeight;
+    const p = ht(o, this.chartSizes.chartHeight), y = p[p.length - 1], F = y.left + y.width + tt, N = this.chartSizes.chartHeight;
     this.legend = {
-      width: M,
-      height: z,
-      items: g
+      width: F,
+      height: N,
+      items: p
     };
   }
-  render(t, e, i, s, n, p, g, v, M, z, c, r, u, S, E) {
-    var o;
-    const { xAxis: a, yAxis: d, size: h, title: m, legend: f } = e;
-    this.updateChartSizes(h), this.updateViewport(s, i, a, d, p, g), this.updateCaptionsSize(M.y), this.createFacetTitles(s, n), this.updateChartDimensions(s, i, a, d), this.updateLegendSize(f, z, r, u), this.createMainTitle(s, m), this.updateMargins();
-    const T = /* @__PURE__ */ F.jsx(
-      it,
+  render(t, e, i, s, o, u, p, y, F, N, h, a, d, T, z) {
+    var l;
+    const { xAxis: c, yAxis: f, size: x, title: m, legend: n } = e;
+    this.updateChartSizes(x), this.updateViewport(s, i, c, f, u, p), this.updateCaptionsSize(F.y), this.createFacetTitles(s, o), this.updateChartDimensions(s, i, c, f), this.updateLegendSize(n, N, a, d), this.createMainTitle(s, m), this.updateMargins();
+    const E = /* @__PURE__ */ L.jsx(
+      rt,
       {
         settingsId: t,
         chartSettings: e,
@@ -265,29 +278,29 @@ class Ot {
         chartSizes: this.chartSizes,
         chartsDimensions: this.chartsDimensions,
         scales: this.scales,
-        groupedDots: p,
-        trendsData: g,
+        groupedDots: u,
+        trendsData: p,
         legendData: this.legend,
         columnsCount: this.columnsCount,
         margins: this.margins,
-        keyColumn: v,
+        keyColumn: y,
         mainTitle: this.mainTitle,
         facetTitles: this.facetTitles,
         captionsSizes: this.captionsSizes,
-        onlyPositive: M,
-        layersData: c,
-        aesGetters: ut(z, u, S),
-        onTooltipHintSwitch: E
+        onlyPositive: F,
+        layersData: h,
+        aesGetters: xt(N, d, T),
+        onTooltipHintSwitch: z
       }
     );
-    this.component = T, (o = this.reactRoot) == null || o.render(T);
+    this.component = E, (l = this.reactRoot) == null || l.render(E);
   }
   renderError(t) {
     var e;
-    (e = this.reactRoot) == null || e.render(/* @__PURE__ */ F.jsx(k, { message: t }));
+    (e = this.reactRoot) == null || e.render(/* @__PURE__ */ L.jsx(K, { message: t }));
   }
 }
 export {
-  Ot as default
+  Pt as default
 };
 //# sourceMappingURL=ChartRenderer.js.map