@milaboratories/graph-maker 1.1.138 → 1.1.140

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

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