@milaboratories/miplots4 1.0.143 → 1.0.145

package/dist/heatmap/ChartRenderer.js

@@ -1,99 +1,99 @@
-var st = Object.defineProperty;
-var et = (p, s, e) => s in p ? st(p, s, { enumerable: !0, configurable: !0, writable: !0, value: e }) : p[s] = e;
-var b = (p, s, e) => et(p, typeof s != "symbol" ? s + "" : s, e);
-import { j as P } from "../node_modules/react/jsx-runtime.js";
-import ot from "../node_modules/lodash/lodash.js";
-import { createRoot as it } from "../node_modules/react-dom/client.js";
-import { Error as nt } from "../common/Error.js";
-import { DataFrameProvider as rt } from "../common/useDataFrame.js";
-import { DEFAULT_HEIGHT as X, DEFAULT_WIDTH as Y, TITLE_LINE_HEIGHT as at, TITLE_MARGIN as ht } from "../constants.js";
-import { arrangeLegendParts as ct } from "../utils/arrangeLegendParts.js";
-import { getChartEdgeSides as lt } from "../utils/getChartEdgeSides.js";
-import { getContinuousLegendTicks as K } from "../utils/getContinuousLegendTicks.js";
-import { TextMeasurer as ut } from "../utils/TextMeasurer/TextMeasurer.js";
-import { ChartsGroup as pt } from "./components/ChartsGroup.js";
-import { MIN_MARGIN as w, TITLE_LINE as q, LEGEND_OFFSET as dt, DEFAULT_AES as V, CHART_SIDE_ELEMENTS as mt, MIN_PADDING as gt } from "./constants.js";
-import { calculateChartSideElementSizes as xt } from "./utils/calculateChartSideElementSizes.js";
-import { calculateSideElementsBBoxes as Ct } from "./utils/calculateSideElementsBBoxes.js";
-import { createDiscreteColorScale as J, createContinuousColorScale as ft } from "./utils/createColorScales.js";
-import { calculateAnnotationTitleSizes as St } from "./utils/calculateAnnotationTitleSizes.js";
-import { calculateCaptionTails as yt } from "./utils/calculateCaptionTails.js";
-import _ from "../node_modules/d3-scale/src/ordinal.js";
-import v from "../node_modules/d3-scale/src/linear.js";
-import Lt from "../node_modules/d3-array/src/extent.js";
-import Q from "../node_modules/d3-hierarchy/src/cluster.js";
-const bt = Math.cos(Math.PI / 4), At = 5;
-function Z(p, s, e) {
+var it = Object.defineProperty;
+var nt = (m, e, s) => e in m ? it(m, e, { enumerable: !0, configurable: !0, writable: !0, value: s }) : m[e] = s;
+var L = (m, e, s) => nt(m, typeof e != "symbol" ? e + "" : e, s);
+import { j as k } from "../node_modules/react/jsx-runtime.js";
+import rt from "../node_modules/lodash/lodash.js";
+import { createRoot as at } from "../node_modules/react-dom/client.js";
+import { Error as ht } from "../common/Error.js";
+import { DataFrameProvider as ct } from "../common/useDataFrame.js";
+import { DEFAULT_HEIGHT as U, DEFAULT_WIDTH as Y, TITLE_LINE_HEIGHT as lt, TITLE_MARGIN as ut } from "../constants.js";
+import { arrangeLegendParts as pt } from "../utils/arrangeLegendParts.js";
+import { getChartEdgeSides as dt } from "../utils/getChartEdgeSides.js";
+import { getContinuousLegendTicks as Q } from "../utils/getContinuousLegendTicks.js";
+import { TextMeasurer as mt } from "../utils/TextMeasurer/TextMeasurer.js";
+import { ChartsGroup as gt } from "./components/ChartsGroup.js";
+import { MIN_MARGIN as O, TITLE_LINE as q, LEGEND_OFFSET as xt, DEFAULT_AES as Z, CHART_SIDE_ELEMENTS as ft } from "./constants.js";
+import { calculateChartSideElementSizes as yt } from "./utils/calculateChartSideElementSizes.js";
+import { calculateSideElementsBBoxes as St } from "./utils/calculateSideElementsBBoxes.js";
+import { createDiscreteColorScale as $, createContinuousColorScale as Ct } from "./utils/createColorScales.js";
+import { calculateAnnotationTitleSizes as Lt } from "./utils/calculateAnnotationTitleSizes.js";
+import { calculateCaptionTails as bt } from "./utils/calculateCaptionTails.js";
+import I from "../node_modules/d3-scale/src/ordinal.js";
+import D from "../node_modules/d3-scale/src/linear.js";
+import zt from "../node_modules/d3-array/src/extent.js";
+import tt from "../node_modules/d3-hierarchy/src/cluster.js";
+const Gt = Math.cos(Math.PI / 4), At = 5;
+function st(m, e, s) {
   function t(r) {
-    r[e] = s(r.data.height), r.children && r.children.forEach(t);
+    r[s] = e(r.data.height), r.children && r.children.forEach(t);
   }
-  t(p);
+  t(m);
 }
-function $(p, s, e, t = e) {
+function et(m, e, s, t = s) {
   function r(i) {
-    i[t] = i[e] + s, i.children && i.children.forEach(r);
+    i[t] = i[s] + e, i.children && i.children.forEach(r);
   }
-  r(p);
+  r(m);
 }
-const zt = (p, s) => {
-  const e = Math.min(...s), t = Math.max(...s);
-  if (e === t) {
-    const a = p % 2 === 0 ? [] : [e];
-    for (let h = 1; h < p / 2 + 1; h++)
-      a.push(e + h), a.unshift(e - h);
+const Et = (m, e) => {
+  const s = Math.min(...e), t = Math.max(...e);
+  if (s === t) {
+    const a = m % 2 === 0 ? [] : [s];
+    for (let h = 1; h < m / 2 + 1; h++)
+      a.push(s + h), a.unshift(s - h);
     return a;
   }
-  if (p < 2)
-    return [e, t];
-  const r = (t - e) / (p - 1), i = [];
-  for (let a = 0; a < p - 1; a++)
-    i.push(e + r * a);
+  if (m < 2)
+    return [s, t];
+  const r = (t - s) / (m - 1), i = [];
+  for (let a = 0; a < m - 1; a++)
+    i.push(s + r * a);
   return i.push(t), i;
 };
-function tt(p, s, e) {
-  let t = e;
-  return p && (p.colorRange && (t = p.colorRange), p.method === "standardScaling" && (t = [-2, 2]), p.method === "meanNormalization" && (t = [-0.75, 0.75])), zt(s, t);
+function ot(m, e, s) {
+  let t = s;
+  return m && (m.colorRange && (t = m.colorRange), m.method === "standardScaling" && (t = [-2, 2]), m.method === "meanNormalization" && (t = [-0.75, 0.75])), Et(e, t);
 }
-function O(p, s, e) {
+function F(m, e, s) {
   let t = 0;
-  for (const r of p) {
-    if (s[r] === void 0) continue;
-    const i = e.getTextWidth(s[r]);
+  for (const r of m) {
+    if (e[r] === void 0) continue;
+    const i = s.getTextWidth(e[r]);
     i > t && (t = i);
   }
   return t;
 }
-function U(p, s) {
-  return s === 90 ? p : s === 45 ? p * bt + (p > 0 ? 2 * At : 0) : q;
+function P(m, e) {
+  return e === 90 ? m : e === 45 ? m * Gt + (m > 0 ? 2 * At : 0) : q;
 }
-class qt {
+class Vt {
   constructor() {
-    b(this, "reactRoot", null);
-    b(this, "parentNode", null);
-    b(this, "rootNode", null);
-    b(this, "component", /* @__PURE__ */ P.jsx(P.Fragment, {}));
-    b(this, "chartsDimensions", {});
-    b(this, "chartSizes", {
+    L(this, "reactRoot", null);
+    L(this, "parentNode", null);
+    L(this, "rootNode", null);
+    L(this, "component", /* @__PURE__ */ k.jsx(k.Fragment, {}));
+    L(this, "chartsDimensions", {});
+    L(this, "chartSizes", {
       chartWidth: Y,
       // width of single chart
-      chartHeight: X,
+      chartHeight: U,
       // height of single chart
       chartsWidth: Y,
       // width of all charts in charts row
-      chartsHeight: X,
+      chartsHeight: U,
       // width of all charts in charts column, without axes
       totalWidth: Y,
       // width of all charts in charts row, plus left axis, plus legend
-      totalHeight: X
+      totalHeight: U
       // width of all charts in charts height, plus bottom axis, plus top title
     });
-    b(this, "margins", {
-      top: w,
-      bottom: w,
-      left: w,
-      right: w
+    L(this, "margins", {
+      top: O,
+      bottom: O,
+      left: O,
+      right: O
     });
-    b(this, "captionsSizes", {
+    L(this, "captionsSizes", {
       xAxisCaptions: 100,
       yAxisCaptions: 100,
       xGroupCaptions: q,
@@ -101,295 +101,304 @@ class qt {
       xCaptionTail: 0,
       yCaptionTail: 0
     });
-    b(this, "labelAngles", {
+    L(this, "labelAngles", {
       xAxisLabels: 0,
       yAxisLabels: 0,
       xGroupLabels: 0,
       yGroupLabels: 0
     });
-    b(this, "columnsCount", 1);
-    b(this, "rowsCount", 1);
-    b(this, "scales", {
+    L(this, "columnsCount", 1);
+    L(this, "rowsCount", 1);
+    L(this, "scales", {
       // scales grouped by facet
-      x: { null: _().domain(["null"]).range([1]) },
-      y: { null: _().domain(["null"]).range([1]) }
+      x: { null: I().domain(["null"]).range([1]) },
+      y: { null: I().domain(["null"]).range([1]) }
     });
-    b(this, "step", { x: {}, y: {} });
-    b(this, "colorScale", v().domain([0, 1]).range(["white", "black"]));
-    b(this, "annotationColorScales", {});
-    b(this, "dendrogramAesScales", {});
-    b(this, "legend", {
+    L(this, "step", { x: {}, y: {} });
+    L(this, "colorScale", D().domain([0, 1]).range(["white", "black"]));
+    L(this, "annotationColorScales", {});
+    L(this, "dendrogramAesScales", {});
+    L(this, "legend", {
       width: 0,
       height: 0,
       items: []
     });
-    b(this, "dendrograms", {});
+    L(this, "dendrograms", {});
   }
   clear() {
-    var s;
-    this.parentNode && this.rootNode && ((s = this.parentNode) == null || s.removeChild(this.rootNode), this.parentNode = null, this.rootNode = null), setTimeout(() => {
-      var e;
-      (e = this.reactRoot) == null || e.unmount(), this.reactRoot = null;
+    var e;
+    this.parentNode && this.rootNode && ((e = this.parentNode) == null || e.removeChild(this.rootNode), this.parentNode = null, this.rootNode = null), setTimeout(() => {
+      var s;
+      (s = this.reactRoot) == null || s.unmount(), this.reactRoot = null;
     });
   }
-  init(s) {
-    this.parentNode === null && (this.parentNode = s, this.rootNode = document.createElement("div"), this.parentNode.appendChild(this.rootNode), this.reactRoot = it(this.rootNode));
+  init(e) {
+    this.parentNode === null && (this.parentNode = e, this.rootNode = document.createElement("div"), this.parentNode.appendChild(this.rootNode), this.reactRoot = at(this.rootNode));
   }
-  updateMargins(s) {
+  updateMargins(e, s) {
     this.margins = {
-      top: s.show ? at + ht * 2 : w,
-      bottom: w,
-      left: w,
-      right: this.legend.width + w
+      top: e.show ? lt + ut * 2 : s.outerOffset,
+      bottom: s.outerOffset,
+      left: s.outerOffset,
+      right: this.legend.width + s.outerOffset
     }, this.chartSizes.totalWidth = this.margins.left + this.chartSizes.chartsWidth + this.margins.right, this.chartSizes.totalHeight = this.margins.top + Math.max(this.chartSizes.chartsHeight + this.margins.bottom, this.legend.height);
   }
-  updateLegendSize(s, e, t, r, i) {
-    if (!e.show) {
+  updateLegendSize(e, s, t, r, i) {
+    if (!s.show) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const a = this.chartSizes.chartHeight, h = [], d = { width: 0, height: 0, left: 0, top: 0 }, A = (l) => l.reduce((c, n) => (c[n] = String(n), c), {});
-    if (s === "continuous") {
-      const l = this.colorScale, c = K(l, i), n = v([c[0], c[c.length - 1]], [a, 0]), o = r.label ?? r.value;
+    const a = this.chartSizes.chartHeight, h = [], u = { width: 0, height: 0, left: 0, top: 0 }, f = (l) => l.reduce((c, o) => (c[o] = String(o), c), {});
+    if (e === "continuous") {
+      const l = this.colorScale, c = Q(l, i), o = D([c[0], c[c.length - 1]], [a, 0]), n = r.label ?? r.value;
       h.push({
-        ...d,
+        ...u,
         type: "continuous",
         id: "heatmapValue",
         scale: l,
         values: c,
-        title: o,
-        tickPositionScale: n
+        title: n,
+        tickPositionScale: o
       });
-    } else if (s === "discrete") {
-      const l = this.colorScale, c = r.label ?? r.value, n = l.domain(), o = A(n);
-      h.push({ ...d, type: "discreteColor", id: "heatmapValue", title: c, scale: l, values: n, labels: o });
+    } else if (e === "discrete") {
+      const l = this.colorScale, c = r.label ?? r.value, o = l.domain(), n = f(o);
+      h.push({ ...u, type: "discreteColor", id: "heatmapValue", title: c, scale: l, values: o, labels: n });
     }
     if (t.forEach((l) => {
       const c = l.valueColumn.label ?? l.valueColumn.value;
       if (l.type === "continuous") {
-        const n = this.annotationColorScales[l.id].scale, o = K(n, i), C = v([o[0], o[o.length - 1]], [a, 0]);
-        h.push({ ...d, type: "continuous", id: l.id, tickPositionScale: C, title: c, scale: n, values: o });
+        const o = this.annotationColorScales[l.id].scale, n = Q(o, i), x = D([n[0], n[n.length - 1]], [a, 0]);
+        h.push({ ...u, type: "continuous", id: l.id, tickPositionScale: x, title: c, scale: o, values: n });
       }
       if (l.type === "discrete") {
-        const n = this.annotationColorScales[l.id].scale, o = n.domain(), C = A(o);
-        h.push({ ...d, type: "discreteColor", id: l.id, title: c, scale: n, values: o, labels: C });
+        const o = this.annotationColorScales[l.id].scale, n = o.domain(), x = f(n);
+        h.push({ ...u, type: "discreteColor", id: l.id, title: c, scale: o, values: n, labels: x });
       }
     }), !h.length) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const x = ct(h, this.chartSizes.chartHeight), m = x[x.length - 1], y = m.left + m.width + dt;
+    const p = pt(h, this.chartSizes.chartHeight), d = p[p.length - 1], E = d.left + d.width + xt;
     this.legend = {
-      width: y,
+      width: E,
       height: a,
-      items: x
+      items: p
     };
   }
-  updateCaptionsSize(s, e, t, r) {
-    const i = new ut("bold 16px Manrope"), { xGroupKeys: a, yGroupKeys: h, xGroupLabels: d, yGroupLabels: A, xKeysByGroups: x, yKeysByGroups: m, xLabels: y, yLabels: l } = s.meta;
+  updateCaptionsSize(e, s, t, r) {
+    const i = new mt("bold 16px Manrope"), { xGroupKeys: a, yGroupKeys: h, xGroupLabels: u, yGroupLabels: f, xKeysByGroups: p, yKeysByGroups: d, xLabels: E, yLabels: l } = e.meta;
     this.labelAngles = {
-      xAxisLabels: e.axisLabelsAngle,
+      xAxisLabels: s.axisLabelsAngle,
       yAxisLabels: t.axisLabelsAngle,
-      xGroupLabels: e.groupLabelsAngle,
+      xGroupLabels: s.groupLabelsAngle,
       yGroupLabels: t.groupLabelsAngle
     };
-    const c = a.reduce((f, S) => Math.max(f, O(x[S], y, i)), 0), n = h.reduce((f, S) => Math.max(f, O(m[S], l, i)), 0), o = O(a, d, i), C = O(h, A, i), { xCaptionTail: u, yCaptionTail: g } = yt(
+    const c = a.reduce((S, g) => Math.max(S, F(p[g], E, i)), 0), o = h.reduce((S, g) => Math.max(S, F(d[g], l, i)), 0), n = F(a, u, i), x = F(h, f, i), { xCaptionTail: y, yCaptionTail: A } = bt(
       this.labelAngles,
       r,
       this.scales,
       this.step,
-      s,
+      e,
       i
     );
     this.captionsSizes = {
-      xCaptionTail: u,
-      yCaptionTail: g,
-      xGroupCaptions: U(o, this.labelAngles.xGroupLabels),
-      yGroupCaptions: U(C, this.labelAngles.yGroupLabels),
-      xAxisCaptions: U(c, this.labelAngles.xAxisLabels),
-      yAxisCaptions: U(n, this.labelAngles.yAxisLabels)
+      xCaptionTail: y,
+      yCaptionTail: A,
+      xGroupCaptions: P(n, this.labelAngles.xGroupLabels),
+      yGroupCaptions: P(x, this.labelAngles.yGroupLabels),
+      xAxisCaptions: P(c, this.labelAngles.xAxisLabels),
+      yAxisCaptions: P(o, this.labelAngles.yAxisLabels)
     };
   }
-  updateChartDimensions(s, e, t, r, i, a, h, d, A, x) {
-    const m = e.length, y = Math.min(i.nRows ?? m, m), l = Math.min(i.nCols ?? m, m);
-    this.columnsCount = i.nRows ? Math.ceil(m / y) : l, this.rowsCount = Math.ceil(m / this.columnsCount);
-    const { width: c, height: n } = s, { sharedX: o, sharedY: C } = i;
+  updateChartDimensions(e, s, t, r, i, a, h, u, f, p) {
+    const d = s.length, E = Math.min(i.nRows ?? d, d), l = Math.min(i.nCols ?? d, d);
+    this.columnsCount = i.nRows ? Math.ceil(d / E) : l, this.rowsCount = Math.ceil(d / this.columnsCount);
+    const { sharedX: c, sharedY: o } = i;
     this.chartsDimensions = {};
-    let u = 0, g = 0;
-    e.forEach((z, E) => {
-      const I = E % this.columnsCount + 1, M = lt(E, e.length, this.columnsCount, this.rowsCount), B = this.step.x[z], R = this.step.y[z], N = xt(
+    let n = 0, x = 0;
+    s.forEach((S, g) => {
+      const b = g % this.columnsCount + 1, C = dt(g, s.length, this.columnsCount, this.rowsCount), z = this.step.x[S], w = this.step.y[S], H = yt(
         a,
         h,
         this.captionsSizes,
-        d,
-        A,
-        x,
-        M,
-        o,
+        u,
+        f,
+        p,
         C,
-        e,
+        c,
+        o,
+        s,
         t,
         r,
-        B,
-        R
-      ), F = St(d, M, o, C);
-      function D(H) {
+        z,
+        w
+      ), v = Lt(u, C, c, o);
+      function N(B) {
         return Math.max(
-          mt[H].reduce((L, G) => L + N[H][G], 0),
-          F[H],
-          gt
+          ft[B].reduce((j, _) => j + H[B][_], 0),
+          v[B],
+          e.innerOffset
         );
       }
       const T = {
-        left: D("left"),
-        right: D("right"),
-        top: D("top"),
-        bottom: D("bottom")
+        left: N("left"),
+        right: N("right"),
+        top: N("top"),
+        bottom: N("bottom")
       };
       T.left < this.captionsSizes.xCaptionTail && (T.left = this.captionsSizes.xCaptionTail), T.bottom < this.captionsSizes.yCaptionTail && (T.bottom = this.captionsSizes.yCaptionTail);
-      const W = Ct(N, c, n), j = c + T.left + T.right, k = n + T.top + T.bottom;
-      this.chartsDimensions[z] = {
-        left: u,
-        top: g,
-        inner: { width: c, height: n },
-        outer: { width: j, height: k },
+      const K = St(H, this.chartSizes.chartWidth, this.chartSizes.chartHeight), R = this.chartSizes.chartWidth + T.left + T.right, W = this.chartSizes.chartHeight + T.top + T.bottom;
+      this.chartsDimensions[S] = {
+        left: n,
+        top: x,
+        inner: { width: this.chartSizes.chartWidth, height: this.chartSizes.chartHeight },
+        outer: { width: R, height: W },
         padding: T,
-        sideElementBBoxes: W,
-        chartEdgeSides: M
-      }, u += j, I === this.columnsCount && (u = 0, g += k);
+        sideElementBBoxes: K,
+        chartEdgeSides: C
+      }, n += R, b === this.columnsCount && (n = 0, x += W);
     });
-    const f = e.slice(0, this.columnsCount).reduce((z, E) => z + this.chartsDimensions[E].outer.width, 0), S = e.filter((z, E) => E % this.columnsCount === 0).reduce((z, E) => z + this.chartsDimensions[E].outer.height, 0);
-    this.chartSizes.chartsWidth = f, this.chartSizes.chartsHeight = S;
+    const y = s.slice(0, this.columnsCount).reduce((S, g) => S + this.chartsDimensions[g].outer.width, 0), A = s.filter((S, g) => g % this.columnsCount === 0).reduce((S, g) => S + this.chartsDimensions[g].outer.height, 0);
+    this.chartSizes.chartsWidth = y, this.chartSizes.chartsHeight = A;
   }
-  updateChartsSizes(s) {
-    const { width: e, height: t } = s;
-    this.chartSizes.chartWidth = e, this.chartSizes.chartHeight = t;
+  updateChartsSizes(e, s, t, r) {
+    const { width: i, height: a, cellWidth: h, cellHeight: u } = e, f = t.meta.facetKeys[0];
+    if (h && s.sharedX && f) {
+      const p = t.facets[f].xKeys.length, d = t.meta.xGroupKeys.length;
+      this.chartSizes.chartWidth = p * h + r * (d - 1);
+    } else
+      this.chartSizes.chartWidth = i;
+    if (u && s.sharedY && f) {
+      const p = t.facets[f].yKeys.length, d = t.meta.yGroupKeys.length;
+      this.chartSizes.chartHeight = p * u + r * (d - 1);
+    } else
+      this.chartSizes.chartHeight = a;
   }
   // update scales for cell positions, x and y for each facet
-  updateScales(s, e, t, r, i, a, h, d, A) {
-    const { width: x, height: m } = i, { meta: y, facets: l } = e, { sharedX: c, sharedY: n } = r, o = (u, g = {}) => u.sort(
-      (f, S) => a.sorting === "asc" ? (g[f] ?? f).localeCompare(g[S] ?? S, "en", { numeric: !0 }) : (g[S] ?? S).localeCompare(g[f] ?? f, "en", { numeric: !0 })
-    ), C = (u, g = {}) => u.sort(
-      (f, S) => h.sorting === "asc" ? (g[f] ?? f).localeCompare(g[S] ?? S, "en", { numeric: !0 }) : (g[S] ?? S).localeCompare(g[f] ?? f, "en", { numeric: !0 })
+  updateScales(e, s, t, r, i, a, h, u, f, p) {
+    const { width: d, height: E, cellWidth: l, cellHeight: c } = i, { meta: o, facets: n } = s, { sharedX: x, sharedY: y } = r, A = (g, b = {}) => g.sort(
+      (C, z) => a.sorting === "asc" ? (b[C] ?? C).localeCompare(b[z] ?? z, "en", { numeric: !0 }) : (b[z] ?? z).localeCompare(b[C] ?? C, "en", { numeric: !0 })
+    ), S = (g, b = {}) => g.sort(
+      (C, z) => h.sorting === "asc" ? (b[C] ?? C).localeCompare(b[z] ?? z, "en", { numeric: !0 }) : (b[z] ?? z).localeCompare(b[C] ?? C, "en", { numeric: !0 })
     );
-    s.forEach((u) => {
-      const g = l[u], f = o(y.xGroupKeys), S = C(y.yGroupKeys), { xKeysByGroups: z } = c ? y : g, { yKeysByGroups: E } = n ? y : g, I = f.map((L) => z[L].length), M = S.map((L) => E[L].length), B = I.reduce((L, G) => L + G, 0), R = M.reduce((L, G) => L + G, 0), N = (x - (I.filter((L) => L > 0).length - 1) * t) / B, F = (m - (M.filter((L) => L > 0).length - 1) * t) / R, D = [], T = [];
-      let W = 0;
-      f.forEach((L) => {
-        const G = d ? z[L] : o(z[L], y.xLabels);
-        T.push(...G), G.forEach(() => {
-          D.push(W), W += N;
-        }), G.length > 0 && (W += t);
+    e.forEach((g) => {
+      const b = n[g], C = p.xGroup ? o.xGroupKeys : A(o.xGroupKeys), z = p.yGroup ? o.yGroupKeys : S(o.yGroupKeys), { xKeysByGroups: w } = x ? o : b, { yKeysByGroups: H } = y ? o : b, v = C.map((G) => w[G].length), N = z.map((G) => H[G].length), T = v.reduce((G, M) => G + M, 0), K = N.reduce((G, M) => G + M, 0), R = x && l ? l : (d - (v.filter((G) => G > 0).length - 1) * t) / T, W = y && c ? c : (E - (N.filter((G) => G > 0).length - 1) * t) / K, B = [], j = [];
+      let _ = 0;
+      C.forEach((G) => {
+        const M = u || p.x ? w[G] : A(w[G], o.xLabels);
+        j.push(...M), M.forEach(() => {
+          B.push(_), _ += R;
+        }), M.length > 0 && (_ += t);
       });
-      const j = [], k = [];
-      let H = 0;
-      S.forEach((L) => {
-        const G = A ? E[L] : C(E[L], y.yLabels);
-        k.push(...G), G.forEach(() => {
-          j.push(H), H += F;
-        }), G.length > 0 && (H += t);
-      }), this.scales.x[u] = _().domain(T).range(D), this.scales.y[u] = _().domain(k).range(j), this.step.x[u] = N, this.step.y[u] = F;
+      const V = [], J = [];
+      let X = 0;
+      z.forEach((G) => {
+        const M = f || p.y ? H[G] : S(H[G], o.yLabels);
+        J.push(...M), M.forEach(() => {
+          V.push(X), X += W;
+        }), M.length > 0 && (X += t);
+      }), this.scales.x[g] = I().domain(j).range(B), this.scales.y[g] = I().domain(J).range(V), this.step.x[g] = R, this.step.y[g] = W;
     });
   }
-  updateAesScale(s, e, t, r, i, a, h) {
-    if (s === "continuous")
-      t.valueColors ? this.colorScale = v().domain(t.valuesByColors ?? tt(h, t.valueColors.length, e)).range(t.valueColors) : t.colorsList && (this.colorScale = v().domain(tt(h, t.colorsList.length, e)).range(t.colorsList));
+  updateAesScale(e, s, t, r, i, a, h) {
+    if (e === "continuous")
+      t.valueColors ? this.colorScale = D().domain(t.valuesByColors ?? ot(h, t.valueColors.length, s)).range(t.valueColors) : t.colorsList && (this.colorScale = D().domain(ot(h, t.colorsList.length, s)).range(t.colorsList));
     else if (t.colorsMap) {
-      const x = Object.entries(t.colorsMap);
-      this.colorScale = _().domain(x.map((m) => m[0])).range(x.map((m) => m[1])).unknown("#ccc");
-    } else t.colorsList && (this.colorScale = J(t.colorsList, a.map(String)));
-    const { xDataByKeys: d, yDataByKeys: A } = i.meta;
-    r.forEach((x) => {
-      const { colors: m, type: y, axis: l, valueColumn: c } = x, n = (l === "x" ? d : A)[c.value];
-      if (y === "discrete") {
-        const o = ot.uniq(Object.values(n).map(String)).sort();
-        this.annotationColorScales[x.id] = {
+      const p = Object.entries(t.colorsMap);
+      this.colorScale = I().domain(p.map((d) => d[0])).range(p.map((d) => d[1])).unknown("#ccc");
+    } else t.colorsList && (this.colorScale = $(t.colorsList, a.map(String)));
+    const { xDataByKeys: u, yDataByKeys: f } = i.meta;
+    r.forEach((p) => {
+      const { colors: d, type: E, axis: l, valueColumn: c } = p, o = (l === "x" ? u : f)[c.value];
+      if (E === "discrete") {
+        const n = rt.uniq(Object.values(o).map(String)).sort();
+        this.annotationColorScales[p.id] = {
           type: "discrete",
-          scale: J(m, o)
+          scale: $(d, n)
         };
       } else {
-        const o = Object.values(n).map(Number);
-        if (!o.length)
+        const n = Object.values(o).map(Number);
+        if (!n.length)
           return;
-        const [C = o[0], u = o[0]] = Lt(o);
-        this.annotationColorScales[x.id] = {
+        const [x = n[0], y = n[0]] = zt(n);
+        this.annotationColorScales[p.id] = {
           type: "continuous",
-          scale: ft(m, C, u, 0, 0.5, 1)
+          scale: Ct(d, x, y, 0, 0.5, 1)
         };
       }
     });
   }
-  updateDendrogram(s, e, t, r, i, a, h) {
-    s.forEach((d) => {
-      this.dendrograms[d] = { x: { treesByGroupKey: {}, data: a }, y: { treesByGroupKey: {}, data: h } };
-      const { xKeysByGroups: A, yKeysByGroups: x } = r[d], { hierarchyByGroupX: m, hierarchyByGroupY: y } = i[d];
+  updateDendrogram(e, s, t, r, i, a, h) {
+    e.forEach((u) => {
+      this.dendrograms[u] = { x: { treesByGroupKey: {}, data: a }, y: { treesByGroupKey: {}, data: h } };
+      const { xKeysByGroups: f, yKeysByGroups: p } = r[u], { hierarchyByGroupX: d, hierarchyByGroupY: E } = i[u];
       if (a) {
-        const l = e.reduce((c, n) => {
-          var o;
-          return Math.max(c, (o = m[n]) == null ? void 0 : o.data.height);
+        const l = s.reduce((c, o) => {
+          var n;
+          return Math.max(c, (n = d[o]) == null ? void 0 : n.data.height);
         }, 0);
-        this.dendrograms[d].x.treesByGroupKey = e.reduce((c, n) => {
-          const o = m[n], C = A[n];
-          Q().separation(() => 1).size([C.length * this.step.x[d], a.size])(
-            o
+        this.dendrograms[u].x.treesByGroupKey = s.reduce((c, o) => {
+          const n = d[o], x = f[o];
+          tt().separation(() => 1).size([x.length * this.step.x[u], a.size])(
+            n
           );
-          const u = o, g = v().domain(a.position === "top" ? [0, l] : [l, 0]).range([a.size, 0]);
-          return Z(u, g, "y"), $(u, this.scales.x[d](C[0]), "x"), c[n] = u, c;
-        }, {}), this.dendrograms[d].x.data = a;
+          const y = n, A = D().domain(a.position === "top" ? [0, l] : [l, 0]).range([a.size, 0]);
+          return st(y, A, "y"), et(y, this.scales.x[u](x[0]), "x"), c[o] = y, c;
+        }, {}), this.dendrograms[u].x.data = a;
       }
       if (h) {
-        const l = t.reduce((c, n) => {
-          var o;
-          return Math.max(c, (o = y[n]) == null ? void 0 : o.data.height);
+        const l = t.reduce((c, o) => {
+          var n;
+          return Math.max(c, (n = E[o]) == null ? void 0 : n.data.height);
         }, 0);
-        this.dendrograms[d].y.treesByGroupKey = t.reduce((c, n) => {
-          const o = y[n], C = x[n];
-          Q().separation(() => 1).size([C.length * this.step.y[d], h.size])(
-            o
+        this.dendrograms[u].y.treesByGroupKey = t.reduce((c, o) => {
+          const n = E[o], x = p[o];
+          tt().separation(() => 1).size([x.length * this.step.y[u], h.size])(
+            n
           );
-          const u = o, g = v().domain(h.position === "left" ? [0, l] : [l, 0]).range([h.size, 0]);
-          return $(u, this.scales.y[d](C[0]), "x", "y"), Z(u, g, "x"), c[n] = u, c;
-        }, {}), this.dendrograms[d].y.data = h;
+          const y = n, A = D().domain(h.position === "left" ? [0, l] : [l, 0]).range([h.size, 0]);
+          return et(y, this.scales.y[u](x[0]), "x", "y"), st(y, A, "x"), c[o] = y, c;
+        }, {}), this.dendrograms[u].y.data = h;
       }
     });
   }
-  updateDendrogramAesScales(s) {
-    if (!s)
+  updateDendrogramAesScales(e) {
+    if (!e)
       return;
-    const e = Object.keys(s);
-    this.dendrogramAesScales = e.reduce((t, r) => {
-      const i = s[r], a = Object.keys(i);
-      return t[r] = _().domain(a).range(
+    const s = Object.keys(e);
+    this.dendrogramAesScales = s.reduce((t, r) => {
+      const i = e[r], a = Object.keys(i);
+      return t[r] = I().domain(a).range(
         a.map((h) => ({
-          ...V,
+          ...Z,
           ...i[h]
         }))
-      ).unknown(V), t;
+      ).unknown(Z), t;
     }, {});
   }
-  render(s, e, t, r, i, a, h, d, A, x, m, y, l, c, n) {
-    var N;
-    const { meta: o, facets: C } = a, { facetKeys: u, xGroupKeys: g, yGroupKeys: f, valueExtent: S } = o, { xAxis: z, yAxis: E, title: I, size: M, valueType: B } = t;
-    this.updateChartsSizes(M), this.updateAesScale(B, S, i, h, a, l, c), this.updateScales(u, a, i.groupGap, r, M, t.xAxis, t.yAxis, A, x), this.updateCaptionsSize(a, z, E, r), this.updateChartDimensions(
-      M,
-      u,
+  render(e, s, t, r, i, a, h, u, f, p, d, E, l, c, o, n) {
+    var T;
+    const { meta: x, facets: y } = a, { facetKeys: A, xGroupKeys: S, yGroupKeys: g, valueExtent: b } = x, { xAxis: C, yAxis: z, title: w, size: H, valueType: v } = t;
+    this.updateChartsSizes(H, r, a, i.groupGap), this.updateAesScale(v, b, i, h, a, l, c), this.updateScales(A, a, i.groupGap, r, H, t.xAxis, t.yAxis, f, p, n), this.updateCaptionsSize(a, C, z, r), this.updateChartDimensions(
+      H,
+      A,
+      S,
       g,
-      f,
       r,
+      C,
       z,
-      E,
       h,
-      A,
-      x
-    ), this.updateLegendSize(B, t.legend, h, d, S), this.updateMargins(I), this.updateDendrogram(u, g, f, C, m, A, x), this.updateDendrogramAesScales(y);
-    const R = /* @__PURE__ */ P.jsx(rt, { dataFrame: s, children: /* @__PURE__ */ P.jsx(
-      pt,
+      f,
+      p
+    ), this.updateLegendSize(v, t.legend, h, u, b), this.updateMargins(w, H), this.updateDendrogram(A, S, g, y, d, f, p), this.updateDendrogramAesScales(E);
+    const N = /* @__PURE__ */ k.jsx(ct, { dataFrame: e, children: /* @__PURE__ */ k.jsx(
+      gt,
       {
         aes: i,
         annotations: h,
         annotationColorScales: this.annotationColorScales,
         captionsSizes: this.captionsSizes,
-        cellsMeta: o,
+        cellsMeta: x,
         columnsCount: this.columnsCount,
         chartsDimensions: this.chartsDimensions,
         chartSettings: t,
@@ -397,28 +406,28 @@ class qt {
         colorScale: this.colorScale,
         dendrogramAesScales: this.dendrogramAesScales,
         dendrograms: this.dendrograms,
-        facetKeys: u,
+        facetKeys: A,
         facetSettings: r,
-        groupedCells: C,
+        groupedCells: y,
         labelAngles: this.labelAngles,
         legend: this.legend,
         margins: this.margins,
         scales: this.scales,
-        settingsId: e,
+        settingsId: s,
         step: this.step,
-        xGroupKeys: g,
-        yGroupKeys: f,
-        onTooltipHintSwitch: n
+        xGroupKeys: S,
+        yGroupKeys: g,
+        onTooltipHintSwitch: o
       }
     ) });
-    this.component = R, (N = this.reactRoot) == null || N.render(R);
+    this.component = N, (T = this.reactRoot) == null || T.render(N);
   }
-  renderError(s) {
-    var e;
-    (e = this.reactRoot) == null || e.render(/* @__PURE__ */ P.jsx(nt, { message: s }));
+  renderError(e) {
+    var s;
+    (s = this.reactRoot) == null || s.render(/* @__PURE__ */ k.jsx(ht, { message: e }));
   }
 }
 export {
-  qt as default
+  Vt as default
 };
 //# sourceMappingURL=ChartRenderer.js.map