@milaboratories/miplots4 1.0.160 → 1.0.161

package/dist/scatterplot/ChartRenderer.js

@@ -1,12 +1,12 @@
 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 E = (a, t, i) => ot(a, typeof t != "symbol" ? t + "" : t, i);
+var S = (a, t, i) => ot(a, typeof t != "symbol" ? t + "" : t, i);
 import { j as v } 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 P, TITLE_LINE_HEIGHT as rt, MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as lt, BLACK as et, TITLE_MARGIN as ct } from "../constants.js";
-import { FACET_TITLE_LINE as mt } from "../discrete/constants.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 "../types/discrete.js";
@@ -15,105 +15,105 @@ import "../types/heatmap.js";
 import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
-import { arrangeLegendParts as dt } from "../utils/arrangeLegendParts.js";
-import { getContinuousColorScale as pt } from "../utils/getContinuousColorScale.js";
-import { getContinuousLegendTicks as ut } from "../utils/getContinuousLegendTicks.js";
-import { TextMeasurer as gt } from "../utils/TextMeasurer/TextMeasurer.js";
-import { ChartsGroup as ft } from "./components/ChartsGroup.js";
-import { MIN_MARGIN as H, PADDINGS as G, DEFAULT_DOT_AES as _, LEGEND_OFFSET as Ct, TICK_OFFSET as O, DEFAULT_TICKS_SIZE as Q, MIN_PADDING as F, FACET_TITLE_OFFSET as Tt, TITLE_LINE as U, FACET_AXIS_OFFSET as Z } from "./constants.js";
-import { createAesGetter as D } from "./utils/createAesGetter.js";
-import { getTicksAndFormat as St } from "./utils/getTicksAndFormat.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 Y, LEGEND_OFFSET as xt, TICK_OFFSET as O, DEFAULT_TICKS_SIZE as Q, MIN_PADDING as F, FACET_TITLE_OFFSET as Et, TITLE_LINE as U, FACET_AXIS_OFFSET as Z } from "./constants.js";
+import { createAesGetter as L } from "./utils/createAesGetter.js";
+import { getTicksAndFormat as Mt } from "./utils/getTicksAndFormat.js";
 import { isContinuousAxis as $ } 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 xt from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/ordinal.js";
-import Mt from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/symlog.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/symlog.js";
 import { sqrt as zt } 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((g, T) => g !== e[T]) || s[0] !== o[0] || s[1] !== o[1])
+    if (i.length !== e.length || i.some((f, T) => f !== e[T]) || s[0] !== o[0] || s[1] !== o[1])
       return !0;
   }
   return !1;
 }
-function Et(a, t, i, s) {
+function bt(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 bt(a, t, i, s, e, o, g, T, M, u) {
-  const W = a.scale === "discrete", m = t.scale === "discrete", n = o.includes("left") || !(u != null && u.sharedY), h = o.includes("left") && t.title !== "", c = o.includes("bottom") || !(u != null && u.sharedX), f = o.includes("bottom") && a.title !== "", r = m ? i.leftAxisCaptionsWidthByColumns[T] : i.yAxisCaptionsWidth + 2 * O, d = (t.showTicks ? Q : 0) + O, S = h ? U + F : 0, x = W ? i.bottomAxisCaptionsWidthByRows[g] : i.xAxisCaptionsWidth + 2 * O, z = a.showTicks ? Q : 0, L = f ? U + F : 0, C = r + d + S + Z, l = x + z + L + Z, I = Math.max(...s.map((p) => e[p].length));
+function wt(a, t, i, s, e, o, f, T, M, d) {
+  const b = 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 !== "", x = W ? i.leftAxisCaptionsWidthByColumns[T] : i.yAxisCaptionsWidth + 2 * O, l = (t.showTicks ? Q : 0) + O, m = n ? U + F : 0, C = b ? i.bottomAxisCaptionsWidthByRows[f] : i.xAxisCaptionsWidth + 2 * O, E = a.showTicks ? Q : 0, R = g ? U + F : 0, p = x + l + m + Z, c = C + E + R + Z, I = Math.max(...s.map((u) => e[u].length));
   return {
-    left: n ? C : F,
-    top: I === 0 ? 0 : Tt * 2 + I * mt,
-    bottom: c ? l + 8 : F,
+    left: h ? p : F,
+    top: I === 0 ? 0 : Et * 2 + I * pt,
+    bottom: r ? c + 8 : F,
     right: M ? 0 : F
   };
 }
-function wt(a, t, i) {
+function Wt(a, t, i) {
   const s = [];
   for (let e = 0; e < t; e++)
     s.push(a.slice(e * i, e * i + i));
   return s;
 }
-function Nt(a, t) {
+function It(a, t) {
   const i = Math.floor(a / t), s = a - i * t;
   return [i, s];
 }
-function Wt(a, t, i, s) {
-  const e = i.find((g) => g.type === "dots"), o = i.find((g) => g.type === "curve");
+function At(a, t, i, s) {
+  const e = i.find((f) => f.type === "dots"), o = i.find((f) => f.type === "curve");
   return {
-    dotShape: D(a, t, (e == null ? void 0 : e.aes.dotShape) ?? _.shape, "dotShape"),
-    dotColor: D(a, t, (e == null ? void 0 : e.aes.dotFill) ?? _.color, "dotFill"),
-    dotSize: D(a, t, (e == null ? void 0 : e.aes.dotSize) ?? _.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) ?? _.color, "fillColor")
+    dotShape: L(a, t, (e == null ? void 0 : e.aes.dotShape) ?? Y.shape, "dotShape"),
+    dotColor: L(a, t, (e == null ? void 0 : e.aes.dotFill) ?? Y.color, "dotFill"),
+    dotSize: L(a, t, (e == null ? void 0 : e.aes.dotSize) ?? Y.size, "dotSize"),
+    lineShape: L(a, t, (o == null ? void 0 : o.aes.lineShape) ?? "solid", "lineShape"),
+    lineColor: L(a, t, (o == null ? void 0 : o.aes.lineColor) ?? et, "lineColor"),
+    trendColor: L(a, t, (s == null ? void 0 : s.color) ?? Y.color, "fillColor")
   };
 }
-const It = Math.cos(Math.PI / 4), At = 5;
+const _t = Math.cos(Math.PI / 4), Ht = 5;
 function it(a, t) {
-  return t.scale === "discrete" ? t.labelsPosition === "90deg" ? a : t.labelsPosition === "45deg" ? a * It + (a > 0 ? 2 * At : 0) : U : a;
+  return t.scale === "discrete" ? t.labelsPosition === "90deg" ? a : t.labelsPosition === "45deg" ? a * _t + (a > 0 ? 2 * Ht : 0) : U : a;
 }
-class ri {
+class ci {
   constructor() {
-    E(this, "reactRoot", null);
-    E(this, "parentNode", null);
-    E(this, "rootNode", null);
-    E(this, "component", /* @__PURE__ */ v.jsx(v.Fragment, {}));
-    E(this, "margins", {
-      top: H,
-      bottom: H,
-      left: H,
-      right: H
+    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
     });
-    E(this, "chartsDimensions", {});
-    E(this, "chartSizes", {
-      chartWidth: P,
+    S(this, "chartsDimensions", {});
+    S(this, "chartSizes", {
+      chartWidth: G,
       // width of single chart
       chartHeight: X,
       // height of single chart
-      chartsWidth: P,
+      chartsWidth: G,
       // width of all charts in charts row
       chartsHeight: X,
       // width of all charts in charts column, without axes
-      totalWidth: P,
+      totalWidth: G,
       // width of all charts in charts row, plus left axis, plus legend
       totalHeight: X
       // width of all charts in charts height, plus bottom axis, plus top title
     });
-    E(this, "columnsCount", 1);
-    E(this, "rowsCount", 1);
-    E(this, "scales", {
-      x: { null: B().domain([0, 1]).range([0, P]) },
+    S(this, "columnsCount", 1);
+    S(this, "rowsCount", 1);
+    S(this, "scales", {
+      x: { null: B().domain([0, 1]).range([0, G]) },
       y: { null: B().domain([0, 1]).range([X, 0]) }
     });
-    E(this, "captionsSizes", {
+    S(this, "captionsSizes", {
       xAxisCaptionsWidth: 30,
       yAxisCaptionsWidth: 100,
       bottomAxisCaptionsWidthByRows: [],
@@ -121,13 +121,13 @@ class ri {
       bottomCaptionsTail: 0,
       leftCaptionsTail: 0
     });
-    E(this, "facetTitles", {});
+    S(this, "facetTitles", {});
     // can be multiline
-    E(this, "mainTitle", []);
+    S(this, "mainTitle", []);
     // can be multiline
-    E(this, "discreteAxesLabels", { x: {}, y: {} });
+    S(this, "discreteAxesLabels", { x: {}, y: {} });
     // only for discrete axes, by facets, can be multiline
-    E(this, "legend", { width: 0, height: 0, items: [] });
+    S(this, "legend", { width: 0, height: 0, items: [] });
   }
   clear() {
     var t;
@@ -143,108 +143,108 @@ class ri {
     this.chartSizes.chartWidth = t.width, this.chartSizes.chartHeight = t.height;
   }
   updateChartDimensions(t, i, s, e) {
-    const { chartWidth: o, chartHeight: g } = this.chartSizes;
+    const { chartWidth: o, chartHeight: f } = this.chartSizes;
     let T = 0, M = 0;
-    const u = wt(t, this.rowsCount, this.columnsCount);
-    this.chartsDimensions = t.reduce((n, h, c) => {
-      const [f, r] = Nt(c, this.columnsCount), d = Et(c, t.length, this.columnsCount, this.rowsCount), S = bt(
+    const d = Wt(t, this.rowsCount, this.columnsCount);
+    this.chartsDimensions = t.reduce((h, n, r) => {
+      const [g, x] = It(r, this.columnsCount), l = bt(r, t.length, this.columnsCount, this.rowsCount), m = wt(
         s,
         e,
         this.captionsSizes,
-        u[f],
+        d[g],
         this.facetTitles,
-        d,
-        f,
-        r,
-        r === this.columnsCount - 1,
+        l,
+        g,
+        x,
+        x === this.columnsCount - 1,
         i
-      ), x = o + S.left + S.right, z = g + S.top + S.bottom;
-      return n[h] = {
+      ), C = o + m.left + m.right, E = f + m.top + m.bottom;
+      return h[n] = {
         left: T,
         top: M,
-        chartEdgeSides: d,
-        padding: S,
-        inner: { width: o, height: g },
-        outer: { width: x, height: z }
-      }, T += x, r === this.columnsCount - 1 && (T = 0, M += z), n;
+        chartEdgeSides: l,
+        padding: m,
+        inner: { width: o, height: f },
+        outer: { width: C, height: E }
+      }, T += C, x === this.columnsCount - 1 && (T = 0, M += E), h;
     }, {});
-    const W = Math.max(
-      ...t.map((n) => this.chartsDimensions[n].outer.width + this.chartsDimensions[n].left)
-    ), m = Math.max(
-      ...t.map((n) => this.chartsDimensions[n].outer.height + this.chartsDimensions[n].top)
+    const b = Math.max(
+      ...t.map((h) => this.chartsDimensions[h].outer.width + this.chartsDimensions[h].left)
+    ), W = Math.max(
+      ...t.map((h) => this.chartsDimensions[h].outer.height + this.chartsDimensions[h].top)
     );
-    this.chartSizes.chartsWidth = W, this.chartSizes.chartsHeight = m;
+    this.chartSizes.chartsWidth = b, this.chartSizes.chartsHeight = W;
   }
-  updateViewport(t, i, s, e, o, g, T, M) {
-    const u = t.length, W = Math.min(i.nRows ?? u, u), m = Math.min(i.nCols ?? u, u);
-    this.columnsCount = i.nRows ? Math.ceil(u / W) : m, this.rowsCount = Math.ceil(u / this.columnsCount);
-    let [n, h] = [1 / 0, -1 / 0], [c, f] = [1 / 0, -1 / 0];
-    const r = t.reduce((C, l) => {
-      const I = T[l], { minX: p, minY: b, maxX: w, maxY: N } = I;
-      return n = Math.min(n, p), c = Math.min(c, b), h = Math.max(h, w), f = Math.max(f, N), C[l] = { minX: p, maxX: w, minY: b, maxY: N }, C;
-    }, {}), d = {}, S = {};
-    let x = !1, z = !1;
-    t.forEach((C) => {
-      let l;
+  updateViewport(t, i, s, e, o, f, T, M) {
+    const d = t.length, b = Math.min(i.nRows ?? d, d), W = Math.min(i.nCols ?? d, d);
+    this.columnsCount = i.nRows ? Math.ceil(d / b) : W, this.rowsCount = Math.ceil(d / this.columnsCount);
+    let [h, n] = [1 / 0, -1 / 0], [r, g] = [1 / 0, -1 / 0];
+    const x = t.reduce((p, c) => {
+      const I = T[c], { minX: u, minY: N, maxX: z, maxY: w } = I;
+      return h = Math.min(h, u), r = Math.min(r, N), n = Math.max(n, z), g = Math.max(g, w), p[c] = { minX: u, maxX: z, minY: N, maxY: w }, p;
+    }, {}), l = {}, m = {};
+    let C = !1, E = !1;
+    t.forEach((p) => {
+      let c;
       if (!$(s))
-        l = y().range([0, this.chartSizes.chartWidth]).domain(o.keys ?? []).padding(0.5);
+        c = y().range([0, this.chartSizes.chartWidth]).domain(o.keys ?? []).padding(0.5);
       else {
-        l = s.scale === "log" ? K() : B();
-        const p = r[C];
-        let b = s.lowerValue ? Number(s.lowerValue) : i.sharedX ? n : p.minX, w = s.upperValue ? Number(s.upperValue) : i.sharedX ? h : p.maxX;
+        c = s.scale === "log" ? K() : B();
+        const u = x[p];
+        let N = s.lowerValue ? Number(s.lowerValue) : i.sharedX ? h : u.minX, z = s.upperValue ? Number(s.upperValue) : i.sharedX ? n : u.maxX;
         if (typeof s.symmetricRange < "u") {
-          const R = s.symmetricRange;
-          if (R >= b && R <= w) {
-            const Y = Math.max(R - b, w - R);
-            b = R - Y, w = R + Y;
+          const _ = s.symmetricRange;
+          if (_ >= N && _ <= z) {
+            const H = Math.max(_ - N, z - _);
+            N = _ - H, z = _ + H;
           }
         }
-        const N = [0, this.chartSizes.chartWidth], A = l.copy().domain([b, w]).range([G.LEFT, this.chartSizes.chartWidth - G.RIGHT]);
-        l.domain([A.invert(0), A.invert(this.chartSizes.chartWidth)]).range(N).nice();
+        const w = [0, this.chartSizes.chartWidth], A = c.copy().domain([N, z]).range([P.LEFT, this.chartSizes.chartWidth - P.RIGHT]);
+        c.domain([A.invert(0), A.invert(this.chartSizes.chartWidth)]).range(w).nice();
       }
-      const I = this.scales.x[C];
-      d[C] = l, x = x || tt(I, l);
+      const I = this.scales.x[p];
+      l[p] = c, C = C || tt(I, c);
     });
-    const L = t.reduce((C, l) => {
-      const I = M ? M[l] : [];
-      return C[l] = I.reduce(
-        (p, b) => {
-          const w = b.bounded ? b.xBounds : this.scales.x[l].domain(), N = b.getInterval(w[0]), A = b.getInterval(w[1]);
-          return p.minY = Math.min(p.minY, isNaN(N.left) ? p.minY : N.left, isNaN(A.left) ? p.minY : A.left), p.maxY = Math.max(p.maxY, isNaN(N.right) ? p.maxY : N.right, isNaN(A.right) ? p.maxY : A.right), p;
+    const R = t.reduce((p, c) => {
+      const I = M ? M[c] : [];
+      return p[c] = I.reduce(
+        (u, N) => {
+          const z = N.bounded ? N.xBounds : this.scales.x[c].domain(), w = N.getInterval(z[0]), A = N.getInterval(z[1]);
+          return u.minY = Math.min(u.minY, isNaN(w.left) ? u.minY : w.left, isNaN(A.left) ? u.minY : A.left), u.maxY = Math.max(u.maxY, isNaN(w.right) ? u.maxY : w.right, isNaN(A.right) ? u.maxY : A.right), u;
         },
         { minY: 1 / 0, maxY: -1 / 0 }
-      ), c = Math.min(c, C[l].minY), f = Math.max(f, C[l].maxY), C;
+      ), r = Math.min(r, p[c].minY), g = Math.max(g, p[c].maxY), p;
     }, {});
-    t.forEach((C) => {
-      let l;
+    t.forEach((p) => {
+      let c;
       if (!$(e))
-        l = y().range([this.chartSizes.chartHeight, 0]).domain(g.keys ?? []).padding(0.5);
+        c = y().range([this.chartSizes.chartHeight, 0]).domain(f.keys ?? []).padding(0.5);
       else {
-        l = e.scale === "log" ? K() : B();
-        const p = r[C], b = L[C];
-        let w = e.lowerValue ? Number(e.lowerValue) : i.sharedY ? c : Math.min(p.minY, b.minY), N = e.upperValue ? Number(e.upperValue) : i.sharedY ? f : Math.max(p.maxY, b.maxY);
+        c = e.scale === "log" ? K() : B();
+        const u = x[p], N = R[p];
+        let z = e.lowerValue ? Number(e.lowerValue) : i.sharedY ? r : Math.min(u.minY, N.minY), w = e.upperValue ? Number(e.upperValue) : i.sharedY ? g : Math.max(u.maxY, N.maxY);
         if (typeof e.symmetricRange < "u") {
-          const Y = e.symmetricRange;
-          if (Y >= w && Y <= N) {
-            const j = Math.max(Y - w, N - Y);
-            w = Y - j, N = Y + j;
+          const H = e.symmetricRange;
+          if (H >= z && H <= w) {
+            const j = Math.max(H - z, w - H);
+            z = H - j, w = H + j;
           }
         }
-        const A = [this.chartSizes.chartHeight, 0], R = l.copy().domain([w, N]).range([this.chartSizes.chartHeight - G.BOTTOM, G.TOP]);
-        l.domain([R.invert(this.chartSizes.chartHeight), R.invert(0)]).range(A).nice();
+        const A = [this.chartSizes.chartHeight, 0], _ = c.copy().domain([z, w]).range([this.chartSizes.chartHeight - P.BOTTOM, P.TOP]);
+        c.domain([_.invert(this.chartSizes.chartHeight), _.invert(0)]).range(A).nice();
       }
-      const I = this.scales.y[C];
-      S[C] = l, z = z || tt(I, l);
-    }), x && (this.scales.x = d), z && (this.scales.y = S);
+      const I = this.scales.y[p];
+      m[p] = c, E = E || tt(I, c);
+    }), C && (this.scales.x = l), E && (this.scales.y = m);
   }
   updateCaptionsSize(t, i, s, e) {
-    const o = new gt("600 14px Manrope");
-    function g(h) {
-      return Math.max(...h.map((c) => o.getTextWidth(c)));
+    const o = new Tt("600 14px Manrope");
+    function f(n) {
+      return Math.max(...n.map((r) => o.getTextWidth(r)));
     }
-    let T = 0, M = 0, u = [], W = [], m = 0, n = 0;
+    let T = 0, M = 0, d = [], b = [], W = 0, h = 0;
     if (i.scale === "discrete") {
-      const h = k(
+      const n = k(
         t,
         this.rowsCount,
         this.columnsCount,
@@ -253,11 +253,11 @@ class ri {
         "vertical",
         this.scales.x
       );
-      T = h.xTail, u = h.axisCaptionsWidthByRows;
+      T = n.xTail, d = n.axisCaptionsWidthByRows;
     } else
-      m = 20;
+      W = 20;
     if (s.scale === "discrete") {
-      const h = k(
+      const n = k(
         t,
         this.rowsCount,
         this.columnsCount,
@@ -266,17 +266,17 @@ class ri {
         "horizontal",
         this.scales.y
       );
-      M = h.yTail, W = h.axisCaptionsWidthByColumns;
+      M = n.yTail, b = n.axisCaptionsWidthByColumns;
     } else
-      Object.values(this.scales.y).forEach((h) => {
-        const { ticks: c, format: f } = St(h, e);
-        n = Math.max(n, g(c.map(f)));
+      Object.values(this.scales.y).forEach((n) => {
+        const { ticks: r, format: g } = Mt(n, e);
+        h = Math.max(h, f(r.map(g)));
       });
     this.captionsSizes = {
-      xAxisCaptionsWidth: it(m, i),
-      yAxisCaptionsWidth: it(n, s),
-      bottomAxisCaptionsWidthByRows: u,
-      leftAxisCaptionsWidthByColumns: W,
+      xAxisCaptionsWidth: it(W, i),
+      yAxisCaptionsWidth: it(h, s),
+      bottomAxisCaptionsWidthByRows: d,
+      leftAxisCaptionsWidthByColumns: b,
       bottomCaptionsTail: T,
       leftCaptionsTail: M
     };
@@ -313,12 +313,12 @@ class ri {
     };
   }
   updateMargins(t) {
-    const i = rt * this.mainTitle.length, s = i > 0 ? i + ct * 2 : 0, e = this.chartsDimensions[t[0]], o = this.chartsDimensions[t[t.length - 1]];
+    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, 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
+      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
     }, 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,49 +326,52 @@ class ri {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const o = [], g = { width: 0, height: 0, left: 0, top: 0 };
-    if (s.forEach((m) => {
-      const n = i[m.value];
+    const o = [], f = { width: 0, height: 0, left: 0, top: 0 }, T = Math.min(
+      Math.max(this.chartSizes.chartHeight, lt),
+      ct
+    ), M = Math.max(this.chartSizes.chartHeight, T);
+    if (s.forEach((h) => {
+      const n = i[h.value];
       if (n.usedAes.length === 0 || !n.aesMap)
         return;
-      if (n.values.length > lt) {
+      if (n.values.length > mt) {
         console.warn(`Too many values for discrete legend (${n.values.length})`);
         return;
       }
-      const h = {};
-      n.values.forEach((r) => {
-        h[r] || (h[r] = { ..._ }), n.usedAes.forEach((d) => {
-          (d === "dotFill" || d === "lineColor") && (h[r].color = n.aesMap(r, d) ?? et), d === "dotShape" && (h[r].shape = n.aesMap(r, d) ?? "21"), d === "dotSize" && (h[r].size = n.aesMap(r, d) ?? 3);
+      const r = {};
+      n.values.forEach((l) => {
+        r[l] || (r[l] = { ...Y }), 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);
         });
       });
-      const c = m.label ?? m.value, f = xt().domain(n.values).range(n.values.map((r) => h[r])).unknown(_);
-      o.push({ ...g, id: m.value, type: "dots", title: c, scale: f, values: n.values, labels: n.labels });
-    }), e.forEach((m) => {
-      if (m.type === "dots" && q(m.aes.dotFill)) {
-        const { domain: n, range: h, columnName: c, type: f = "linear" } = m.aes.dotFill, r = c.label ?? c.value, d = pt(h, n, "linear"), S = (f === "log" ? Mt() : B()).domain(n).range([this.chartSizes.chartHeight, 0]), x = ut(S, n);
-        o.push({ ...g, id: "dotFill", type: "continuous", title: r, scale: d, tickPositionScale: S, values: x });
+      const g = h.label ?? h.value, x = St().domain(n.values).range(n.values.map((l) => r[l])).unknown(Y);
+      o.push({ ...f, id: h.value, type: "dots", title: g, 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: x = "linear" } = h.aes.dotFill, l = g.label ?? g.value, m = gt(r, n, "linear"), C = (x === "log" ? Nt() : B()).domain(n).range([T, 0]), E = ft(C, n);
+        o.push({ ...f, id: "dotFill", type: "continuous", title: l, scale: m, tickPositionScale: C, values: E });
       }
-      if (m.type === "dots" && q(m.aes.dotSize)) {
-        const { columnName: n, domain: h, range: c } = m.aes.dotSize, f = n.label ?? n.value, r = zt(h, c), d = r.ticks(3), S = r.tickFormat(3), x = d.reduce((z, L) => (z[String(L)] = S(L), z), {});
-        o.push({ ...g, id: n.value, type: "size", title: f, scale: r, values: d, labels: x });
+      if (h.type === "dots" && q(h.aes.dotSize)) {
+        const { columnName: n, domain: r, range: g } = h.aes.dotSize, x = n.label ?? n.value, l = zt(r, g), m = l.ticks(3), C = l.tickFormat(3), E = m.reduce((R, p) => (R[String(p)] = C(p), R), {});
+        o.push({ ...f, id: n.value, type: "size", title: x, scale: l, values: m, labels: E });
       }
     }), !o.length) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const T = dt(o, this.chartSizes.chartHeight), M = T[T.length - 1], u = M.left + M.width + Ct, W = this.chartSizes.chartHeight;
+    const d = ut(o, M, T), b = d[d.length - 1], W = b.left + b.width + xt;
     this.legend = {
-      width: u,
-      height: W,
-      items: T
+      width: W,
+      height: M,
+      items: d
     };
   }
-  render(t, i, s, e, o, g, T, M, u, W, m, n, h, c, f, r, d, S) {
-    var p;
-    const { xAxis: x, yAxis: z, size: L, title: C, legend: l } = s;
-    this.updateChartSizes(L), this.updateViewport(o, e, x, z, r, d, T, M), this.createAxisLabels(o, x, z, r, d), this.updateCaptionsSize(o, x, z, W.y), this.createFacetTitles(o, g), this.updateChartDimensions(o, e, x, z), this.updateLegendSize(l, m, h, c), this.createMainTitle(o, C), this.updateMargins(o);
+  render(t, i, s, e, o, f, T, M, d, b, W, h, n, r, g, x, l, m) {
+    var u;
+    const { xAxis: C, yAxis: E, size: R, title: p, legend: c } = s;
+    this.updateChartSizes(R), this.updateViewport(o, e, C, E, x, l, T, M), this.createAxisLabels(o, C, E, x, l), this.updateCaptionsSize(o, C, E, b.y), this.createFacetTitles(o, f), this.updateChartDimensions(o, e, C, E), this.updateLegendSize(c, W, n, r), this.createMainTitle(o, p), this.updateMargins(o);
     const I = /* @__PURE__ */ v.jsx(ht, { dataFrame: t, children: /* @__PURE__ */ v.jsx(
-      ft,
+      Ct,
       {
         settingsId: i,
         chartSettings: s,
@@ -382,18 +385,18 @@ class ri {
         legendData: this.legend,
         columnsCount: this.columnsCount,
         margins: this.margins,
-        keyColumn: u,
+        keyColumn: d,
         mainTitle: this.mainTitle,
         facetTitles: this.facetTitles,
         captionsSizes: this.captionsSizes,
-        onlyPositive: W,
-        layersData: n,
-        aesGetters: Wt(t, m, c, f),
-        onTooltipHintSwitch: S,
+        onlyPositive: b,
+        layersData: h,
+        aesGetters: At(t, W, r, g),
+        onTooltipHintSwitch: m,
         discreteAxesLabels: this.discreteAxesLabels
       }
     ) });
-    this.component = I, (p = this.reactRoot) == null || p.render(I);
+    this.component = I, (u = this.reactRoot) == null || u.render(I);
   }
   renderError(t) {
     var i;
@@ -401,6 +404,6 @@ class ri {
   }
 }
 export {
-  ri as default
+  ci as default
 };
 //# sourceMappingURL=ChartRenderer.js.map