@milaboratories/miplots4 1.0.127 → 1.0.129

package/dist/scatterplot/ChartRenderer.js

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