@milaboratories/miplots4 1.0.131 → 1.0.133

package/dist/histogram/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/histogram/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAwB,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAEhG,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AA6BhE,qBAAa,cAAe,SAAQ,aAAa;IAC7C,QAAQ,EAAE,qBAAqB,CAAC;IAChC,aAAa,gBAAuB;IAEpC,mBAAmB,EAAE,CAAC,CAAC,EAAC,OAAO,KAAK,IAAI,CAAmB;IAC3D,cAAc,EAAE;QACZ,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,qBAAqB,EAAE,MAAM,EAAE,EAAE,CAAC;QAClC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QAC3D,UAAU,EAAE,mBAAmB,CAAA;KAClC,GAAG,IAAI,CAAQ;gBAEJ,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,EAAE,aAAa,CAAC,EAAE,sBAAsB;IAShG,KAAK,CAAC,IAAI,EAAE,WAAW;IAavB,OAAO;IAIP,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB;IAuBlE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,MAAM,IAAI,MAAM;IAKhB,mCAAmC,CAAC,YAAY,EAAE,qBAAqB,EAAE,QAAQ,EAAE,qBAAqB;IAcxG,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAUpE,WAAW;IAuBX,gBAAgB;IAOhB,YAAY;CAsBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/histogram/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAwB,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAEhG,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AA6BhE,qBAAa,cAAe,SAAQ,aAAa;IAC7C,QAAQ,EAAE,qBAAqB,CAAC;IAChC,aAAa,gBAAuB;IAEpC,mBAAmB,EAAE,CAAC,CAAC,EAAC,OAAO,KAAK,IAAI,CAAmB;IAC3D,cAAc,EAAE;QACZ,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,qBAAqB,EAAE,MAAM,EAAE,EAAE,CAAC;QAClC,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAA;QAC3D,UAAU,EAAE,mBAAmB,CAAA;KAClC,GAAG,IAAI,CAAQ;gBAEJ,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB,EAAE,aAAa,CAAC,EAAE,sBAAsB;IAShG,KAAK,CAAC,IAAI,EAAE,WAAW;IAevB,OAAO;IAIP,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,iBAAiB;IAyBlE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,MAAM,IAAI,MAAM;IAKhB,mCAAmC,CAAC,YAAY,EAAE,qBAAqB,EAAE,QAAQ,EAAE,qBAAqB;IAcxG,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAUpE,WAAW;IAuBX,gBAAgB;IAOhB,YAAY;CAsBf"}

package/dist/histogram/index.js

@@ -8,16 +8,16 @@ import { getKeysCombinations as x } from "../utils/getKeysCombination.js";
 import B from "./ChartRenderer.js";
 import { createHistogramDataByFacets as A } from "./getHistogramData.js";
 import { HistogramSettingsImpl as p } from "./HistogramSettingsImpl.js";
-function R(u, c, t) {
+function E(u, c, t) {
   return c.reduce((e, a) => {
-    const n = u.getColumnCategories(a.value, !1), l = (r) => a.valueLabels ? String(u.getColumnValue(
+    const i = u.getColumnCategories(a.value, !1), l = (r) => a.valueLabels ? String(u.getColumnValue(
       a.valueLabels,
       u.getColumnCategoryRowIndex(a.value, r)
-    )) : r, i = n.reduce((r, s) => (r[s] = l(s), r), {});
+    )) : r, n = i.reduce((r, s) => (r[s] = l(s), r), {});
     return e[a.value] = {
-      values: n.sort((r, s) => i[r].localeCompare(i[s], "en", { numeric: !0 })),
+      values: i.sort((r, s) => n[r].localeCompare(n[s], "en", { numeric: !0 })),
       aesMap: t[a.value],
-      labels: i
+      labels: n
     }, e;
   }, {});
 }
@@ -33,9 +33,9 @@ class T extends b {
   }
   mount(t) {
     try {
-      this.chartRenderer.init(t), this._updateData(), this._updateChart();
+      this.chartRenderer.init(t), this._updateData(), this._updateChart(), this.hasError = !1;
     } catch (e) {
-      e instanceof Error && (this.chartRenderer.renderError(e.message), console.error(e));
+      this.hasError = !0, e instanceof Error && (this.chartRenderer.renderError(e.message), console.error(e));
     }
   }
   unmount() {
@@ -43,10 +43,10 @@ class T extends b {
   }
   updateSettingsAndData(t, e) {
     try {
-      const a = this.settings, n = this.data;
-      this.settings = new p(e), this.data = t, this._needUpdateCalculatedDataBySettings(a, this.settings) || this._needUpdateCalculatedDataByData(n, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart();
+      const a = this.settings, i = this.data;
+      this.settings = new p(e), this.data = t, this._needUpdateCalculatedDataBySettings(a, this.settings) || this._needUpdateCalculatedDataByData(i, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart(), this.hasError = !1;
     } catch (a) {
-      a instanceof Error && (this.chartRenderer.renderError(a.message), console.error(a));
+      this.hasError = !0, a instanceof Error && (this.chartRenderer.renderError(a.message), console.error(a));
     }
   }
   updateChartState(t, e) {
@@ -56,35 +56,35 @@ class T extends b {
     return this._updateChart(), v(this.chartRenderer.component);
   }
   _needUpdateCalculatedDataBySettings(t, e) {
-    var a, n, l, i;
+    var a, i, l, n;
     return t.valueColumn.value !== e.valueColumn.value || t.facetBy.some((r, s) => {
       var o;
       return r.value !== ((o = e.facetBy[s]) == null ? void 0 : o.value);
-    }) || ((a = t.grouping) == null ? void 0 : a.value) !== ((n = e.grouping) == null ? void 0 : n.value) || t.layers.length !== e.layers.length || t.layers.some((r, s) => r.type !== e.layers[s].type) || t.binsCount !== e.binsCount || t.chartSettings.xAxis.scale !== e.chartSettings.xAxis.scale || ((l = t.groupingOrder) == null ? void 0 : l.some((r, s) => {
+    }) || ((a = t.grouping) == null ? void 0 : a.value) !== ((i = e.grouping) == null ? void 0 : i.value) || t.layers.length !== e.layers.length || t.layers.some((r, s) => r.type !== e.layers[s].type) || t.binsCount !== e.binsCount || t.chartSettings.xAxis.scale !== e.chartSettings.xAxis.scale || ((l = t.groupingOrder) == null ? void 0 : l.some((r, s) => {
       var o;
       return r !== ((o = e.groupingOrder) == null ? void 0 : o[s]);
-    })) || ((i = e.groupingOrder) == null ? void 0 : i.some((r, s) => {
+    })) || ((n = e.groupingOrder) == null ? void 0 : n.some((r, s) => {
       var o;
       return r !== ((o = t.groupingOrder) == null ? void 0 : o[s]);
     }));
   }
   _needUpdateCalculatedDataByData(t, e) {
-    const a = Object.keys(t.data), n = Object.keys(e.data);
-    return t.id !== e.id || a.length !== n.length || a.some((l) => {
-      var i;
-      return t.data[l].length !== ((i = e.data[l]) == null ? void 0 : i.length);
+    const a = Object.keys(t.data), i = Object.keys(e.data);
+    return t.id !== e.id || a.length !== i.length || a.some((l) => {
+      var n;
+      return t.data[l].length !== ((n = e.data[l]) == null ? void 0 : n.length);
     });
   }
   _updateData() {
-    const { valueColumn: t, facetBy: e, grouping: a, binsCount: n, chartSettings: l, inheritedAes: i, groupingOrder: r } = this.settings, s = e.map((h) => this.data.getColumnCategories(h.value)), o = s.length ? x([...s]) : [["null"]], m = e.map((h) => h.value) ?? null, f = a ? [a.value] : [];
+    const { valueColumn: t, facetBy: e, grouping: a, binsCount: i, chartSettings: l, inheritedAes: n, groupingOrder: r } = this.settings, s = e.map((h) => this.data.getColumnCategories(h.value)), o = s.length ? x([...s]) : [["null"]], m = e.map((h) => h.value) ?? null, f = a ? [a.value] : [];
     let g = a ? this.data.getColumnCategories(a.value) : ["null"];
     r && (g = _.intersection(r, g)), this.data.setGrouping([...m, ...f]);
-    const C = A(this.data, o, g, t, n, l.xAxis.scale);
+    const C = A(this.data, o, g, t, i, l.xAxis.scale);
     this.calculatedData = {
       facetKeys: o.map((h) => h.join(", ")),
       facetKeysCombinations: o,
       histogramDataByFacets: C,
-      legendInfo: R(this.data, a ? [a] : [], i)
+      legendInfo: E(this.data, a ? [a] : [], n)
     };
   }
   _updateAesInData() {
@@ -93,7 +93,7 @@ class T extends b {
   _updateChart() {
     if (!this.calculatedData)
       return;
-    const { id: t, chartSettings: e, facetSettings: a, inheritedAes: n, layers: l, grouping: i, groupingDirection: r, groupingStack: s } = this.settings;
+    const { id: t, chartSettings: e, facetSettings: a, inheritedAes: i, layers: l, grouping: n, groupingDirection: r, groupingStack: s } = this.settings;
     this.chartRenderer.render(
       this.data,
       t,
@@ -105,8 +105,8 @@ class T extends b {
       this.calculatedData.histogramDataByFacets,
       this.calculatedData.legendInfo,
       l,
-      n,
       i,
+      n,
       s,
       r,
       this.onTooltipHintSwitch

package/dist/histogram/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/histogram/index.ts"],"sourcesContent":["import {\n    intersection\n} from 'lodash';\nimport { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type { Category, ColumnName, HistogramEventHandlers, HistogramSettings } from '../types';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { HistogramLegendInfo } from './components/types';\nimport type { GroupedHistogramData } from './getHistogramData';\nimport { createHistogramDataByFacets } from './getHistogramData';\nimport { HistogramSettingsImpl } from './HistogramSettingsImpl';\n\nfunction getLegendInfo(\n    data: DataFrame,\n    grouping: ColumnName[],\n    inheritedAes: HistogramSettingsImpl['inheritedAes']\n): HistogramLegendInfo {\n    return grouping.reduce((res: HistogramLegendInfo, column) => {\n        const categories = data.getColumnCategories(column.value, false);\n        const getValueLabel = (category: Category) => (column.valueLabels\n            ? String(data.getColumnValue(\n                column.valueLabels,\n                data.getColumnCategoryRowIndex(column.value, category)\n            ))\n            : category\n        );\n        const labels = categories.reduce((res: Record<string, string>, category) => {\n            res[category] = getValueLabel(category);\n            return res;\n        }, {});\n        res[column.value] = {\n            values: categories.sort((a, b) => labels[a].localeCompare(labels[b], 'en', {numeric: true})),\n            aesMap: inheritedAes[column.value],\n            labels,\n        };\n        return res;\n    }, {});\n}\n\nexport class ChartHistogram extends AbstractChart {\n    settings: HistogramSettingsImpl;\n    chartRenderer = new ChartRenderer();\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        histogramDataByFacets: Record<string, GroupedHistogramData>\n        legendInfo: HistogramLegendInfo\n    } | null = null;\n\n    constructor(data: DataFrame, settings: HistogramSettings, eventHandlers?: HistogramEventHandlers) {\n        super(data, settings);\n\n        this.settings = new HistogramSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers[0];\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n        } catch (err) {\n            if (err instanceof Error) {\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    unmount() {\n        this.chartRenderer.clear();\n    }\n\n    updateSettingsAndData(data: DataFrame, settings: HistogramSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new HistogramSettingsImpl(settings);\n            this.data = data;\n            if (\n                this._needUpdateCalculatedDataBySettings(previousSettings, this.settings) ||\n                this._needUpdateCalculatedDataByData(previousData, this.data)\n            ) {\n                this._updateData();\n            } else {\n                this._updateAesInData();\n            }\n            this._updateChart();\n        } catch (err) {\n            if (err instanceof Error) {\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    updateChartState(_field: string, _value: unknown) {\n        console.warn('no chart state for histogram');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: HistogramSettingsImpl, settings: HistogramSettingsImpl) {\n        return (\n            prevSettings.valueColumn.value !== settings.valueColumn.value ||\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping?.value !== settings.grouping?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            prevSettings.binsCount !== settings.binsCount ||\n            prevSettings.chartSettings.xAxis.scale !== settings.chartSettings.xAxis.scale ||\n            prevSettings.groupingOrder?.some((key, idx) => key !== settings.groupingOrder?.[idx]) ||\n            settings.groupingOrder?.some((key, idx) => key !== prevSettings.groupingOrder?.[idx])\n        );\n    }\n\n    _needUpdateCalculatedDataByData(prevData: DataFrame, data: DataFrame) {\n        const prevKeys = Object.keys(prevData.data);\n        const keys = Object.keys(data.data);\n        return (\n            prevData.id !== data.id ||\n            prevKeys.length !== keys.length ||\n            prevKeys.some(key => prevData.data[key].length !== data.data[key]?.length)\n        );\n    }\n\n    _updateData() {\n        const {valueColumn, facetBy, grouping, binsCount, chartSettings, inheritedAes, groupingOrder} = this.settings;\n\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value));\n        const facetKeysCombinations = facetKeysLists.length ? getKeysCombinations([...facetKeysLists]) : [['null']];\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n        const groupingValues = grouping ? [grouping.value] : [];\n        let groupingKeys = grouping ? this.data.getColumnCategories(grouping.value) : ['null'];\n        if (groupingOrder) {\n            groupingKeys = intersection(groupingOrder, groupingKeys);\n        }\n\n        this.data.setGrouping([...facetGroupingValues, ...groupingValues]);\n        const histogramDataByFacets = createHistogramDataByFacets(this.data, facetKeysCombinations, groupingKeys, valueColumn, binsCount, chartSettings.xAxis.scale);\n\n        this.calculatedData = {\n            facetKeys: facetKeysCombinations.map(v => v.join(', ')),\n            facetKeysCombinations,\n            histogramDataByFacets,\n            legendInfo: getLegendInfo(this.data, grouping ? [grouping] : [], inheritedAes)\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {id, chartSettings, facetSettings, inheritedAes, layers, grouping, groupingDirection, groupingStack} = this.settings;\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeysCombinations, //for titles, if facet by more than 1 column\n            this.calculatedData.histogramDataByFacets,\n            this.calculatedData.legendInfo,\n            layers,\n            inheritedAes,\n            grouping,\n            groupingStack,\n            groupingDirection,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["getLegendInfo","data","grouping","inheritedAes","res","column","categories","getValueLabel","category","labels","a","b","ChartHistogram","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","HistogramSettingsImpl","node","err","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","_b","l","_c","key","_d","prevData","prevKeys","keys","valueColumn","facetBy","binsCount","chartSettings","groupingOrder","facetKeysLists","facetKeysCombinations","getKeysCombinations","facetGroupingValues","groupingValues","groupingKeys","intersection","histogramDataByFacets","createHistogramDataByFacets","v","id","facetSettings","layers","groupingDirection","groupingStack"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../src/histogram/index.ts"],"sourcesContent":["import {\n    intersection\n} from 'lodash';\nimport { renderToString } from 'react-dom/server';\nimport { AbstractChart } from '../AbstractChart';\nimport type { DataFrame } from '../DataFrame';\nimport type { Category, ColumnName, HistogramEventHandlers, HistogramSettings } from '../types';\nimport { getKeysCombinations } from '../utils/getKeysCombination';\nimport ChartRenderer from './ChartRenderer';\nimport type { HistogramLegendInfo } from './components/types';\nimport type { GroupedHistogramData } from './getHistogramData';\nimport { createHistogramDataByFacets } from './getHistogramData';\nimport { HistogramSettingsImpl } from './HistogramSettingsImpl';\n\nfunction getLegendInfo(\n    data: DataFrame,\n    grouping: ColumnName[],\n    inheritedAes: HistogramSettingsImpl['inheritedAes']\n): HistogramLegendInfo {\n    return grouping.reduce((res: HistogramLegendInfo, column) => {\n        const categories = data.getColumnCategories(column.value, false);\n        const getValueLabel = (category: Category) => (column.valueLabels\n            ? String(data.getColumnValue(\n                column.valueLabels,\n                data.getColumnCategoryRowIndex(column.value, category)\n            ))\n            : category\n        );\n        const labels = categories.reduce((res: Record<string, string>, category) => {\n            res[category] = getValueLabel(category);\n            return res;\n        }, {});\n        res[column.value] = {\n            values: categories.sort((a, b) => labels[a].localeCompare(labels[b], 'en', {numeric: true})),\n            aesMap: inheritedAes[column.value],\n            labels,\n        };\n        return res;\n    }, {});\n}\n\nexport class ChartHistogram extends AbstractChart {\n    settings: HistogramSettingsImpl;\n    chartRenderer = new ChartRenderer();\n\n    onTooltipHintSwitch: (v:boolean) => void = () => undefined;\n    calculatedData: {\n        facetKeys: string[];\n        facetKeysCombinations: string[][];\n        histogramDataByFacets: Record<string, GroupedHistogramData>\n        legendInfo: HistogramLegendInfo\n    } | null = null;\n\n    constructor(data: DataFrame, settings: HistogramSettings, eventHandlers?: HistogramEventHandlers) {\n        super(data, settings);\n\n        this.settings = new HistogramSettingsImpl(settings);\n        if (eventHandlers) {\n            this.onTooltipHintSwitch = eventHandlers[0];\n        }\n    }\n\n    mount(node: HTMLElement) {\n        try {\n            this.chartRenderer.init(node);\n            this._updateData();\n            this._updateChart();\n            this.hasError = false;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    unmount() {\n        this.chartRenderer.clear();\n    }\n\n    updateSettingsAndData(data: DataFrame, settings: HistogramSettings) {\n        try {\n            const previousSettings = this.settings;\n            const previousData = this.data;\n            this.settings = new HistogramSettingsImpl(settings);\n            this.data = data;\n            if (\n                this._needUpdateCalculatedDataBySettings(previousSettings, this.settings) ||\n                this._needUpdateCalculatedDataByData(previousData, this.data)\n            ) {\n                this._updateData();\n            } else {\n                this._updateAesInData();\n            }\n            this._updateChart();\n            this.hasError = false;\n        } catch (err) {\n            this.hasError = true;\n            if (err instanceof Error) {\n                this.chartRenderer.renderError(err.message as string);\n                console.error(err);\n            }\n        }\n    }\n\n    updateChartState(_field: string, _value: unknown) {\n        console.warn('no chart state for histogram');\n    }\n\n    export(): string {\n        this._updateChart();\n        return renderToString(this.chartRenderer.component);\n    }\n\n    _needUpdateCalculatedDataBySettings(prevSettings: HistogramSettingsImpl, settings: HistogramSettingsImpl) {\n        return (\n            prevSettings.valueColumn.value !== settings.valueColumn.value ||\n            prevSettings.facetBy.some((el, idx) => el.value !== settings.facetBy[idx]?.value) ||\n            prevSettings.grouping?.value !== settings.grouping?.value ||\n            prevSettings.layers.length !== settings.layers.length ||\n            prevSettings.layers.some((l, idx) => l.type !== settings.layers[idx].type) ||\n            prevSettings.binsCount !== settings.binsCount ||\n            prevSettings.chartSettings.xAxis.scale !== settings.chartSettings.xAxis.scale ||\n            prevSettings.groupingOrder?.some((key, idx) => key !== settings.groupingOrder?.[idx]) ||\n            settings.groupingOrder?.some((key, idx) => key !== prevSettings.groupingOrder?.[idx])\n        );\n    }\n\n    _needUpdateCalculatedDataByData(prevData: DataFrame, data: DataFrame) {\n        const prevKeys = Object.keys(prevData.data);\n        const keys = Object.keys(data.data);\n        return (\n            prevData.id !== data.id ||\n            prevKeys.length !== keys.length ||\n            prevKeys.some(key => prevData.data[key].length !== data.data[key]?.length)\n        );\n    }\n\n    _updateData() {\n        const {valueColumn, facetBy, grouping, binsCount, chartSettings, inheritedAes, groupingOrder} = this.settings;\n\n        const facetKeysLists = facetBy.map(column => this.data.getColumnCategories(column.value));\n        const facetKeysCombinations = facetKeysLists.length ? getKeysCombinations([...facetKeysLists]) : [['null']];\n        const facetGroupingValues = facetBy.map(column => column.value) ?? null;\n        const groupingValues = grouping ? [grouping.value] : [];\n        let groupingKeys = grouping ? this.data.getColumnCategories(grouping.value) : ['null'];\n        if (groupingOrder) {\n            groupingKeys = intersection(groupingOrder, groupingKeys);\n        }\n\n        this.data.setGrouping([...facetGroupingValues, ...groupingValues]);\n        const histogramDataByFacets = createHistogramDataByFacets(this.data, facetKeysCombinations, groupingKeys, valueColumn, binsCount, chartSettings.xAxis.scale);\n\n        this.calculatedData = {\n            facetKeys: facetKeysCombinations.map(v => v.join(', ')),\n            facetKeysCombinations,\n            histogramDataByFacets,\n            legendInfo: getLegendInfo(this.data, grouping ? [grouping] : [], inheritedAes)\n        };\n    }\n\n    _updateAesInData() {\n        const calculated = this.calculatedData;\n        if (!calculated) {\n            return;\n        }\n    }\n\n    _updateChart() {\n        if (!this.calculatedData) {\n            return;\n        }\n        const {id, chartSettings, facetSettings, inheritedAes, layers, grouping, groupingDirection, groupingStack} = this.settings;\n        this.chartRenderer.render(\n            this.data,\n            id,\n            chartSettings,\n            facetSettings,\n            this.calculatedData.facetKeys,\n            this.calculatedData.facetKeysCombinations, //for titles, if facet by more than 1 column\n            this.calculatedData.histogramDataByFacets,\n            this.calculatedData.legendInfo,\n            layers,\n            inheritedAes,\n            grouping,\n            groupingStack,\n            groupingDirection,\n            this.onTooltipHintSwitch\n        );\n    }\n}\n"],"names":["getLegendInfo","data","grouping","inheritedAes","res","column","categories","getValueLabel","category","labels","a","b","ChartHistogram","AbstractChart","settings","eventHandlers","__publicField","ChartRenderer","HistogramSettingsImpl","node","err","previousSettings","previousData","_field","_value","renderToString","prevSettings","el","idx","_a","_b","l","_c","key","_d","prevData","prevKeys","keys","valueColumn","facetBy","binsCount","chartSettings","groupingOrder","facetKeysLists","facetKeysCombinations","getKeysCombinations","facetGroupingValues","groupingValues","groupingKeys","intersection","histogramDataByFacets","createHistogramDataByFacets","v","id","facetSettings","layers","groupingDirection","groupingStack"],"mappings":"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"}

package/dist/scatterplot/ScatterplotSettingsImpl.d.ts

@@ -1,4 +1,4 @@
-import { AxisSettings, ColumnName, ContinuousAesFromColumn, FrameType, InheritAesScatterplot, LegendPosition, LineShape, CurveLayer as OuterCurveLayer, DotsLayer as OuterDotsLayer, PointShape, ScatterplotSettings, SettingsInterface, TitlePosition, AesRecord } from '../types';
+import { AxisSettings, ColumnName, ContinuousAesFromColumn, DataValue, FrameType, InheritAesScatterplot, LegendPosition, LineShape, CurveLayer as OuterCurveLayer, DotsLayer as OuterDotsLayer, PointShape, ScatterplotSettings, SettingsInterface, TitlePosition, AesRecord } from '../types';
 export declare class DotsLayer {
     readonly type = "dots";
     readonly aes: {
@@ -38,7 +38,11 @@ export declare class ScatterplotSettingsImpl implements SettingsInterface {
     readonly x: ColumnName;
     readonly y: ColumnName;
     readonly facetBy: ColumnName[];
-    readonly grouping: ColumnName[];
+    readonly grouping: {
+        columnName: ColumnName;
+        order?: DataValue[];
+        inheritedAes?: AesRecord;
+    }[];
     readonly label: ColumnName | null;
     readonly highlight: ColumnName | null;
     readonly chartSettings: {
@@ -65,7 +69,6 @@ export declare class ScatterplotSettingsImpl implements SettingsInterface {
             content?: ColumnName[];
         };
     };
-    readonly inheritedAes: Record<string, AesRecord>;
     readonly trend: {
         bounded: boolean;
         color: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;

package/dist/scatterplot/ScatterplotSettingsImpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ScatterplotSettingsImpl.d.ts","sourceRoot":"","sources":["../../src/scatterplot/ScatterplotSettingsImpl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ScatterplotSettingsImpl.d.ts","sourceRoot":"","sources":["../../src/scatterplot/ScatterplotSettingsImpl.ts"],"names":[],"mappings":"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"}

package/dist/scatterplot/ScatterplotSettingsImpl.js

@@ -1,114 +1,113 @@
 var d = Object.defineProperty;
-var m = (t, e, r) => e in t ? d(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var o = (t, e, r) => m(t, typeof e != "symbol" ? e + "" : e, r);
+var m = (t, o, l) => o in t ? d(t, o, { enumerable: !0, configurable: !0, writable: !0, value: l }) : t[o] = l;
+var e = (t, o, l) => m(t, typeof o != "symbol" ? o + "" : o, l);
 import y from "../node_modules/lodash/lodash.js";
-import { DEFAULT_HEIGHT_SMALL as f, DEFAULT_HEIGHT as n, DEFAULT_WIDTH_SMALL as S, DEFAULT_WIDTH as s, BLACK as i } from "../constants.js";
+import { DEFAULT_HEIGHT_SMALL as f, DEFAULT_HEIGHT as n, DEFAULT_WIDTH_SMALL as S, DEFAULT_WIDTH as w, BLACK as h } from "../constants.js";
 import "../types/common.js";
 import "../types/discrete.js";
-import { ScatterplotSettingsSchema as A } from "../types/scatterplot.js";
+import { ScatterplotSettingsSchema as x } from "../types/scatterplot.js";
 import "../types/heatmap.js";
 import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
-import { exhaustive as w } from "../utils/index.js";
-class x {
-  constructor(e) {
-    o(this, "type", "dots");
-    o(this, "aes", {
-      dotFill: i,
+import { exhaustive as s } from "../utils/index.js";
+class A {
+  constructor(o) {
+    e(this, "type", "dots");
+    e(this, "aes", {
+      dotFill: h,
       dotShape: "21",
       dotSize: 3,
       opacity: 1
     });
     this.aes = {
       ...this.aes,
-      ...e.aes
+      ...o.aes
     };
   }
 }
 class L {
-  constructor(e) {
-    o(this, "type", "curve");
-    o(this, "smoothing");
-    o(this, "aes", {
-      lineColor: i,
+  constructor(o) {
+    e(this, "type", "curve");
+    e(this, "smoothing");
+    e(this, "aes", {
+      lineColor: h,
       lineWidth: 1,
       lineShape: "solid",
       opacity: 1
     });
-    this.smoothing = e.smoothing ?? !1, this.aes = {
+    this.smoothing = o.smoothing ?? !1, this.aes = {
       ...this.aes,
-      ...e.aes
+      ...o.aes
     };
   }
 }
 class F {
-  constructor(e) {
-    o(this, "id");
-    o(this, "type", "scatterplot");
-    o(this, "keyColumn");
-    o(this, "facetSettings");
-    o(this, "x");
-    o(this, "y");
-    o(this, "facetBy");
-    o(this, "grouping");
-    o(this, "label");
-    o(this, "highlight");
-    o(this, "chartSettings");
-    o(this, "inheritedAes");
-    o(this, "trend");
-    o(this, "layers");
-    var r, h, a, p, c, u;
-    A.parse(e), this.id = y.uniqueId("settings"), this.keyColumn = e.keyColumn, this.facetSettings = { sharedX: !0, sharedY: !0, titlePosition: "left", ...e.facetSettings }, this.x = e.x, this.y = e.y, this.facetBy = e.facetBy ?? [], this.grouping = e.grouping ?? [], this.label = e.label ?? null, this.highlight = e.highlight ?? null, this.chartSettings = {
+  constructor(o) {
+    e(this, "id");
+    e(this, "type", "scatterplot");
+    e(this, "keyColumn");
+    e(this, "facetSettings");
+    e(this, "x");
+    e(this, "y");
+    e(this, "facetBy");
+    e(this, "grouping");
+    e(this, "label");
+    e(this, "highlight");
+    e(this, "chartSettings");
+    e(this, "trend");
+    e(this, "layers");
+    var l, i, a, p, c, u;
+    x.parse(o), this.id = y.uniqueId("settings"), this.keyColumn = o.keyColumn, this.facetSettings = { sharedX: !0, sharedY: !0, titlePosition: "left", ...o.facetSettings }, this.x = o.x, this.y = o.y, this.facetBy = o.facetBy ?? [], this.grouping = o.grouping ?? [], this.label = o.label ?? null, this.highlight = o.highlight ?? null, this.chartSettings = {
       size: {
-        width: ((r = e == null ? void 0 : e.size) == null ? void 0 : r.width) ?? (this.facetBy.length ? S : s),
-        height: ((h = e == null ? void 0 : e.size) == null ? void 0 : h.height) ?? (this.facetBy.length ? f : n)
+        width: ((l = o == null ? void 0 : o.size) == null ? void 0 : l.width) ?? (this.facetBy.length ? S : w),
+        height: ((i = o == null ? void 0 : o.size) == null ? void 0 : i.height) ?? (this.facetBy.length ? f : n)
       },
       title: {
         position: "center",
         show: !0,
-        ...e.title,
-        name: ((a = e.title) == null ? void 0 : a.name) ?? "Chart"
+        ...o.title,
+        name: ((a = o.title) == null ? void 0 : a.name) ?? "Chart"
       },
       yAxis: {
-        title: e.y.label ?? e.y.value,
+        title: o.y.label ?? o.y.value,
         scale: "linear",
         showGrid: !0,
         showTicks: !0,
-        ...e.yAxis
+        ...o.yAxis
       },
       xAxis: {
-        title: e.x.label ?? e.x.value,
+        title: o.x.label ?? o.x.value,
         scale: "linear",
         showGrid: !0,
         showTicks: !0,
-        ...e.xAxis
+        ...o.xAxis
       },
-      frame: { type: ((p = e.frame) == null ? void 0 : p.type) ?? "full" },
+      frame: { type: ((p = o.frame) == null ? void 0 : p.type) ?? "full" },
       legend: {
         show: !0,
         position: "right",
-        ...e.legend
+        ...o.legend
       },
       tooltips: {
-        ...e.tooltips,
-        show: ((c = e.tooltips) == null ? void 0 : c.show) !== !1 && (((u = e.tooltips) == null ? void 0 : u.content) ?? []).length > 0
+        ...o.tooltips,
+        show: ((c = o.tooltips) == null ? void 0 : c.show) !== !1 && (((u = o.tooltips) == null ? void 0 : u.content) ?? []).length > 0
       }
-    }, this.inheritedAes = e.inheritedAes ?? {}, this.trend = e != null && e.trend ? {
-      bounded: e.trend.bounded ?? !1,
-      color: e.trend.color ?? i
-    } : null, this.layers = e.layers.map((l) => {
-      if (l.type === "dots")
-        return new x(l);
-      if (l.type === "curve")
-        return new L(l);
-      w(l, "Unknown layer type");
+    }, this.trend = o != null && o.trend ? {
+      bounded: o.trend.bounded ?? !1,
+      color: o.trend.color ?? h
+    } : null, this.layers = o.layers.map((r) => {
+      if (r.type === "dots")
+        return new A(r);
+      if (r.type === "curve")
+        return new L(r);
+      s(r, "Unknown layer type");
     }).filter(Boolean);
   }
 }
 export {
   L as CurveLayer,
-  x as DotsLayer,
+  A as DotsLayer,
   F as ScatterplotSettingsImpl
 };
 //# sourceMappingURL=ScatterplotSettingsImpl.js.map

package/dist/scatterplot/ScatterplotSettingsImpl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ScatterplotSettingsImpl.js","sources":["../../src/scatterplot/ScatterplotSettingsImpl.ts"],"sourcesContent":["import lodash from 'lodash';\nimport { BLACK, DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL } from '../constants';\nimport type {\n    AxisSettings,\n    ColumnName,\n    ContinuousAesFromColumn,\n    FrameType,\n    InheritAesScatterplot,\n    LegendPosition,\n    LineShape,\n    CurveLayer as OuterCurveLayer,\n    DotsLayer as OuterDotsLayer,\n    PointShape,\n    ScatterplotSettings,\n    SettingsInterface,\n    TitlePosition,\n} from '../types';\nimport { type AesRecord, ScatterplotSettingsSchema } from '../types';\nimport { exhaustive } from '../utils';\n\nexport class DotsLayer {\n    readonly type = 'dots';\n    readonly aes: {\n        dotFill: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        dotShape: PointShape | InheritAesScatterplot;\n        dotSize: number | ContinuousAesFromColumn<number>;\n        opacity: number;\n    } = {\n        dotFill: BLACK,\n        dotShape: '21',\n        dotSize: 3,\n        opacity: 1,\n    };\n\n    constructor(layer: OuterDotsLayer) {\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport class CurveLayer {\n    readonly type = 'curve';\n    readonly smoothing: boolean;\n    readonly aes: {\n        lineColor: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        lineWidth: number;\n        lineShape: LineShape;\n        opacity: number;\n    } = {\n        lineColor: BLACK,\n        lineWidth: 1,\n        lineShape: 'solid',\n        opacity: 1,\n    };\n\n    constructor(layer: OuterCurveLayer) {\n        this.smoothing = layer.smoothing ?? false;\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport type ScatterplotLayer = DotsLayer | CurveLayer;\n\nexport interface ScatterplotAxisSettings extends AxisSettings {\n    title: string | ColumnName;\n}\n\nexport class ScatterplotSettingsImpl implements SettingsInterface {\n    readonly id: string;\n    readonly type = 'scatterplot';\n    readonly keyColumn: ColumnName;\n    readonly facetSettings: {\n        sharedX: boolean;\n        sharedY: boolean;\n        nRows?: number;\n        nCols?: number;\n        titlePosition: 'left' | 'center' | 'right';\n    };\n    readonly x: ColumnName;\n    readonly y: ColumnName;\n    readonly facetBy: ColumnName[];\n    readonly grouping: ColumnName[];\n    readonly label: ColumnName | null;\n    readonly highlight: ColumnName | null;\n    readonly chartSettings: {\n        readonly size: {width: number; height: number};\n        readonly title: {name: string; show: boolean; position: TitlePosition};\n        readonly yAxis: ScatterplotAxisSettings;\n        readonly xAxis: ScatterplotAxisSettings;\n        readonly frame: {type: FrameType};\n        readonly legend: {show: boolean; position: LegendPosition};\n        readonly tooltips: {show: boolean; content?: ColumnName[]};\n    };\n    readonly inheritedAes: Record<string, AesRecord>;\n\n    readonly trend: {\n        bounded: boolean;\n        color: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n    } | null;\n\n    readonly layers: ScatterplotLayer[];\n\n    constructor(settings: ScatterplotSettings) {\n        ScatterplotSettingsSchema.parse(settings);\n        this.id = lodash.uniqueId('settings');\n        this.keyColumn = settings.keyColumn;\n        this.facetSettings = {sharedX: true, sharedY: true, titlePosition: 'left', ...settings.facetSettings};\n        this.x = settings.x;\n        this.y = settings.y;\n        this.facetBy = settings.facetBy ?? [];\n        this.grouping = settings.grouping ?? [];\n        this.label = settings.label ?? null;\n        this.highlight = settings.highlight ?? null;\n        this.chartSettings = {\n            size: {\n                width: settings?.size?.width ?? (this.facetBy.length ? DEFAULT_WIDTH_SMALL : DEFAULT_WIDTH),\n                height: settings?.size?.height ?? (this.facetBy.length ? DEFAULT_HEIGHT_SMALL : DEFAULT_HEIGHT),\n            },\n            title: {\n                position: 'center',\n                show: true,\n                ...settings.title,\n                name: settings.title?.name ?? 'Chart',\n            },\n            yAxis: {\n                title: settings.y.label ?? settings.y.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.yAxis,\n            },\n            xAxis: {\n                title: settings.x.label ?? settings.x.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.xAxis,\n            },\n            frame: {type: settings.frame?.type ?? 'full'},\n            legend: {\n                show: true,\n                position: 'right',\n                ...settings.legend,\n            },\n            tooltips: {\n                ...settings.tooltips,\n                show: !(settings.tooltips?.show === false) && (settings.tooltips?.content ?? []).length > 0,\n            },\n        };\n\n        this.inheritedAes = settings.inheritedAes ?? {};\n        this.trend = settings?.trend\n            ? {\n                  bounded: settings.trend.bounded ?? false,\n                  color: settings.trend.color ?? BLACK,\n              }\n            : null;\n\n        this.layers = settings.layers\n            .map(layer => {\n                if (layer.type === 'dots') {\n                    return new DotsLayer(layer);\n                }\n                if (layer.type === 'curve') {\n                    return new CurveLayer(layer);\n                }\n                exhaustive(layer, 'Unknown layer type');\n            })\n            .filter(Boolean) as ScatterplotLayer[];\n    }\n}\n"],"names":["DotsLayer","layer","__publicField","BLACK","CurveLayer","ScatterplotSettingsImpl","settings","ScatterplotSettingsSchema","lodash","_a","DEFAULT_WIDTH_SMALL","DEFAULT_WIDTH","_b","DEFAULT_HEIGHT_SMALL","DEFAULT_HEIGHT","_c","_d","_e","_f","exhaustive"],"mappings":"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"}
+{"version":3,"file":"ScatterplotSettingsImpl.js","sources":["../../src/scatterplot/ScatterplotSettingsImpl.ts"],"sourcesContent":["import lodash from 'lodash';\nimport {BLACK, DEFAULT_HEIGHT, DEFAULT_HEIGHT_SMALL, DEFAULT_WIDTH, DEFAULT_WIDTH_SMALL} from '../constants';\nimport type {\n    AxisSettings,\n    ColumnName,\n    ContinuousAesFromColumn,\n    DataValue,\n    FrameType,\n    InheritAesScatterplot,\n    LegendPosition,\n    LineShape,\n    CurveLayer as OuterCurveLayer,\n    DotsLayer as OuterDotsLayer,\n    PointShape,\n    ScatterplotSettings,\n    SettingsInterface,\n    TitlePosition,\n} from '../types';\nimport {type AesRecord, ScatterplotSettingsSchema} from '../types';\nimport {exhaustive} from '../utils';\n\nexport class DotsLayer {\n    readonly type = 'dots';\n    readonly aes: {\n        dotFill: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        dotShape: PointShape | InheritAesScatterplot;\n        dotSize: number | ContinuousAesFromColumn<number>;\n        opacity: number;\n    } = {\n        dotFill: BLACK,\n        dotShape: '21',\n        dotSize: 3,\n        opacity: 1,\n    };\n\n    constructor(layer: OuterDotsLayer) {\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport class CurveLayer {\n    readonly type = 'curve';\n    readonly smoothing: boolean;\n    readonly aes: {\n        lineColor: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n        lineWidth: number;\n        lineShape: LineShape;\n        opacity: number;\n    } = {\n        lineColor: BLACK,\n        lineWidth: 1,\n        lineShape: 'solid',\n        opacity: 1,\n    };\n\n    constructor(layer: OuterCurveLayer) {\n        this.smoothing = layer.smoothing ?? false;\n        this.aes = {\n            ...this.aes,\n            ...layer.aes,\n        };\n    }\n}\n\nexport type ScatterplotLayer = DotsLayer | CurveLayer;\n\nexport interface ScatterplotAxisSettings extends AxisSettings {\n    title: string | ColumnName;\n}\n\nexport class ScatterplotSettingsImpl implements SettingsInterface {\n    readonly id: string;\n    readonly type = 'scatterplot';\n    readonly keyColumn: ColumnName;\n    readonly facetSettings: {\n        sharedX: boolean;\n        sharedY: boolean;\n        nRows?: number;\n        nCols?: number;\n        titlePosition: 'left' | 'center' | 'right';\n    };\n    readonly x: ColumnName;\n    readonly y: ColumnName;\n    readonly facetBy: ColumnName[];\n    readonly grouping: {\n        columnName: ColumnName;\n        order?: DataValue[];\n        inheritedAes?: AesRecord;\n    }[];\n    readonly label: ColumnName | null;\n    readonly highlight: ColumnName | null;\n    readonly chartSettings: {\n        readonly size: {width: number; height: number};\n        readonly title: {name: string; show: boolean; position: TitlePosition};\n        readonly yAxis: ScatterplotAxisSettings;\n        readonly xAxis: ScatterplotAxisSettings;\n        readonly frame: {type: FrameType};\n        readonly legend: {show: boolean; position: LegendPosition};\n        readonly tooltips: {show: boolean; content?: ColumnName[]};\n    };\n\n    readonly trend: {\n        bounded: boolean;\n        color: string | InheritAesScatterplot | ContinuousAesFromColumn<string>;\n    } | null;\n\n    readonly layers: ScatterplotLayer[];\n\n    constructor(settings: ScatterplotSettings) {\n        ScatterplotSettingsSchema.parse(settings);\n        this.id = lodash.uniqueId('settings');\n        this.keyColumn = settings.keyColumn;\n        this.facetSettings = {sharedX: true, sharedY: true, titlePosition: 'left', ...settings.facetSettings};\n        this.x = settings.x;\n        this.y = settings.y;\n        this.facetBy = settings.facetBy ?? [];\n        this.grouping = settings.grouping ?? [];\n        this.label = settings.label ?? null;\n        this.highlight = settings.highlight ?? null;\n        this.chartSettings = {\n            size: {\n                width: settings?.size?.width ?? (this.facetBy.length ? DEFAULT_WIDTH_SMALL : DEFAULT_WIDTH),\n                height: settings?.size?.height ?? (this.facetBy.length ? DEFAULT_HEIGHT_SMALL : DEFAULT_HEIGHT),\n            },\n            title: {\n                position: 'center',\n                show: true,\n                ...settings.title,\n                name: settings.title?.name ?? 'Chart',\n            },\n            yAxis: {\n                title: settings.y.label ?? settings.y.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.yAxis,\n            },\n            xAxis: {\n                title: settings.x.label ?? settings.x.value,\n                scale: 'linear',\n                showGrid: true,\n                showTicks: true,\n                ...settings.xAxis,\n            },\n            frame: {type: settings.frame?.type ?? 'full'},\n            legend: {\n                show: true,\n                position: 'right',\n                ...settings.legend,\n            },\n            tooltips: {\n                ...settings.tooltips,\n                show: !(settings.tooltips?.show === false) && (settings.tooltips?.content ?? []).length > 0,\n            },\n        };\n\n        this.trend = settings?.trend\n            ? {\n                  bounded: settings.trend.bounded ?? false,\n                  color: settings.trend.color ?? BLACK,\n              }\n            : null;\n\n        this.layers = settings.layers\n            .map(layer => {\n                if (layer.type === 'dots') {\n                    return new DotsLayer(layer);\n                }\n                if (layer.type === 'curve') {\n                    return new CurveLayer(layer);\n                }\n                exhaustive(layer, 'Unknown layer type');\n            })\n            .filter(Boolean) as ScatterplotLayer[];\n    }\n}\n"],"names":["DotsLayer","layer","__publicField","BLACK","CurveLayer","ScatterplotSettingsImpl","settings","ScatterplotSettingsSchema","lodash","_a","DEFAULT_WIDTH_SMALL","DEFAULT_WIDTH","_b","DEFAULT_HEIGHT_SMALL","DEFAULT_HEIGHT","_c","_d","_e","_f","exhaustive"],"mappings":"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"}

package/dist/scatterplot/dots.d.ts

@@ -1,5 +1,6 @@
 import { DataFrame } from '../DataFrame';
 import { ColumnName, DataValue } from '../types';
+import { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';
 export type Dot = {
     idx: number;
     x: number;
@@ -14,5 +15,5 @@ export type GroupedDots = Record<string, {
     maxY: number;
     dots: Dot[];
 }>;
-export declare function getDots(data: DataFrame, facetKeysCombinations: string[][], x: ColumnName, y: ColumnName, label: ColumnName | null, highlight: ColumnName | null, keys: string[]): GroupedDots;
+export declare function getDots(data: DataFrame, facetKeysCombinations: string[][], x: ColumnName, y: ColumnName, label: ColumnName | null, highlight: ColumnName | null, grouping: ScatterplotSettingsImpl['grouping']): GroupedDots;
 //# sourceMappingURL=dots.d.ts.map

package/dist/scatterplot/dots.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dots.d.ts","sourceRoot":"","sources":["../../src/scatterplot/dots.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGtD,MAAM,MAAM,GAAG,GAAG;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,MAAM,CAC5B,MAAM,EACN;IACI,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CACJ,CAAC;AAEF,wBAAgB,OAAO,CACnB,IAAI,EAAE,SAAS,EACf,qBAAqB,EAAE,MAAM,EAAE,EAAE,EACjC,CAAC,EAAE,UAAU,EACb,CAAC,EAAE,UAAU,EACb,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,IAAI,EAAE,MAAM,EAAE,GACf,WAAW,CAmDb"}
+{"version":3,"file":"dots.d.ts","sourceRoot":"","sources":["../../src/scatterplot/dots.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACtD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAIzE,MAAM,MAAM,GAAG,GAAG;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,SAAS,GAAG,IAAI,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG,MAAM,CAC5B,MAAM,EACN;IACI,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CACJ,CAAC;AAEF,wBAAgB,OAAO,CACnB,IAAI,EAAE,SAAS,EACf,qBAAqB,EAAE,MAAM,EAAE,EAAE,EACjC,CAAC,EAAE,UAAU,EACb,CAAC,EAAE,UAAU,EACb,KAAK,EAAE,UAAU,GAAG,IAAI,EACxB,SAAS,EAAE,UAAU,GAAG,IAAI,EAC5B,QAAQ,EAAE,uBAAuB,CAAC,UAAU,CAAC,GAC9C,WAAW,CAgDb"}

package/dist/scatterplot/dots.js

@@ -1,36 +1,33 @@
 import { formatColumnValue as V } from "./utils/formatColumnValue.js";
-import { format as w } from "../node_modules/d3-format/src/defaultLocale.js";
-function d(t, v, h, I, o, y, C) {
-  const p = {}, M = o != null && o.format ? w(o.format) : void 0;
-  for (const g of v) {
-    const i = [];
-    let u = 1 / 0, f = 1 / 0, s = -1 / 0, l = -1 / 0;
-    const a = g.concat([""]);
-    for (const c of C) {
-      a[a.length - 1] = c;
-      const e = t.getRowsByGrouping(a);
-      for (let x = 0; x < e.length; x++) {
-        const n = e[x], m = t.getColumnValue(h.value, n), r = t.getColumnValue(I.value, n);
-        m === null && r === null || (u = Math.min(u, m), f = Math.min(f, r), s = Math.max(s, m), l = Math.max(l, r), i.push({
-          x: m,
-          y: r,
-          label: V(t, n, o, M),
-          dimmed: y ? !t.getColumnValue(y.value, n) : !1,
-          idx: n
-        }));
-      }
+import { sortDotsByGrouping as w } from "./utils/sortDotsByGrouping.js";
+import { format as G } from "../node_modules/d3-format/src/defaultLocale.js";
+function D(t, y, v, I, o, r, g) {
+  const a = {}, C = o != null && o.format ? G(o.format) : void 0;
+  for (const p of y) {
+    const u = [];
+    let i = 1 / 0, s = 1 / 0, f = -1 / 0, l = -1 / 0;
+    const M = p.concat([""]), x = t.getRowsByGrouping(M);
+    for (let c = 0; c < x.length; c++) {
+      const n = x[c], e = t.getColumnValue(v.value, n), m = t.getColumnValue(I.value, n);
+      e === null && m === null || (i = Math.min(i, e), s = Math.min(s, m), f = Math.max(f, e), l = Math.max(l, m), u.push({
+        x: e,
+        y: m,
+        label: V(t, n, o, C),
+        dimmed: r ? !t.getColumnValue(r.value, n) : !1,
+        idx: n
+      }));
     }
-    i.sort((c, e) => c.x - e.x), p[g.join("_")] = {
-      minX: u,
-      maxX: s,
-      minY: f,
+    w(t, u, g, r), a[p.join("_")] = {
+      minX: i,
+      maxX: f,
+      minY: s,
       maxY: l,
-      dots: i
+      dots: u
     };
   }
-  return p;
+  return a;
 }
 export {
-  d as getDots
+  D as getDots
 };
 //# sourceMappingURL=dots.js.map

package/dist/scatterplot/dots.js.map

@@ -1 +1 @@
-{"version":3,"file":"dots.js","sources":["../../src/scatterplot/dots.ts"],"sourcesContent":["import {format} from 'd3-format';\nimport type { DataFrame } from '../DataFrame';\nimport type { ColumnName, DataValue } from '../types';\nimport {formatColumnValue} from './utils/formatColumnValue';\n\nexport type Dot = {\n    idx: number;\n    x: number;\n    y: number;\n    label: DataValue | null;\n    dimmed: boolean;\n};\n\nexport type GroupedDots = Record<\n    string,\n    {\n        minX: number;\n        maxX: number;\n        minY: number;\n        maxY: number;\n        dots: Dot[];\n    }\n>;\n\nexport function getDots(\n    data: DataFrame,\n    facetKeysCombinations: string[][],\n    x: ColumnName,\n    y: ColumnName,\n    label: ColumnName | null,\n    highlight: ColumnName | null,\n    keys: string[]\n): GroupedDots {\n    const result: GroupedDots = {};\n\n    const labelFormatter = label?.format ? format(label.format) : undefined;\n\n    for (const facetKeys of facetKeysCombinations) {\n        const dots: Dot[] = [];\n        let minX = Infinity;\n        let minY = Infinity;\n        let maxX = -Infinity;\n        let maxY = -Infinity;\n\n        const templateGroupPath = facetKeys.concat(['']);\n        for (const primaryKey of keys) {\n            templateGroupPath[templateGroupPath.length - 1] = primaryKey;\n            const rows = data.getRowsByGrouping(templateGroupPath);\n\n            for (let i = 0; i < rows.length; i++) {\n                const rowIdx = rows[i];\n                const valueX = data.getColumnValue(x.value, rowIdx) as number;\n                const valueY = data.getColumnValue(y.value, rowIdx) as number;\n\n                if (valueX === null && valueY === null) continue;\n\n                minX = Math.min(minX, valueX);\n                minY = Math.min(minY, valueY);\n                maxX = Math.max(maxX, valueX);\n                maxY = Math.max(maxY, valueY);\n\n                dots.push({\n                    x: valueX,\n                    y: valueY,\n                    label: formatColumnValue(data, rowIdx, label, labelFormatter),\n                    dimmed: highlight ? !data.getColumnValue(highlight.value, rowIdx) : false,\n                    idx: rowIdx\n                });\n            }\n        }\n\n        dots.sort((d1, d2) => d1.x - d2.x);\n\n        result[facetKeys.join('_')] = {\n            minX,\n            maxX,\n            minY,\n            maxY,\n            dots,\n        };\n    }\n\n    return result;\n}\n"],"names":["getDots","data","facetKeysCombinations","x","y","label","highlight","keys","result","labelFormatter","format","facetKeys","dots","minX","minY","maxX","maxY","templateGroupPath","primaryKey","rows","i","rowIdx","valueX","valueY","formatColumnValue","d1","d2"],"mappings":";;AAwBO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACW;AACX,QAAMC,IAAsB,CAAA,GAEtBC,IAAiBJ,KAAA,QAAAA,EAAO,SAASK,EAAOL,EAAM,MAAM,IAAI;AAE9D,aAAWM,KAAaT,GAAuB;AAC3C,UAAMU,IAAc,CAAA;AACpB,QAAIC,IAAO,OACPC,IAAO,OACPC,IAAO,QACPC,IAAO;AAEX,UAAMC,IAAoBN,EAAU,OAAO,CAAC,EAAE,CAAC;AAC/C,eAAWO,KAAcX,GAAM;AAC3B,MAAAU,EAAkBA,EAAkB,SAAS,CAAC,IAAIC;AAClD,YAAMC,IAAOlB,EAAK,kBAAkBgB,CAAiB;AAErD,eAASG,IAAI,GAAGA,IAAID,EAAK,QAAQC,KAAK;AAClC,cAAMC,IAASF,EAAKC,CAAC,GACfE,IAASrB,EAAK,eAAeE,EAAE,OAAOkB,CAAM,GAC5CE,IAAStB,EAAK,eAAeG,EAAE,OAAOiB,CAAM;AAElD,QAAIC,MAAW,QAAQC,MAAW,SAElCV,IAAO,KAAK,IAAIA,GAAMS,CAAM,GAC5BR,IAAO,KAAK,IAAIA,GAAMS,CAAM,GAC5BR,IAAO,KAAK,IAAIA,GAAMO,CAAM,GAC5BN,IAAO,KAAK,IAAIA,GAAMO,CAAM,GAE5BX,EAAK,KAAK;AAAA,UACN,GAAGU;AAAA,UACH,GAAGC;AAAA,UACH,OAAOC,EAAkBvB,GAAMoB,GAAQhB,GAAOI,CAAc;AAAA,UAC5D,QAAQH,IAAY,CAACL,EAAK,eAAeK,EAAU,OAAOe,CAAM,IAAI;AAAA,UACpE,KAAKA;AAAA,QAAA,CACR;AAAA,MACL;AAAA,IACJ;AAEA,IAAAT,EAAK,KAAK,CAACa,GAAIC,MAAOD,EAAG,IAAIC,EAAG,CAAC,GAEjClB,EAAOG,EAAU,KAAK,GAAG,CAAC,IAAI;AAAA,MAC1B,MAAAE;AAAA,MACA,MAAAE;AAAA,MACA,MAAAD;AAAA,MACA,MAAAE;AAAA,MACA,MAAAJ;AAAA,IAAA;AAAA,EAER;AAEA,SAAOJ;AACX;"}
+{"version":3,"file":"dots.js","sources":["../../src/scatterplot/dots.ts"],"sourcesContent":["import {format} from 'd3-format';\nimport type { DataFrame } from '../DataFrame';\nimport type { ColumnName, DataValue } from '../types';\nimport type { ScatterplotSettingsImpl } from './ScatterplotSettingsImpl';\nimport {formatColumnValue} from './utils/formatColumnValue';\nimport {sortDotsByGrouping} from './utils/sortDotsByGrouping';\n\nexport type Dot = {\n    idx: number;\n    x: number;\n    y: number;\n    label: DataValue | null;\n    dimmed: boolean;\n};\n\nexport type GroupedDots = Record<\n    string,\n    {\n        minX: number;\n        maxX: number;\n        minY: number;\n        maxY: number;\n        dots: Dot[];\n    }\n>;\n\nexport function getDots(\n    data: DataFrame,\n    facetKeysCombinations: string[][],\n    x: ColumnName,\n    y: ColumnName,\n    label: ColumnName | null,\n    highlight: ColumnName | null,\n    grouping: ScatterplotSettingsImpl['grouping']\n): GroupedDots {\n    const result: GroupedDots = {};\n\n    const labelFormatter = label?.format ? format(label.format) : undefined;\n\n    for (const facetKeys of facetKeysCombinations) {\n        const dots: Dot[] = [];\n        let minX = Infinity;\n        let minY = Infinity;\n        let maxX = -Infinity;\n        let maxY = -Infinity;\n\n        const templateGroupPath = facetKeys.concat(['']);\n        const rows = data.getRowsByGrouping(templateGroupPath);\n\n        for (let i = 0; i < rows.length; i++) {\n            const rowIdx = rows[i];\n            const valueX = data.getColumnValue(x.value, rowIdx) as number;\n            const valueY = data.getColumnValue(y.value, rowIdx) as number;\n\n            if (valueX === null && valueY === null) continue;\n\n            minX = Math.min(minX, valueX);\n            minY = Math.min(minY, valueY);\n            maxX = Math.max(maxX, valueX);\n            maxY = Math.max(maxY, valueY);\n\n            dots.push({\n                x: valueX,\n                y: valueY,\n                label: formatColumnValue(data, rowIdx, label, labelFormatter),\n                dimmed: highlight ? !data.getColumnValue(highlight.value, rowIdx) : false,\n                idx: rowIdx\n            });\n        }\n\n        sortDotsByGrouping(data, dots, grouping, highlight);\n\n        result[facetKeys.join('_')] = {\n            minX,\n            maxX,\n            minY,\n            maxY,\n            dots,\n        };\n    }\n\n    return result;\n}\n"],"names":["getDots","data","facetKeysCombinations","x","y","label","highlight","grouping","result","labelFormatter","format","facetKeys","dots","minX","minY","maxX","maxY","templateGroupPath","rows","i","rowIdx","valueX","valueY","formatColumnValue","sortDotsByGrouping"],"mappings":";;;AA0BO,SAASA,EACZC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACW;AACX,QAAMC,IAAsB,CAAA,GAEtBC,IAAiBJ,KAAA,QAAAA,EAAO,SAASK,EAAOL,EAAM,MAAM,IAAI;AAE9D,aAAWM,KAAaT,GAAuB;AAC3C,UAAMU,IAAc,CAAA;AACpB,QAAIC,IAAO,OACPC,IAAO,OACPC,IAAO,QACPC,IAAO;AAEX,UAAMC,IAAoBN,EAAU,OAAO,CAAC,EAAE,CAAC,GACzCO,IAAOjB,EAAK,kBAAkBgB,CAAiB;AAErD,aAASE,IAAI,GAAGA,IAAID,EAAK,QAAQC,KAAK;AAClC,YAAMC,IAASF,EAAKC,CAAC,GACfE,IAASpB,EAAK,eAAeE,EAAE,OAAOiB,CAAM,GAC5CE,IAASrB,EAAK,eAAeG,EAAE,OAAOgB,CAAM;AAElD,MAAIC,MAAW,QAAQC,MAAW,SAElCT,IAAO,KAAK,IAAIA,GAAMQ,CAAM,GAC5BP,IAAO,KAAK,IAAIA,GAAMQ,CAAM,GAC5BP,IAAO,KAAK,IAAIA,GAAMM,CAAM,GAC5BL,IAAO,KAAK,IAAIA,GAAMM,CAAM,GAE5BV,EAAK,KAAK;AAAA,QACN,GAAGS;AAAA,QACH,GAAGC;AAAA,QACH,OAAOC,EAAkBtB,GAAMmB,GAAQf,GAAOI,CAAc;AAAA,QAC5D,QAAQH,IAAY,CAACL,EAAK,eAAeK,EAAU,OAAOc,CAAM,IAAI;AAAA,QACpE,KAAKA;AAAA,MAAA,CACR;AAAA,IACL;AAEA,IAAAI,EAAmBvB,GAAMW,GAAML,GAAUD,CAAS,GAElDE,EAAOG,EAAU,KAAK,GAAG,CAAC,IAAI;AAAA,MAC1B,MAAAE;AAAA,MACA,MAAAE;AAAA,MACA,MAAAD;AAAA,MACA,MAAAE;AAAA,MACA,MAAAJ;AAAA,IAAA;AAAA,EAER;AAEA,SAAOJ;AACX;"}

package/dist/scatterplot/getLayersData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLayersData.d.ts","sourceRoot":"","sources":["../../src/scatterplot/getLayersData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEvE,MAAM,MAAM,aAAa,GAAI;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,GAAG,EAAE,CAAA;CACf,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACpB,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AACD,MAAM,MAAM,cAAc,GAAI;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,SAAS,EAAE,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,cAAc,CAAC;AAElE,wBAAgB,aAAa,CACzB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EAAE,EAC1B,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,WAAW,EACzB,4BAA4B,EAAE,MAAM,EAAE,EAAE,EACxC,QAAQ,EAAE,UAAU,EAAE,GACvB,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CA2BxC"}
+{"version":3,"file":"getLayersData.d.ts","sourceRoot":"","sources":["../../src/scatterplot/getLayersData.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAE7D,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEvE,MAAM,MAAM,aAAa,GAAI;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,GAAG,EAAE,CAAA;CACf,CAAA;AAED,MAAM,MAAM,SAAS,GAAG;IACpB,IAAI,EAAE,GAAG,EAAE,CAAC;CACf,CAAA;AACD,MAAM,MAAM,cAAc,GAAI;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,SAAS,EAAE,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG,aAAa,GAAG,cAAc,CAAC;AAElE,wBAAgB,aAAa,CACzB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,gBAAgB,EAAE,EAC1B,SAAS,EAAE,MAAM,EAAE,EACnB,YAAY,EAAE,WAAW,EACzB,4BAA4B,EAAE,MAAM,EAAE,EAAE,EACxC,QAAQ,EAAE,UAAU,EAAE,GACvB,MAAM,CAAC,MAAM,EAAE,oBAAoB,EAAE,CAAC,CA4BxC"}

package/dist/scatterplot/getLayersData.js

@@ -1,27 +1,30 @@
-import { exhaustive as g } from "../utils/index.js";
-function x(s, u, i, p, f, c) {
-  return i.reduce((o, r) => {
-    const n = p[r].dots;
-    return o[r] = u.map((t) => {
+import { exhaustive as v } from "../utils/index.js";
+function l(p, f, c, a, d, m) {
+  return c.reduce((n, s) => {
+    const u = a[s].dots;
+    return n[s] = f.map((t) => {
       if (t.type === "curve")
         return {
           type: "curve",
           info: t,
-          geoms: f.map((e) => ({ dots: n.filter(
-            (d) => c.every((a, m) => String(s.getColumnValue(a.value, d.idx)) === e[m])
-          ) })).filter((e) => e.dots.length > 0)
+          geoms: d.map((e) => {
+            const i = u.filter(
+              (o) => m.every((r, g) => String(p.getColumnValue(r.value, o.idx)) === e[g])
+            );
+            return i.sort((o, r) => o.x - r.x), { dots: i };
+          }).filter((e) => e.dots.length > 0)
         };
       if (t.type === "dots")
         return {
           type: "dots",
           info: t,
-          geoms: n
+          geoms: u
         };
-      g(t, "Unknown scatterplot layer type");
-    }), o;
+      v(t, "Unknown scatterplot layer type");
+    }), n;
   }, {});
 }
 export {
-  x as getLayersData
+  l as getLayersData
 };
 //# sourceMappingURL=getLayersData.js.map