@milaboratories/miplots4 1.0.164 → 1.0.165

package/dist/index.d.ts

@@ -3,5 +3,5 @@ import { DataByColumns } from './DataFrame';
 import { MiPlots } from './MiPlots';
 import { BubbleSettings, DendroSettings, DiscreteSettings, ErrorInfo, ErrorInfoUnknown, HeatmapSettings, HistogramSettings, ScatterplotSettings, ScatterplotUmapSettings, Settings, AxisSettingsContinuous, AxisSettingsDiscrete } from './types';
 import { LassoControlsState, Polygon } from './scatterplot-umap/types';
-import { SCATTERPLOT_LASSO_EVENTS } from './scatterplot-umap/constants';
-export { BubbleSettings, ChartInterface, DataByColumns, DendroSettings, DiscreteSettings, HeatmapSettings, HistogramSettings, MiPlots, ScatterplotSettings, ScatterplotUmapSettings, Settings, AxisSettingsDiscrete, AxisSettingsContinuous, SCATTERPLOT_LASSO_EVENTS, LassoControlsState, Polygon, ErrorInfo, ErrorInfoUnknown };
+import { SCATTERPLOT_CONTROLS_EVENTS } from './scatterplot-umap/constants';
+export { BubbleSettings, ChartInterface, DataByColumns, DendroSettings, DiscreteSettings, HeatmapSettings, HistogramSettings, MiPlots, ScatterplotSettings, ScatterplotUmapSettings, Settings, AxisSettingsDiscrete, AxisSettingsContinuous, SCATTERPLOT_CONTROLS_EVENTS, LassoControlsState, Polygon, ErrorInfo, ErrorInfoUnknown };

package/dist/index.js

@@ -1,7 +1,7 @@
-import { MiPlots as S } from "./MiPlots.js";
-import { SCATTERPLOT_LASSO_EVENTS as t } from "./scatterplot-umap/constants.js";
+import { MiPlots as r } from "./MiPlots.js";
+import { SCATTERPLOT_CONTROLS_EVENTS as E } from "./scatterplot-umap/constants.js";
 export {
-  S as MiPlots,
-  t as SCATTERPLOT_LASSO_EVENTS
+  r as MiPlots,
+  E as SCATTERPLOT_CONTROLS_EVENTS
 };
 //# sourceMappingURL=index.js.map

package/dist/scatterplot-umap/ChartRenderer.d.ts

@@ -53,14 +53,15 @@ declare class ChartRenderer {
     createMainTitle(title: ScatterplotUmapSettingsImpl['chartSettings']['title']): void;
     updateMargins(xAxis: ScatterplotUmapSettingsImpl['chartSettings']['xAxis'], yAxis: ScatterplotUmapSettingsImpl['chartSettings']['yAxis']): void;
     updateLegendSize(legend: ScatterplotUmapSettingsImpl['chartSettings']['legend'], legendLabels: ScatterplotUmapLegendInfo, grouping: ColumnName[], layers: ScatterplotUmapLayer[]): void;
-    initSettings(dots: Dot[], chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], dotExtents: DotsExtents, legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers'], grouping: ColumnName[]): void;
+    initSettings(dots: Dot[], chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], dotExtents: DotsExtents, legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers'], grouping: ColumnName[], onZoomChange: (v: boolean) => void): void;
+    resetZoom(xAxis: ScatterplotUmapSettingsImpl['chartSettings']['xAxis'], yAxis: ScatterplotUmapSettingsImpl['chartSettings']['yAxis'], dotsExtents?: DotsExtents): void;
     updateAes(legendInfo: ScatterplotUmapLegendInfo, layers: ScatterplotUmapSettingsImpl['layers']): void;
     updatePointSize(): void;
     updateByLasso(): void;
     createQuadtree(dots: Dot[]): KDBush;
     getClosestDot(_x: number, _y: number): Dot | null;
     updateDots(dots: Dot[]): void;
-    render(dataFrame: DataFrame, settingsId: string, chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], keyColumn: ColumnName | null, dots: Dot[], dotExtents: DotsExtents, dotsByGrouping: Record<string, Dot[]>, layers: ScatterplotUmapSettingsImpl['layers'], legendInfo: ScatterplotUmapLegendInfo, grouping: ColumnName[], onPolygonUpdateOutside: ScatterplotEventHandlers['onPolygonUpdate'], onTooltipHintSwitch: (v: boolean) => void, onLassoControlsStateUpdate: (v: LassoControlsState) => void): void;
+    render(dataFrame: DataFrame, settingsId: string, chartSettings: ScatterplotUmapSettingsImpl['chartSettings'], keyColumn: ColumnName | null, dots: Dot[], dotExtents: DotsExtents, dotsByGrouping: Record<string, Dot[]>, layers: ScatterplotUmapSettingsImpl['layers'], legendInfo: ScatterplotUmapLegendInfo, grouping: ColumnName[], onPolygonUpdateOutside: ScatterplotEventHandlers['onPolygonUpdate'], onTooltipHintSwitch: (v: boolean) => void, onLassoControlsStateUpdate: (v: LassoControlsState) => void, onZoomChange: (v: boolean) => void): void;
     renderWebglLayer(): void;
     onPolygonUpdate: (p: Polygon[]) => void;
     renderSvgLayer(): void;

package/dist/scatterplot-umap/ChartRenderer.js

@@ -1,19 +1,19 @@
 var k = Object.defineProperty;
-var X = (f, t, e) => t in f ? k(f, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[t] = e;
-var h = (f, t, e) => X(f, typeof t != "symbol" ? t + "" : t, e);
-import { j as C } from "../_virtual/jsx-runtime.js";
+var X = (y, t, e) => t in y ? k(y, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : y[t] = e;
+var h = (y, t, e) => X(y, typeof t != "symbol" ? t + "" : t, e);
+import { j as N } from "../_virtual/jsx-runtime.js";
 import K from "../node_modules/.pnpm/@d3fc_d3fc-chart@5.1.9_d3-array@3.2.4_d3-path@3.1.0_d3-scale-chromatic@3.1.0_d3-scale@4.0.2_d_kyhwsugamw24x7v3obvyiw5jfe/node_modules/@d3fc/d3fc-chart/src/cartesian.js";
 import { seriesWebglPoint as Y, seriesSvgMulti as j, seriesWebglMulti as q } from "@d3fc/d3fc-series";
 import $ from "../node_modules/.pnpm/d3-zoom@3.0.0/node_modules/d3-zoom/src/zoom.js";
-import "../node_modules/.pnpm/d3-zoom@3.0.0/node_modules/d3-zoom/src/transform.js";
-import { c as Q } from "../_virtual/client.js";
+import { identity as Q } from "../node_modules/.pnpm/d3-zoom@3.0.0/node_modules/d3-zoom/src/transform.js";
+import { c as Z } from "../_virtual/client.js";
 import { Error as J } from "../common/Error.js";
-import { BLACK as A, DEFAULT_HEIGHT as E, DEFAULT_WIDTH as w, TITLE_LINE_HEIGHT as Z, MIN_LEGEND_GRADIENT_HEIGHT as tt, MAX_LEGEND_GRADIENT_HEIGHT as et, MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as it, TITLE_MARGIN as st } from "../constants.js";
-import { splitTextByWidth as ot } from "../utils/splitTextByWidth.js";
-import { MIN_MARGIN as L, DEFAULT_DOT_AES as P } from "../scatterplot/constants.js";
+import { BLACK as A, DEFAULT_HEIGHT as E, DEFAULT_WIDTH as w, TITLE_LINE_HEIGHT as tt, MIN_LEGEND_GRADIENT_HEIGHT as et, MAX_LEGEND_GRADIENT_HEIGHT as it, MAX_SHOWN_UNIQUE_VALUES_IN_LABELS as st, TITLE_MARGIN as ot } from "../constants.js";
+import { splitTextByWidth as at } from "../utils/splitTextByWidth.js";
+import { MIN_MARGIN as T, DEFAULT_DOT_AES as P } from "../scatterplot/constants.js";
 import { createAesGetter as M } from "../scatterplot/utils/createAesGetter.js";
-import { getTicksAndFormat as at } from "../scatterplot/utils/getTicksAndFormat.js";
-import { createLabelPositioner as nt } from "../scatterplot/utils/getVisibleLabels.js";
+import { getTicksAndFormat as nt } from "../scatterplot/utils/getTicksAndFormat.js";
+import { createLabelPositioner as rt } from "../scatterplot/utils/getVisibleLabels.js";
 import { isContinuousAes as R } from "../types/common.js";
 import "../types/discrete.js";
 import "../types/scatterplot.js";
@@ -21,48 +21,48 @@ import "../types/heatmap.js";
 import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
-import { getContinuousColorScale as rt } from "../utils/getContinuousColorScale.js";
-import { getContinuousLegendTicks as lt } from "../utils/getContinuousLegendTicks.js";
+import { getContinuousColorScale as lt } from "../utils/getContinuousColorScale.js";
+import { getContinuousLegendTicks as ht } from "../utils/getContinuousLegendTicks.js";
 import { TextMeasurer as I } from "../utils/TextMeasurer/TextMeasurer.js";
-import { SVGLayer as ht } from "./components/SVGLayer.js";
-import { PADDINGS as D, TITLE_LINE as _, LEGEND_OFFSET as ct } from "./constants.js";
+import { SVGLayer as ct } from "./components/SVGLayer.js";
+import { PADDINGS as D, TITLE_LINE as _, LEGEND_OFFSET as dt } from "./constants.js";
 import "../node_modules/.pnpm/@d3fc_d3fc-webgl@3.2.1_d3-scale@4.0.2_d3-shape@3.2.0/node_modules/@d3fc/d3fc-webgl/src/scale/scaleMapper.js";
-import dt from "../node_modules/.pnpm/@d3fc_d3fc-webgl@3.2.1_d3-scale@4.0.2_d3-shape@3.2.0/node_modules/@d3fc/d3fc-webgl/src/style/fillColor.js";
-import mt from "../node_modules/.pnpm/@d3fc_d3fc-pointer@3.0.3_d3-dispatch@3.0.1_d3-selection@3.0.0/node_modules/@d3fc/d3fc-pointer/src/pointer.js";
-import pt from "../node_modules/.pnpm/kdbush@4.0.2/node_modules/kdbush/index.js";
-import { DataFrameProvider as gt } from "../common/useDataFrame.js";
-import { DataFrame as ut } from "../DataFrame.js";
-import { arrangeLegendParts as ft } from "../utils/arrangeLegendParts.js";
+import mt from "../node_modules/.pnpm/@d3fc_d3fc-webgl@3.2.1_d3-scale@4.0.2_d3-shape@3.2.0/node_modules/@d3fc/d3fc-webgl/src/style/fillColor.js";
+import pt from "../node_modules/.pnpm/@d3fc_d3fc-pointer@3.0.3_d3-dispatch@3.0.1_d3-selection@3.0.0/node_modules/@d3fc/d3fc-pointer/src/pointer.js";
+import gt from "../node_modules/.pnpm/kdbush@4.0.2/node_modules/kdbush/index.js";
+import { DataFrameProvider as ut } from "../common/useDataFrame.js";
+import { DataFrame as ft } from "../DataFrame.js";
+import { arrangeLegendParts as yt } from "../utils/arrangeLegendParts.js";
 import { stringToNumberRgba as W, getColorWithFakeOpacity as G, GET_BLACK as O } from "./colors.js";
-import T from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/linear.js";
+import b from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/linear.js";
 import U from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/log.js";
-import N from "../node_modules/.pnpm/d3-selection@3.0.0/node_modules/d3-selection/src/select.js";
-import yt from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/ordinal.js";
-import St from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/symlog.js";
-import { sqrt as xt } from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/pow.js";
+import C from "../node_modules/.pnpm/d3-selection@3.0.0/node_modules/d3-selection/src/select.js";
+import St from "../node_modules/.pnpm/d3-scale@4.0.2/node_modules/d3-scale/src/ordinal.js";
+import xt 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";
 import vt from "../node_modules/.pnpm/d3-polygon@3.0.1/node_modules/d3-polygon/src/contains.js";
-function V(f) {
-  return f / 2.35 * (f / 2.35) * 64;
+function V(y) {
+  return y / 2.35 * (y / 2.35) * 64;
 }
-function H(f, t, e) {
-  return e.length === 0 ? !0 : e.some((i) => i.closed && i.points.length > 2 && vt(i.points, [f, t]));
+function H(y, t, e) {
+  return e.length === 0 ? !0 : e.some((i) => i.closed && i.points.length > 2 && vt(i.points, [y, t]));
 }
-function B(f, t, e) {
-  const i = e.find((a) => a.type === "dots"), l = e.find((a) => a.type === "curve");
+function B(y, t, e) {
+  const i = e.find((o) => o.type === "dots"), n = e.find((o) => o.type === "curve");
   return {
-    dotFill: M(f, t, (i == null ? void 0 : i.aes.dotFill) ?? P.color, "dotFill"),
-    dotSize: M(f, t, (i == null ? void 0 : i.aes.dotSize) ?? P.size, "dotSize"),
-    lineType: M(f, t, (l == null ? void 0 : l.aes.lineShape) ?? "solid", "lineShape")
+    dotFill: M(y, t, (i == null ? void 0 : i.aes.dotFill) ?? P.color, "dotFill"),
+    dotSize: M(y, t, (i == null ? void 0 : i.aes.dotSize) ?? P.size, "dotSize"),
+    lineType: M(y, t, (n == null ? void 0 : n.aes.lineShape) ?? "solid", "lineShape")
   };
 }
-class le {
+class he {
   constructor() {
     h(this, "reactRoot", null);
     h(this, "parentNode", null);
     h(this, "rootNode", null);
     h(this, "canvasNode", null);
     h(this, "svgLayerElement", null);
-    h(this, "svgLayerComponent", /* @__PURE__ */ C.jsx(C.Fragment, {}));
+    h(this, "svgLayerComponent", /* @__PURE__ */ N.jsx(N.Fragment, {}));
     h(this, "aesGetters", {
       dotSize: () => 2,
       dotFill: () => A,
@@ -70,10 +70,10 @@ class le {
     });
     h(this, "tools", null);
     h(this, "margins", {
-      top: L,
-      bottom: L,
-      left: L,
-      right: L
+      top: T,
+      bottom: T,
+      left: T,
+      right: T
     });
     h(this, "chartSizes", {
       chartWidth: w,
@@ -86,10 +86,10 @@ class le {
       // width of all charts in charts height, plus bottom axis, plus top title
     });
     h(this, "scales", {
-      x: T().domain([0, 10]).range([0, w]),
-      y: T().domain([0, 10]).range([E, 0]),
-      xOriginal: T().domain([0, 10]).range([0, w]),
-      yOriginal: T().domain([0, 10]).range([E, 0])
+      x: b().domain([0, 10]).range([0, w]),
+      y: b().domain([0, 10]).range([E, 0]),
+      xOriginal: b().domain([0, 10]).range([0, w]),
+      yOriginal: b().domain([0, 10]).range([E, 0])
     });
     h(this, "polygons", []);
     h(this, "onPolygonUpdateOutside", () => {
@@ -111,7 +111,7 @@ class le {
     h(this, "notCalculatedProps", {});
     h(this, "allDots", []);
     h(this, "visibleLabels", []);
-    h(this, "dataFrame", new ut("", {}));
+    h(this, "dataFrame", new ft("", {}));
     h(this, "onPolygonUpdate", (t) => {
       this.polygons = t, this.updateByLasso();
       const e = this.allDots.filter((i) => H(i.x, i.y, this.polygons)).map((i) => i.idx);
@@ -126,206 +126,211 @@ class le {
     });
   }
   init(t) {
-    this.parentNode === null && (this.parentNode = t, this.rootNode = document.createElement("div"), this.canvasNode = document.createElement("div"), this.parentNode.appendChild(this.rootNode), this.parentNode.appendChild(this.canvasNode), this.reactRoot = Q.createRoot(this.rootNode));
+    this.parentNode === null && (this.parentNode = t, this.rootNode = document.createElement("div"), this.canvasNode = document.createElement("div"), this.parentNode.appendChild(this.rootNode), this.parentNode.appendChild(this.canvasNode), this.reactRoot = Z.createRoot(this.rootNode));
   }
   updateChartSizes(t) {
     (t.width !== this.chartSizes.chartWidth || t.height !== this.chartSizes.chartHeight) && (this.chartSizes.chartWidth = t.width, this.chartSizes.chartHeight = t.height, this.scales.x.range([0, this.chartSizes.chartWidth]), this.scales.y.range([this.chartSizes.chartHeight, 0]));
   }
   updateViewport(t, e, i) {
-    const l = t.scale === "log" ? U() : T();
-    let { minX: a, minY: c, maxX: d, maxY: p } = i;
-    if (t.lowerValue !== void 0 && (a = Math.max(a, t.lowerValue)), t.upperValue !== void 0 && (d = Math.min(d, t.upperValue)), e.lowerValue !== void 0 && (c = Math.max(c, e.lowerValue)), e.upperValue !== void 0 && (p = Math.min(p, e.upperValue)), t.symmetricRange !== void 0) {
-      const n = t.symmetricRange;
-      if (n >= a && n <= d) {
-        const g = Math.max(n - a, d - n);
-        a = n - g, d = n + g;
+    const n = t.scale === "log" ? U() : b();
+    let { minX: o, minY: c, maxX: d, maxY: m } = i;
+    if (t.lowerValue !== void 0 && (o = Math.max(o, t.lowerValue)), t.upperValue !== void 0 && (d = Math.min(d, t.upperValue)), e.lowerValue !== void 0 && (c = Math.max(c, e.lowerValue)), e.upperValue !== void 0 && (m = Math.min(m, e.upperValue)), t.symmetricRange !== void 0) {
+      const a = t.symmetricRange;
+      if (a >= o && a <= d) {
+        const u = Math.max(a - o, d - a);
+        o = a - u, d = a + u;
       }
     }
     if (typeof e.symmetricRange < "u") {
-      const n = e.symmetricRange;
-      if (n >= c && n <= p) {
-        const g = Math.max(n - c, p - n);
-        c = n - g, p = n + g;
+      const a = e.symmetricRange;
+      if (a >= c && a <= m) {
+        const u = Math.max(a - c, m - a);
+        c = a - u, m = a + u;
       }
     }
-    const u = [0, this.chartSizes.chartWidth], y = l.copy().domain([a, d]).range([D.LEFT, this.chartSizes.chartWidth - D.RIGHT]);
-    l.domain([y.invert(0), y.invert(this.chartSizes.chartWidth)]).range(u).nice(), this.scales.x = l, this.scales.xOriginal = l.copy();
-    const S = e.scale === "log" ? U() : T(), m = [this.chartSizes.chartHeight, 0], r = S.copy().domain([c, p]).range([this.chartSizes.chartHeight - D.BOTTOM, D.TOP]);
-    S.domain([r.invert(this.chartSizes.chartHeight), r.invert(0)]).range(m).nice(), this.scales.y = S, this.scales.yOriginal = S.copy();
+    const f = [0, this.chartSizes.chartWidth], S = n.copy().domain([o, d]).range([D.LEFT, this.chartSizes.chartWidth - D.RIGHT]);
+    n.domain([S.invert(0), S.invert(this.chartSizes.chartWidth)]).range(f).nice(), this.scales.x.domain(n.domain()), this.scales.xOriginal.domain(n.domain());
+    const x = e.scale === "log" ? U() : b(), p = [this.chartSizes.chartHeight, 0], r = x.copy().domain([c, m]).range([this.chartSizes.chartHeight - D.BOTTOM, D.TOP]);
+    x.domain([r.invert(this.chartSizes.chartHeight), r.invert(0)]).range(p).nice(), this.scales.y.domain(x.domain()), this.scales.yOriginal.domain(x.domain());
   }
   updateCaptionsSize() {
     const t = new I("600 14px Arial");
     function e(c) {
       return Math.max(...c.map((d) => t.getTextWidth(d)));
     }
-    const { ticks: i, format: l } = at(this.scales.y, !1), a = e(i.map(l));
+    const { ticks: i, format: n } = nt(this.scales.y, !1), o = e(i.map(n));
     this.captionsSizes = {
       xAxisCaptionsWidth: 20,
-      yAxisCaptionsWidth: a
+      yAxisCaptionsWidth: o
     };
   }
   createMainTitle(t) {
-    this.mainTitle = ot(
+    this.mainTitle = at(
       t.name,
       this.chartSizes.totalWidth - this.margins.left - this.margins.right,
       20
     );
   }
   updateMargins(t, e) {
-    const i = Z * this.mainTitle.length, l = i > 0 ? i + st * 2 : 0;
+    const i = tt * this.mainTitle.length, n = i > 0 ? i + ot * 2 : 0;
     this.margins = {
-      top: Math.max(l, L),
-      bottom: L + (t.hiddenLabels ? 0 : this.captionsSizes.xAxisCaptionsWidth) + _,
-      left: L + (e.hiddenLabels ? 0 : this.captionsSizes.yAxisCaptionsWidth) + _,
-      right: this.legend.width + L
-    }, this.chartSizes.totalWidth = this.margins.left + this.chartSizes.chartWidth + this.margins.right, this.chartSizes.totalHeight = this.margins.top + Math.max(this.chartSizes.chartHeight, this.legend.height) + this.margins.bottom, N(this.canvasNode).style("width", this.chartSizes.chartWidth + "px").style("height", this.chartSizes.chartHeight + "px").style("top", this.margins.top + "px").style("left", this.margins.left + "px");
+      top: Math.max(n, T),
+      bottom: T + (t.hiddenLabels ? 0 : this.captionsSizes.xAxisCaptionsWidth) + _,
+      left: T + (e.hiddenLabels ? 0 : this.captionsSizes.yAxisCaptionsWidth) + _,
+      right: this.legend.width + T
+    }, this.chartSizes.totalWidth = this.margins.left + this.chartSizes.chartWidth + this.margins.right, this.chartSizes.totalHeight = this.margins.top + Math.max(this.chartSizes.chartHeight, this.legend.height) + this.margins.bottom, C(this.canvasNode).style("width", this.chartSizes.chartWidth + "px").style("height", this.chartSizes.chartHeight + "px").style("top", this.margins.top + "px").style("left", this.margins.left + "px");
   }
-  updateLegendSize(t, e, i, l) {
+  updateLegendSize(t, e, i, n) {
     if (!t.show) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const a = [], c = { width: 0, height: 0, left: 0, top: 0 }, d = Math.min(
-      Math.max(this.chartSizes.chartHeight, tt),
-      et
-    ), p = Math.max(this.chartSizes.chartHeight, d);
-    if (i.forEach((m) => {
-      const r = e[m.value];
+    const o = [], c = { width: 0, height: 0, left: 0, top: 0 }, d = Math.min(
+      Math.max(this.chartSizes.chartHeight, et),
+      it
+    ), m = Math.max(this.chartSizes.chartHeight, d);
+    if (i.forEach((p) => {
+      const r = e[p.value];
       if (r.usedAes.length === 0 || !r.aesMap)
         return;
-      if (r.values.length > it) {
+      if (r.values.length > st) {
         console.warn(`Too many values for discrete legend (${r.values.length})`);
         return;
       }
-      const n = {};
-      r.values.forEach((s) => {
-        n[s] || (n[s] = { ...P }), r.usedAes.forEach((o) => {
-          o === "dotFill" && (n[s].color = r.aesMap(s, o) ?? A), o === "dotSize" && (n[s].size = Number(r.aesMap(s, o) ?? 3));
+      const a = {};
+      r.values.forEach((g) => {
+        a[g] || (a[g] = { ...P }), r.usedAes.forEach((s) => {
+          s === "dotFill" && (a[g].color = r.aesMap(g, s) ?? A), s === "dotSize" && (a[g].size = Number(r.aesMap(g, s) ?? 3));
         });
       });
-      const g = m.label ?? m.value, x = yt().domain(r.values).range(r.values.map((s) => n[s]));
-      a.push({ ...c, id: m.value, type: "dots", title: g, scale: x, values: r.values, labels: r.labels });
-    }), l.forEach((m) => {
-      if (m.type === "dots" && R(m.aes.dotFill)) {
-        const { domain: r, range: n, columnName: g, type: x = "linear" } = m.aes.dotFill, s = g.label ?? g.value, o = rt(n, r, "linear"), v = (x === "log" ? St() : T()).domain(r).range([d, 0]), z = lt(v, r);
-        a.push({ ...c, id: "dotFill", type: "continuous", title: s, scale: o, tickPositionScale: v, values: z });
+      const u = p.label ?? p.value, z = St().domain(r.values).range(r.values.map((g) => a[g]));
+      o.push({ ...c, id: p.value, type: "dots", title: u, scale: z, values: r.values, labels: r.labels });
+    }), n.forEach((p) => {
+      if (p.type === "dots" && R(p.aes.dotFill)) {
+        const { domain: r, range: a, columnName: u, type: z = "linear" } = p.aes.dotFill, g = u.label ?? u.value, s = lt(a, r, "linear"), l = (z === "log" ? xt() : b()).domain(r).range([d, 0]), L = ht(l, r);
+        o.push({ ...c, id: "dotFill", type: "continuous", title: g, scale: s, tickPositionScale: l, values: L });
       }
-      if (m.type === "dots" && R(m.aes.dotSize)) {
-        const { columnName: r, domain: n, range: g } = m.aes.dotSize, x = r.label ?? r.value, s = xt(n, g), o = s.ticks(3), v = s.tickFormat(3), z = o.reduce((b, F) => (b[String(F)] = v(F), b), {});
-        a.push({ ...c, id: r.value, type: "size", title: x, scale: s, values: o, labels: z });
+      if (p.type === "dots" && R(p.aes.dotSize)) {
+        const { columnName: r, domain: a, range: u } = p.aes.dotSize, z = r.label ?? r.value, g = zt(a, u), s = g.ticks(3), l = g.tickFormat(3), L = s.reduce((v, F) => (v[String(F)] = l(F), v), {});
+        o.push({ ...c, id: r.value, type: "size", title: z, scale: g, values: s, labels: L });
       }
-    }), !a.length) {
+    }), !o.length) {
       this.legend = { width: 0, height: 0, items: [] };
       return;
     }
-    const u = ft(a, p, d), y = u[u.length - 1], S = y.left + y.width + ct;
+    const f = yt(o, m, d), S = f[f.length - 1], x = S.left + S.width + dt;
     this.legend = {
-      width: S,
-      height: p,
-      items: u
+      width: x,
+      height: m,
+      items: f
     };
   }
-  initSettings(t, e, i, l, a, c) {
-    const { xAxis: d, yAxis: p, size: u, title: y, legend: S } = e;
-    this.updateChartSizes(u), this.updateViewport(d, p, i), this.updateCaptionsSize(), this.updateLegendSize(S, l, c, a), this.createMainTitle(y), this.updateMargins(d, p), this.aesGetters = B(this.dataFrame, l, a);
-    const m = dt().data(t).value((s) => {
-      const o = W(this.aesGetters.dotFill(s.idx));
-      return o[3] = !s.dimmed && H(s.x, s.y, this.polygons) ? 1 : 0.4, G(o, o);
-    }), r = Y().equals((s, o) => s === o).size((s) => V(this.aesGetters.dotSize(s.idx))).crossValue((s) => s.x).mainValue((s) => s.y).decorate((s) => m(s)), n = $().scaleExtent([0.1, 1e3]).filter((s) => s.type === "wheel" || s.metaKey || s.ctrlKey).on("start", () => {
+  initSettings(t, e, i, n, o, c, d) {
+    const { xAxis: m, yAxis: f, size: S, title: x, legend: p } = e;
+    this.updateChartSizes(S), this.updateViewport(m, f, i), this.updateCaptionsSize(), this.updateLegendSize(p, n, c, o), this.createMainTitle(x), this.updateMargins(m, f), this.aesGetters = B(this.dataFrame, n, o);
+    const r = mt().data(t).value((s) => {
+      const l = W(this.aesGetters.dotFill(s.idx));
+      return l[3] = !s.dimmed && H(s.x, s.y, this.polygons) ? 1 : 0.4, G(l, l);
+    }), a = Y().equals((s, l) => s === l).size((s) => V(this.aesGetters.dotSize(s.idx))).crossValue((s) => s.x).mainValue((s) => s.y).decorate((s) => r(s)), u = $().scaleExtent([0.1, 1e3]).filter((s) => s.type === "wheel" || s.metaKey || s.ctrlKey).on("start", () => {
       this.selectedDot = null;
     }).on("zoom", (s) => {
-      const o = s.transform, v = o.rescaleX(this.scales.xOriginal), z = o.rescaleY(this.scales.yOriginal);
-      this.scales.x.domain(v.domain()), this.scales.y.domain(z.domain()), this.zoomTransform = o, this.zoomStateKey = `${o.x}_${o.y}_${o.k}`, this.updateLabelsPosition(this.visibleLabels), this.renderSvgLayer(), this.renderWebglLayer();
+      const l = s.transform, L = l.rescaleX(this.scales.xOriginal), v = l.rescaleY(this.scales.yOriginal);
+      this.scales.x.domain(L.domain()), this.scales.y.domain(v.domain()), this.zoomTransform = l, this.zoomStateKey = `${l.x}_${l.y}_${l.k}`, this.updateLabelsPosition(this.visibleLabels), this.renderSvgLayer(), this.renderWebglLayer();
     }).on("end", () => {
-      this.visibleLabels = this.computeLabels(this.allDots), this.renderSvgLayer();
-    }), g = mt().on("point", ([s]) => {
-      var z;
-      let o;
-      s && (o = this.getClosestDot(s.x, s.y));
-      const v = this.selectedDot && !o || !this.selectedDot && o || ((z = this.selectedDot) == null ? void 0 : z.idx) !== (o == null ? void 0 : o.idx);
-      this.selectedDot = o ?? null, v && this.renderSvgLayer();
-    }), x = K({
+      this.visibleLabels = this.computeLabels(this.allDots), this.renderSvgLayer(), d(!0);
+    }), z = pt().on("point", ([s]) => {
+      var v;
+      let l;
+      s && (l = this.getClosestDot(s.x, s.y));
+      const L = this.selectedDot && !l || !this.selectedDot && l || ((v = this.selectedDot) == null ? void 0 : v.idx) !== (l == null ? void 0 : l.idx);
+      this.selectedDot = l ?? null, L && this.renderSvgLayer();
+    }), g = K({
       xScale: this.scales.x,
       yScale: this.scales.y
     }).xAxisHeight(() => "0").yAxisWidth(() => "0").svgPlotArea(j()).webglPlotArea(
       // only render the point series on the WebGL layer
-      q().series([r]).mapping((s) => s)
+      q().series([a]).mapping((s) => s)
     ).decorate((s) => {
-      const o = s.enter();
-      o && !this.svgLayerElement && (o.style("grid-template-columns", "0 auto 1fr auto 0"), o.style("grid-template-rows", "0 auto 1fr auto 0"), this.svgLayerElement = o.select(".svg-plot-area.plot-area svg").node()), o.select(".svg-plot-area.plot-area").attr("class", "svg-plot-area plot-area miplots-scatterplot-plot-area").call(n).call(g);
+      const l = s.enter();
+      l && !this.svgLayerElement && (l.style("grid-template-columns", "0 auto 1fr auto 0"), l.style("grid-template-rows", "0 auto 1fr auto 0"), this.svgLayerElement = l.select(".svg-plot-area.plot-area svg").node()), l.select(".svg-plot-area.plot-area").attr("class", "svg-plot-area plot-area miplots-scatterplot-plot-area").call(u).call(z);
     });
     this.tools = {
-      webglChart: x,
-      zoom: n,
-      fillColor: m,
-      pointSeries: r
-    }, N(this.canvasNode).datum(t).style("position", "absolute").style("width", this.chartSizes.chartWidth + "px").style("height", this.chartSizes.chartHeight + "px").style("top", this.margins.top + "px").style("left", this.margins.left + "px");
+      webglChart: g,
+      zoom: u,
+      fillColor: r,
+      pointSeries: a
+    }, C(this.canvasNode).datum(t).style("position", "absolute").style("width", this.chartSizes.chartWidth + "px").style("height", this.chartSizes.chartHeight + "px").style("top", this.margins.top + "px").style("left", this.margins.left + "px");
+  }
+  resetZoom(t, e, i) {
+    var n;
+    !((n = this.tools) != null && n.zoom) || !i || (this.updateViewport(t, e, i), C(".miplots-scatterplot-plot-area").call(this.tools.zoom.transform, Q));
   }
   updateAes(t, e) {
     this.tools !== null && (this.aesGetters = B(this.dataFrame, t, e), this.tools.fillColor.value((i) => {
-      const l = this.aesGetters.dotFill ?? O, a = W(l(i.idx));
-      return a[3] = !i.dimmed && H(i.x, i.y, this.polygons) ? 1 : 0.4, G(a, a);
+      const n = this.aesGetters.dotFill ?? O, o = W(n(i.idx));
+      return o[3] = !i.dimmed && H(i.x, i.y, this.polygons) ? 1 : 0.4, G(o, o);
     }));
   }
   updatePointSize() {
-    this.tools !== null && (N(this.canvasNode).datum([...this.allDots]), this.tools.pointSeries.size((t) => V(this.aesGetters.dotSize(t.data))));
+    this.tools !== null && (C(this.canvasNode).datum([...this.allDots]), this.tools.pointSeries.size((t) => V(this.aesGetters.dotSize(t.data))));
   }
   updateByLasso() {
     var t;
     this.tools !== null && ((t = this.tools) == null || t.fillColor.value((e) => {
-      const i = this.aesGetters.dotFill ?? O, l = W(i(e.idx));
-      return l[3] = !e.dimmed && H(e.x, e.y, this.polygons) ? 1 : 0.4, G(l, l);
+      const i = this.aesGetters.dotFill ?? O, n = W(i(e.idx));
+      return n[3] = !e.dimmed && H(e.x, e.y, this.polygons) ? 1 : 0.4, G(n, n);
     }), this.renderWebglLayer());
   }
   createQuadtree(t) {
-    const e = new pt(t.length, 512);
+    const e = new gt(t.length, 512);
     for (let i = 0; i < t.length; i++)
       e.add(t[i].x, t[i].y);
     return e.finish();
   }
   getClosestDot(t, e) {
-    var n, g;
-    const i = (n = this.tools) == null ? void 0 : n.qt;
+    var a, u;
+    const i = (a = this.tools) == null ? void 0 : a.qt;
     if (!i) return null;
-    const l = this.allDots, a = this.scales.x.invert(t), c = this.scales.y.invert(e), d = 1 / (((g = this.zoomTransform) == null ? void 0 : g.k) || 1), p = a - d, u = a + d, y = c - d, S = c + d, m = i.range(p, y, u, S), r = m.reduce((x, s) => {
-      const o = l[s], v = this.scales.x(o.x) - t, z = this.scales.y(o.y) - e, b = Math.hypot(v, z);
-      return (x === null || b < x.distance) && (x.index = s, x.distance = b), x;
+    const n = this.allDots, o = this.scales.x.invert(t), c = this.scales.y.invert(e), d = 1 / (((u = this.zoomTransform) == null ? void 0 : u.k) || 1), m = o - d, f = o + d, S = c - d, x = c + d, p = i.range(m, S, f, x), r = p.reduce((z, g) => {
+      const s = n[g], l = this.scales.x(s.x) - t, L = this.scales.y(s.y) - e, v = Math.hypot(l, L);
+      return (z === null || v < z.distance) && (z.index = g, z.distance = v), z;
     }, {
       index: -1,
       distance: 1 / 0
     });
-    return m.length === 0 || r.index === -1 ? null : l[r.index];
+    return p.length === 0 || r.index === -1 ? null : n[r.index];
   }
   updateDots(t) {
-    this.tools !== null && (N(this.canvasNode).datum(t), this.tools.fillColor.data(t), this.tools.qt = this.createQuadtree(t), this.allDots = t);
+    this.tools !== null && (C(this.canvasNode).datum(t), this.tools.fillColor.data(t), this.tools.qt = this.createQuadtree(t), this.allDots = t);
   }
-  render(t, e, i, l, a, c, d, p, u, y, S, m, r) {
+  render(t, e, i, n, o, c, d, m, f, S, x, p, r, a) {
     this.dataFrame = t;
-    const n = i.size.width !== this.chartSizes.chartWidth || i.size.height !== this.chartSizes.chartHeight;
+    const u = i.size.width !== this.chartSizes.chartWidth || i.size.height !== this.chartSizes.chartHeight;
     if (this.tools === null)
       this.initSettings(
-        a,
+        o,
         i,
         c,
-        u,
-        p,
-        y
+        f,
+        m,
+        S,
+        a
       );
     else {
-      const { title: g, legend: x, size: s } = i;
-      this.updateChartSizes(s), this.updateLegendSize(x, u, y, p), this.createMainTitle(g), this.updateMargins(i.xAxis, i.yAxis), this.updateAes(u, p);
+      const { title: z, legend: g, size: s } = i;
+      this.updateChartSizes(s), this.updateLegendSize(g, f, S, m), this.createMainTitle(z), this.updateMargins(i.xAxis, i.yAxis), this.updateAes(f, m);
     }
-    this.onPolygonUpdateOutside = S, this.onTooltipHintSwitch = m, this.onLassoControlsStateUpdate = r, this.allDots !== a ? (this.updateDots(a), this.visibleLabels = this.computeLabels(a)) : n && (this.visibleLabels = this.computeLabels(a)), this.notCalculatedProps = {
+    this.onPolygonUpdateOutside = x, this.onTooltipHintSwitch = p, this.onLassoControlsStateUpdate = r, this.allDots !== o ? (this.updateDots(o), this.visibleLabels = this.computeLabels(o)) : u && (this.visibleLabels = this.computeLabels(o)), this.notCalculatedProps = {
       settingsId: e,
       chartSettings: i,
-      keyColumn: l,
+      keyColumn: n,
       dotsByGrouping: d,
-      layers: p
+      layers: m
     }, this.renderWebglLayer(), this.renderSvgLayer();
   }
   renderWebglLayer() {
     var t, e;
-    (t = this.tools) != null && t.webglChart && N(this.canvasNode).call((e = this.tools) == null ? void 0 : e.webglChart);
+    (t = this.tools) != null && t.webglChart && C(this.canvasNode).call((e = this.tools) == null ? void 0 : e.webglChart);
   }
   renderSvgLayer() {
     var e;
@@ -351,32 +356,32 @@ class le {
       onTooltipHintSwitch: this.onTooltipHintSwitch,
       onLassoControlsStateUpdate: this.onLassoControlsStateUpdate
     };
-    this.svgLayerComponent = /* @__PURE__ */ C.jsx(gt, { dataFrame: this.dataFrame, children: /* @__PURE__ */ C.jsx(ht, { ...t }) }), (e = this.reactRoot) == null || e.render(this.svgLayerComponent);
+    this.svgLayerComponent = /* @__PURE__ */ N.jsx(ut, { dataFrame: this.dataFrame, children: /* @__PURE__ */ N.jsx(ct, { ...t }) }), (e = this.reactRoot) == null || e.render(this.svgLayerComponent);
   }
   renderError(t) {
     var e;
-    (e = this.reactRoot) == null || e.render(/* @__PURE__ */ C.jsx(J, { message: t }));
+    (e = this.reactRoot) == null || e.render(/* @__PURE__ */ N.jsx(J, { message: t }));
   }
   computeLabels(t) {
-    const e = new I("16px Manrope"), i = nt(this.chartSizes.chartWidth, this.chartSizes.chartHeight), l = [];
-    for (let a = 0; a < t.length; a++) {
-      const c = t[a];
+    const e = new I("16px Manrope"), i = rt(this.chartSizes.chartWidth, this.chartSizes.chartHeight), n = [];
+    for (let o = 0; o < t.length; o++) {
+      const c = t[o];
       if (c.label == null)
         continue;
-      const d = String(c.label), p = e.getTextMetrics(d), u = this.scales.x(c.x), y = this.scales.y(c.y), S = p.width, m = p.actualBoundingBoxAscent + p.actualBoundingBoxDescent, r = 10, n = i(u, y, S, m, r);
-      n && l.push({
-        x: u,
-        y,
+      const d = String(c.label), m = e.getTextMetrics(d), f = this.scales.x(c.x), S = this.scales.y(c.y), x = m.width, p = m.actualBoundingBoxAscent + m.actualBoundingBoxDescent, r = 10, a = i(f, S, x, p, r);
+      a && n.push({
+        x: f,
+        y: S,
         dot: c,
         name: d,
-        width: S,
-        height: m,
+        width: x,
+        height: p,
         padding: r,
-        xPosition: n[0],
-        yPosition: n[1]
+        xPosition: a[0],
+        yPosition: a[1]
       });
     }
-    return l;
+    return n;
   }
   updateLabelsPosition(t) {
     for (let e = 0; e < t.length; e++) {
@@ -386,6 +391,6 @@ class le {
   }
 }
 export {
-  le as default
+  he as default
 };
 //# sourceMappingURL=ChartRenderer.js.map