@milaboratories/miplots4 1.0.174 → 1.0.176

package/dist/discrete/components/layers/StackedAreaElement.js

@@ -6,34 +6,34 @@ import { bumpX as G, bumpY as B } from "../../../node_modules/.pnpm/d3-shape@3.2
 function C(t) {
   return t && typeof t == "object" && "type" in t && t.type === "secondaryGrouping";
 }
-function P(t, n, e, r, x) {
+function P(t, n, e, r, h) {
   if (e && typeof e == "object" && "type" in e) {
     if (e.type === "primaryGrouping")
       return t.xPrimaryAes(r)[n];
     if (e.type === "secondaryGrouping")
-      return t.xSecondaryAes(x)[n];
+      return t.xSecondaryAes(h)[n];
   }
   return e;
 }
-function W(t, n, e, r, x, d, l) {
-  const y = (e - n) / 2, a = l.reduce((s, i) => {
-    const p = {};
+function W(t, n, e, r, h, d, j) {
+  const y = (e - n) / 2, a = j.reduce((p, i) => {
+    const c = {};
     let o = 0;
-    return x.forEach((c) => {
-      var u;
-      const m = ((u = i.valuesMap[c]) == null ? void 0 : u.height) ?? 0;
-      p[c] = {
+    return h.forEach((m) => {
+      var s;
+      const u = ((s = i.valuesMap[m]) == null ? void 0 : s.height) ?? 0;
+      c[m] = {
         y1: o,
-        y2: o + m
-      }, o += m;
-    }), s[i.primaryGrouping] = p, s;
+        y2: o + u
+      }, o += u;
+    }), p[i.primaryGrouping] = c, p;
   }, {});
-  return x.map((s) => {
+  return h.map((p) => {
     const i = r.flatMap((o) => {
-      const c = a[o], m = t.xPrimary(o) ?? 0, u = t.y(c[s].y1), A = t.y(c[s].y2), h = [m + y, u, A], j = [m + e - y, u, A];
-      return d ? [h, j] : [j, h];
-    }), p = (d ? S().curve(G).x((o) => o[0]).y0((o) => o[1]).y1((o) => o[2])(i) : S().curve(B).y((o) => o[0]).x0((o) => o[1]).x1((o) => o[2])(i)) ?? "";
-    return { secondaryKey: s, pathD: p };
+      const m = a[o], u = t.xPrimary(o) ?? 0, s = t.y(m[p].y1), l = t.y(m[p].y2), x = [u + y, s, l], A = [u + e - y, s, l];
+      return d ? [x, A] : [A, x];
+    }), c = (d ? S().curve(G).x((o) => o[0]).y0((o) => o[1]).y1((o) => o[2])(i) : S().curve(B).y((o) => o[0]).x0((o) => o[1]).x1((o) => o[2])(i)) ?? "";
+    return { secondaryKey: p, pathD: c };
   });
 }
 function k(t, n) {
@@ -44,31 +44,31 @@ function X({
   scales: n,
   orientation: e,
   layerData: r,
-  sideDistances: x,
+  sideDistances: h,
   showTooltips: d,
-  secondaryGrouping: l,
+  secondaryGrouping: j,
   activeElementContainer: y,
   tooltipsContainer: a,
-  tooltipsData: s
+  tooltipsData: p
 }) {
-  const [i, p] = E.useState(null), o = e === "vertical", c = n.xPrimary.bandwidth(), m = k(r, c), u = n.xPrimary.domain(), A = n.xSecondary.domain().reverse(), h = C(r.aes.fillColor) || typeof r.aes.fillColor == "string", j = h ? W(
+  const [i, c] = E.useState(null), o = e === "vertical", m = n.xPrimary.bandwidth(), u = k(r, m), s = n.xPrimary.domain(), l = n.xSecondary.domain().reverse(), x = s.length > 1 && (C(r.aes.fillColor) || typeof r.aes.fillColor == "string"), A = x ? W(
     n,
-    m,
-    c,
     u,
-    A,
+    m,
+    s,
+    l,
     o,
     r.geoms[t]
   ) : [];
   return /* @__PURE__ */ g.jsxs("g", { children: [
-    /* @__PURE__ */ g.jsx("g", { children: h && j.map(({ secondaryKey: f, pathD: b }) => /* @__PURE__ */ g.jsx(
+    /* @__PURE__ */ g.jsx("g", { children: x && A.map(({ secondaryKey: f, pathD: b }) => /* @__PURE__ */ g.jsx(
       "path",
       {
         d: b,
-        fill: P(n, "fillColor", r.aes.fillColor, u[0], f),
+        fill: P(n, "fillColor", r.aes.fillColor, s[0], f),
         opacity: r.aes.areaOpacity * (i !== null && f !== i ? 0.5 : 1),
-        onMouseEnter: () => p(f),
-        onMouseLeave: () => p(null)
+        onMouseEnter: () => c(f),
+        onMouseLeave: () => c(null)
       },
       f
     )) }),
@@ -82,18 +82,18 @@ function X({
         orientation: e,
         aes: {
           ...r.aes,
-          width: m,
+          width: u,
           opacity: r.aes.barsOpacity
         },
         normalize: r.meta.normalize,
-        sideDistances: x,
+        sideDistances: h,
         showTooltips: d,
-        secondaryGrouping: l,
-        tooltipsData: s,
+        secondaryGrouping: j,
+        tooltipsData: p,
         activeElementContainer: y,
         tooltipsContainer: a,
         activeKey: i,
-        onSectionHover: p
+        onSectionHover: c
       },
       f.key
     )) })

package/dist/discrete/components/layers/StackedAreaElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"StackedAreaElement.js","sources":["../../../../src/discrete/components/layers/StackedAreaElement.tsx"],"sourcesContent":["import {area, curveBumpX, curveBumpY} from 'd3-shape';\nimport React, { useState } from 'react';\nimport type {TooltipsData} from '../../../common/Tooltip';\nimport type {AesItem, GroupingData, InheritAesDiscrete, Orientation} from '../../../types';\nimport type {StackedBar} from '../../layers';\nimport type {StackedAreaData} from '../../layers/types';\nimport type {ChartScales} from '../types';\nimport {StackedBarElement} from './StackedBarElement';\n\ninterface StackedAreaProps {\n    facetKey: string;\n    scales: ChartScales;\n    layerData: StackedAreaData;\n    orientation: Orientation;\n    sideDistances: {\n        left: number;\n        right: number;\n        top: number;\n        bottom: number;\n    };\n    showTooltips: boolean;\n    secondaryGrouping: GroupingData;\n    tooltipsData: TooltipsData<unknown>;\n    activeElementContainer?: Element;\n    tooltipsContainer?: Element;\n}\n\nfunction isSecondaryGroupedAes (value: string | InheritAesDiscrete) {\n    return value && typeof value === 'object' && 'type' in value && value.type === 'secondaryGrouping';\n}\n\nfunction getAesValue<ValueType>(\n    scales: ChartScales,\n    field: keyof AesItem,\n    value: ValueType | InheritAesDiscrete,\n    primaryGrouping: string,\n    secondaryGrouping: string\n): ValueType {\n    if (value && typeof value === 'object' && 'type' in value) {\n        if (value.type === 'primaryGrouping') {\n            return scales.xPrimaryAes(primaryGrouping)[field] as ValueType;\n        }\n        if (value.type === 'secondaryGrouping') {\n            return scales.xSecondaryAes(secondaryGrouping)[field] as ValueType;\n        }\n    }\n    return value as ValueType;\n}\n\nfunction getAreas(\n    scales: ChartScales,\n    barWidth: number,\n    bandWidth: number,\n    primaryKeys: string[],\n    secondaryKeys: string[],\n    isVertical: boolean,\n    bars: StackedBar[],\n) {\n    const offsetX = (bandWidth - barWidth) / 2;\n    const ys = bars.reduce((res, bar) => {\n        const yValues: Record<string, {y1: number, y2: number}> = {};\n        let currentHeight = 0;\n        secondaryKeys.forEach(secondaryKey => {\n            const height = bar.valuesMap[secondaryKey]?.height ?? 0;\n            yValues[secondaryKey] = {\n                y1: currentHeight,\n                y2: currentHeight + height,\n            };\n            currentHeight += height;\n        });\n        res[bar.primaryGrouping] = yValues;\n        return res;\n    }, {} as Record<string, Record<string, {y1: number, y2: number}>>);\n\n    return secondaryKeys.map((secondaryKey) => {\n        const points:[number, number, number][] = primaryKeys.flatMap((primaryKey) => {\n            const yMap = ys[primaryKey];\n            const x = scales.xPrimary(primaryKey) ?? 0;\n            const y1 = scales.y(yMap[secondaryKey].y1);\n            const y2 = scales.y(yMap[secondaryKey].y2);\n            const p1:[number, number, number] = [x + offsetX, y1, y2];\n            const p2:[number, number, number] = [x + bandWidth - offsetX, y1, y2];\n            return isVertical ? [p1, p2] : [p2, p1];\n        });\n\n        const pathD = (isVertical ? (\n            area<[number, number, number]>()\n                .curve(curveBumpX)\n                .x(d => d[0])\n                .y0(d => d[1])\n                .y1(d => d[2])(points)\n            ) :\n            area<[number, number, number]>()\n                .curve(curveBumpY)\n                .y(d => d[0])\n                .x0(d => d[1])\n                .x1(d => d[2])(points)) ?? '';\n        return {secondaryKey, pathD};\n    });\n}\n\nfunction calculateBarWidth (\n    layerData: StackedAreaData,\n    bandwidth: number\n) {\n    if (!layerData.meta.showBars) {\n        return 0;\n    }\n    return layerData.aes.barWidth === 'auto' ? bandwidth * 0.2 : Math.min(bandwidth, layerData.aes.barWidth);\n}\n\nexport function StackedAreaElement({\n    facetKey,\n    scales,\n    orientation,\n    layerData,\n    sideDistances,\n    showTooltips,\n    secondaryGrouping,\n    activeElementContainer,\n    tooltipsContainer,\n    tooltipsData,\n}: StackedAreaProps) {\n    const [selectedAreaKey, setSelectedAreaKey] = useState<string | null>(null);\n    const isVertical = orientation === 'vertical';\n    const boxOuterWidth = scales.xPrimary.bandwidth();\n    const boxWidth = calculateBarWidth(layerData, boxOuterWidth);\n    const primaryKeys = scales.xPrimary.domain();\n    const secondaryKeys = scales.xSecondary.domain().reverse();\n\n    const needsAreas = isSecondaryGroupedAes(layerData.aes.fillColor) || typeof layerData.aes.fillColor === 'string';\n    const areas = needsAreas ? getAreas(\n        scales,\n        boxWidth,\n        boxOuterWidth,\n        primaryKeys,\n        secondaryKeys,\n        isVertical,\n        layerData.geoms[facetKey]\n    ) : [];\n\n    return (\n        <g>\n            <g>\n                {needsAreas && areas.map(({secondaryKey, pathD}) => (\n                    <path\n                        key={secondaryKey}\n                        d={pathD}\n                        fill={getAesValue(scales, 'fillColor', layerData.aes.fillColor, primaryKeys[0], secondaryKey)}\n                        opacity={layerData.aes.areaOpacity * (selectedAreaKey !== null && secondaryKey !== selectedAreaKey ? 0.5 : 1)}\n                        onMouseEnter={() => setSelectedAreaKey(secondaryKey)}\n                        onMouseLeave={() => setSelectedAreaKey(null)}\n                    />\n                ))}\n            </g>\n            <g>\n            {layerData.meta.showBars && (layerData as StackedAreaData).geoms[facetKey].map(geom => (\n                <StackedBarElement\n                    key={geom.key}\n                    facetKey={facetKey}\n                    geom={geom}\n                    elementsAmount={layerData.geoms[facetKey].length}\n                    scales={scales}\n                    orientation={orientation}\n                    aes={{\n                        ...layerData.aes,\n                        width: boxWidth,\n                        opacity: layerData.aes.barsOpacity\n                    }}\n                    normalize={layerData.meta.normalize}\n                    sideDistances={sideDistances}\n                    showTooltips={showTooltips}\n                    secondaryGrouping={secondaryGrouping}\n                    tooltipsData={tooltipsData}\n                    activeElementContainer={activeElementContainer}\n                    tooltipsContainer={tooltipsContainer}\n                    activeKey={selectedAreaKey}\n                    onSectionHover={setSelectedAreaKey}\n                />\n            ))}\n            </g>\n        </g>\n    );\n}\n"],"names":["isSecondaryGroupedAes","value","getAesValue","scales","field","primaryGrouping","secondaryGrouping","getAreas","barWidth","bandWidth","primaryKeys","secondaryKeys","isVertical","bars","offsetX","ys","res","bar","yValues","currentHeight","secondaryKey","height","_a","points","primaryKey","yMap","x","y1","y2","p1","p2","pathD","area","curveBumpX","d","curveBumpY","calculateBarWidth","layerData","bandwidth","StackedAreaElement","facetKey","orientation","sideDistances","showTooltips","activeElementContainer","tooltipsContainer","tooltipsData","selectedAreaKey","setSelectedAreaKey","useState","boxOuterWidth","boxWidth","needsAreas","areas","jsx","geom","StackedBarElement"],"mappings":";;;;;AA2BA,SAASA,EAAuBC,GAAoC;AAChE,SAAOA,KAAS,OAAOA,KAAU,YAAY,UAAUA,KAASA,EAAM,SAAS;AACnF;AAEA,SAASC,EACLC,GACAC,GACAH,GACAI,GACAC,GACS;AACT,MAAIL,KAAS,OAAOA,KAAU,YAAY,UAAUA,GAAO;AACvD,QAAIA,EAAM,SAAS;AACf,aAAOE,EAAO,YAAYE,CAAe,EAAED,CAAK;AAEpD,QAAIH,EAAM,SAAS;AACf,aAAOE,EAAO,cAAcG,CAAiB,EAAEF,CAAK;AAAA,EAE5D;AACA,SAAOH;AACX;AAEA,SAASM,EACLJ,GACAK,GACAC,GACAC,GACAC,GACAC,GACAC,GACF;AACE,QAAMC,KAAWL,IAAYD,KAAY,GACnCO,IAAKF,EAAK,OAAO,CAACG,GAAKC,MAAQ;AACjC,UAAMC,IAAoD,CAAA;AAC1D,QAAIC,IAAgB;AACpB,WAAAR,EAAc,QAAQ,CAAAS,MAAgB;;AAClC,YAAMC,MAASC,IAAAL,EAAI,UAAUG,CAAY,MAA1B,gBAAAE,EAA6B,WAAU;AACtD,MAAAJ,EAAQE,CAAY,IAAI;AAAA,QACpB,IAAID;AAAA,QACJ,IAAIA,IAAgBE;AAAA,MAAA,GAExBF,KAAiBE;AAAA,IACrB,CAAC,GACDL,EAAIC,EAAI,eAAe,IAAIC,GACpBF;AAAA,EACX,GAAG,CAAA,CAA8D;AAEjE,SAAOL,EAAc,IAAI,CAACS,MAAiB;AACvC,UAAMG,IAAoCb,EAAY,QAAQ,CAACc,MAAe;AAC1E,YAAMC,IAAOV,EAAGS,CAAU,GACpBE,IAAIvB,EAAO,SAASqB,CAAU,KAAK,GACnCG,IAAKxB,EAAO,EAAEsB,EAAKL,CAAY,EAAE,EAAE,GACnCQ,IAAKzB,EAAO,EAAEsB,EAAKL,CAAY,EAAE,EAAE,GACnCS,IAA8B,CAACH,IAAIZ,GAASa,GAAIC,CAAE,GAClDE,IAA8B,CAACJ,IAAIjB,IAAYK,GAASa,GAAIC,CAAE;AACpE,aAAOhB,IAAa,CAACiB,GAAIC,CAAE,IAAI,CAACA,GAAID,CAAE;AAAA,IAC1C,CAAC,GAEKE,KAASnB,IACXoB,IACK,MAAMC,CAAU,EAChB,EAAE,CAAAC,MAAKA,EAAE,CAAC,CAAC,EACX,GAAG,CAAAA,MAAKA,EAAE,CAAC,CAAC,EACZ,GAAG,CAAAA,MAAKA,EAAE,CAAC,CAAC,EAAEX,CAAM,IAEzBS,EAAA,EACK,MAAMG,CAAU,EAChB,EAAE,CAAAD,MAAKA,EAAE,CAAC,CAAC,EACX,GAAG,OAAKA,EAAE,CAAC,CAAC,EACZ,GAAG,CAAAA,MAAKA,EAAE,CAAC,CAAC,EAAEX,CAAM,MAAM;AACnC,WAAO,EAAC,cAAAH,GAAc,OAAAW,EAAA;AAAA,EAC1B,CAAC;AACL;AAEA,SAASK,EACLC,GACAC,GACF;AACE,SAAKD,EAAU,KAAK,WAGbA,EAAU,IAAI,aAAa,SAASC,IAAY,MAAM,KAAK,IAAIA,GAAWD,EAAU,IAAI,QAAQ,IAF5F;AAGf;AAEO,SAASE,EAAmB;AAAA,EAC/B,UAAAC;AAAA,EACA,QAAArC;AAAA,EACA,aAAAsC;AAAA,EACA,WAAAJ;AAAA,EACA,eAAAK;AAAA,EACA,cAAAC;AAAA,EACA,mBAAArC;AAAA,EACA,wBAAAsC;AAAA,EACA,mBAAAC;AAAA,EACA,cAAAC;AACJ,GAAqB;AACjB,QAAM,CAACC,GAAiBC,CAAkB,IAAIC,EAAAA,SAAwB,IAAI,GACpErC,IAAa6B,MAAgB,YAC7BS,IAAgB/C,EAAO,SAAS,UAAA,GAChCgD,IAAWf,EAAkBC,GAAWa,CAAa,GACrDxC,IAAcP,EAAO,SAAS,OAAA,GAC9BQ,IAAgBR,EAAO,WAAW,OAAA,EAAS,QAAA,GAE3CiD,IAAapD,EAAsBqC,EAAU,IAAI,SAAS,KAAK,OAAOA,EAAU,IAAI,aAAc,UAClGgB,IAAQD,IAAa7C;AAAA,IACvBJ;AAAA,IACAgD;AAAA,IACAD;AAAA,IACAxC;AAAA,IACAC;AAAA,IACAC;AAAA,IACAyB,EAAU,MAAMG,CAAQ;AAAA,EAAA,IACxB,CAAA;AAEJ,gCACK,KAAA,EACG,UAAA;AAAA,IAAAc,gBAAAA,EAAAA,IAAC,KAAA,EACI,eAAcD,EAAM,IAAI,CAAC,EAAC,cAAAjC,GAAc,OAAAW,QACrCuB,gBAAAA,EAAAA;AAAAA,MAAC;AAAA,MAAA;AAAA,QAEG,GAAGvB;AAAA,QACH,MAAM7B,EAAYC,GAAQ,aAAakC,EAAU,IAAI,WAAW3B,EAAY,CAAC,GAAGU,CAAY;AAAA,QAC5F,SAASiB,EAAU,IAAI,eAAeU,MAAoB,QAAQ3B,MAAiB2B,IAAkB,MAAM;AAAA,QAC3G,cAAc,MAAMC,EAAmB5B,CAAY;AAAA,QACnD,cAAc,MAAM4B,EAAmB,IAAI;AAAA,MAAA;AAAA,MALtC5B;AAAA,IAAA,CAOZ,GACL;AAAA,IACAkC,gBAAAA,EAAAA,IAAC,KAAA,EACA,UAAAjB,EAAU,KAAK,YAAaA,EAA8B,MAAMG,CAAQ,EAAE,IAAI,CAAAe,MAC3ED,gBAAAA,EAAAA;AAAAA,MAACE;AAAA,MAAA;AAAA,QAEG,UAAAhB;AAAA,QACA,MAAAe;AAAA,QACA,gBAAgBlB,EAAU,MAAMG,CAAQ,EAAE;AAAA,QAC1C,QAAArC;AAAA,QACA,aAAAsC;AAAA,QACA,KAAK;AAAA,UACD,GAAGJ,EAAU;AAAA,UACb,OAAOc;AAAA,UACP,SAASd,EAAU,IAAI;AAAA,QAAA;AAAA,QAE3B,WAAWA,EAAU,KAAK;AAAA,QAC1B,eAAAK;AAAA,QACA,cAAAC;AAAA,QACA,mBAAArC;AAAA,QACA,cAAAwC;AAAA,QACA,wBAAAF;AAAA,QACA,mBAAAC;AAAA,QACA,WAAWE;AAAA,QACX,gBAAgBC;AAAA,MAAA;AAAA,MAnBXO,EAAK;AAAA,IAAA,CAqBjB,EAAA,CACD;AAAA,EAAA,GACJ;AAER;"}
+{"version":3,"file":"StackedAreaElement.js","sources":["../../../../src/discrete/components/layers/StackedAreaElement.tsx"],"sourcesContent":["import {area, curveBumpX, curveBumpY} from 'd3-shape';\nimport React, { useState } from 'react';\nimport type {TooltipsData} from '../../../common/Tooltip';\nimport type {AesItem, GroupingData, InheritAesDiscrete, Orientation} from '../../../types';\nimport type {StackedBar} from '../../layers';\nimport type {StackedAreaData} from '../../layers/types';\nimport type {ChartScales} from '../types';\nimport {StackedBarElement} from './StackedBarElement';\n\ninterface StackedAreaProps {\n    facetKey: string;\n    scales: ChartScales;\n    layerData: StackedAreaData;\n    orientation: Orientation;\n    sideDistances: {\n        left: number;\n        right: number;\n        top: number;\n        bottom: number;\n    };\n    showTooltips: boolean;\n    secondaryGrouping: GroupingData;\n    tooltipsData: TooltipsData<unknown>;\n    activeElementContainer?: Element;\n    tooltipsContainer?: Element;\n}\n\nfunction isSecondaryGroupedAes (value: string | InheritAesDiscrete) {\n    return value && typeof value === 'object' && 'type' in value && value.type === 'secondaryGrouping';\n}\n\nfunction getAesValue<ValueType>(\n    scales: ChartScales,\n    field: keyof AesItem,\n    value: ValueType | InheritAesDiscrete,\n    primaryGrouping: string,\n    secondaryGrouping: string\n): ValueType {\n    if (value && typeof value === 'object' && 'type' in value) {\n        if (value.type === 'primaryGrouping') {\n            return scales.xPrimaryAes(primaryGrouping)[field] as ValueType;\n        }\n        if (value.type === 'secondaryGrouping') {\n            return scales.xSecondaryAes(secondaryGrouping)[field] as ValueType;\n        }\n    }\n    return value as ValueType;\n}\n\nfunction getAreas(\n    scales: ChartScales,\n    barWidth: number,\n    bandWidth: number,\n    primaryKeys: string[],\n    secondaryKeys: string[],\n    isVertical: boolean,\n    bars: StackedBar[],\n) {\n    const offsetX = (bandWidth - barWidth) / 2;\n    const ys = bars.reduce((res, bar) => {\n        const yValues: Record<string, {y1: number, y2: number}> = {};\n        let currentHeight = 0;\n        secondaryKeys.forEach(secondaryKey => {\n            const height = bar.valuesMap[secondaryKey]?.height ?? 0;\n            yValues[secondaryKey] = {\n                y1: currentHeight,\n                y2: currentHeight + height,\n            };\n            currentHeight += height;\n        });\n        res[bar.primaryGrouping] = yValues;\n        return res;\n    }, {} as Record<string, Record<string, {y1: number, y2: number}>>);\n\n    return secondaryKeys.map((secondaryKey) => {\n        const points:[number, number, number][] = primaryKeys.flatMap((primaryKey) => {\n            const yMap = ys[primaryKey];\n            const x = scales.xPrimary(primaryKey) ?? 0;\n            const y1 = scales.y(yMap[secondaryKey].y1);\n            const y2 = scales.y(yMap[secondaryKey].y2);\n            const p1:[number, number, number] = [x + offsetX, y1, y2];\n            const p2:[number, number, number] = [x + bandWidth - offsetX, y1, y2];\n            return isVertical ? [p1, p2] : [p2, p1];\n        });\n\n        const pathD = (isVertical ? (\n            area<[number, number, number]>()\n                .curve(curveBumpX)\n                .x(d => d[0])\n                .y0(d => d[1])\n                .y1(d => d[2])(points)\n            ) :\n            area<[number, number, number]>()\n                .curve(curveBumpY)\n                .y(d => d[0])\n                .x0(d => d[1])\n                .x1(d => d[2])(points)) ?? '';\n        return {secondaryKey, pathD};\n    });\n}\n\nfunction calculateBarWidth (\n    layerData: StackedAreaData,\n    bandwidth: number\n) {\n    if (!layerData.meta.showBars) {\n        return 0;\n    }\n    return layerData.aes.barWidth === 'auto' ? bandwidth * 0.2 : Math.min(bandwidth, layerData.aes.barWidth);\n}\n\nexport function StackedAreaElement({\n    facetKey,\n    scales,\n    orientation,\n    layerData,\n    sideDistances,\n    showTooltips,\n    secondaryGrouping,\n    activeElementContainer,\n    tooltipsContainer,\n    tooltipsData,\n}: StackedAreaProps) {\n    const [selectedAreaKey, setSelectedAreaKey] = useState<string | null>(null);\n    const isVertical = orientation === 'vertical';\n    const boxOuterWidth = scales.xPrimary.bandwidth();\n    const boxWidth = calculateBarWidth(layerData, boxOuterWidth);\n    const primaryKeys = scales.xPrimary.domain();\n    const secondaryKeys = scales.xSecondary.domain().reverse();\n\n    const needsAreas = primaryKeys.length > 1 && (isSecondaryGroupedAes(layerData.aes.fillColor) || typeof layerData.aes.fillColor === 'string');\n    const areas = needsAreas ? getAreas(\n        scales,\n        boxWidth,\n        boxOuterWidth,\n        primaryKeys,\n        secondaryKeys,\n        isVertical,\n        layerData.geoms[facetKey]\n    ) : [];\n\n    return (\n        <g>\n            <g>\n                {needsAreas && areas.map(({secondaryKey, pathD}) => (\n                    <path\n                        key={secondaryKey}\n                        d={pathD}\n                        fill={getAesValue(scales, 'fillColor', layerData.aes.fillColor, primaryKeys[0], secondaryKey)}\n                        opacity={layerData.aes.areaOpacity * (selectedAreaKey !== null && secondaryKey !== selectedAreaKey ? 0.5 : 1)}\n                        onMouseEnter={() => setSelectedAreaKey(secondaryKey)}\n                        onMouseLeave={() => setSelectedAreaKey(null)}\n                    />\n                ))}\n            </g>\n            <g>\n            {layerData.meta.showBars && (layerData as StackedAreaData).geoms[facetKey].map(geom => (\n                <StackedBarElement\n                    key={geom.key}\n                    facetKey={facetKey}\n                    geom={geom}\n                    elementsAmount={layerData.geoms[facetKey].length}\n                    scales={scales}\n                    orientation={orientation}\n                    aes={{\n                        ...layerData.aes,\n                        width: boxWidth,\n                        opacity: layerData.aes.barsOpacity\n                    }}\n                    normalize={layerData.meta.normalize}\n                    sideDistances={sideDistances}\n                    showTooltips={showTooltips}\n                    secondaryGrouping={secondaryGrouping}\n                    tooltipsData={tooltipsData}\n                    activeElementContainer={activeElementContainer}\n                    tooltipsContainer={tooltipsContainer}\n                    activeKey={selectedAreaKey}\n                    onSectionHover={setSelectedAreaKey}\n                />\n            ))}\n            </g>\n        </g>\n    );\n}\n"],"names":["isSecondaryGroupedAes","value","getAesValue","scales","field","primaryGrouping","secondaryGrouping","getAreas","barWidth","bandWidth","primaryKeys","secondaryKeys","isVertical","bars","offsetX","ys","res","bar","yValues","currentHeight","secondaryKey","height","_a","points","primaryKey","yMap","x","y1","y2","p1","p2","pathD","area","curveBumpX","d","curveBumpY","calculateBarWidth","layerData","bandwidth","StackedAreaElement","facetKey","orientation","sideDistances","showTooltips","activeElementContainer","tooltipsContainer","tooltipsData","selectedAreaKey","setSelectedAreaKey","useState","boxOuterWidth","boxWidth","needsAreas","areas","jsx","geom","StackedBarElement"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/discrete/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAC6C,KAAK,qBAAqB,EAC1E,KAAK,gBAAgB,EAC+B,KAAK,YAAY,EACxE,MAAM,UAAU,CAAC;AAClB,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAIH,oBAAoB,EAUvB,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAwF3D,qBAAa,aAAc,SAAQ,aAAa;IAC5C,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,aAAa,gBAAuB;IAEpC,mBAAmB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAmB;IAC5D,cAAc,EAAE;QACZ,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,eAAe,EAAE,SAAS,EAAE,CAAC;QAC7B,eAAe,EAAE,YAAY,CAAC;QAC9B,iBAAiB,EAAE,YAAY,CAAC;QAChC,aAAa,EAAE,QAAQ,EAAE,EAAE,CAAC;QAC5B,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACjD,YAAY,EAAE,OAAO,CAAC;QACtB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;KACzC,GAAG,IAAI,CAAQ;gBAEJ,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,CAAC,EAAE,qBAAqB;IAS9F,KAAK,CAAC,IAAI,EAAE,WAAW;IAiBvB,OAAO;IAIP,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB;IA2BjE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,MAAM,IAAI,MAAM;IAKhB,mCAAmC,CAAC,YAAY,EAAE,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB;IAWtG,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAUpE,WAAW;IA0HX,gBAAgB;IA2BhB,YAAY;CAwBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/discrete/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExD,OAAO,EAC6C,KAAK,qBAAqB,EAC1E,KAAK,gBAAgB,EAAuB,KAAK,YAAY,EAChE,MAAM,UAAU,CAAC;AAClB,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAIH,oBAAoB,EAUvB,MAAM,wBAAwB,CAAC;AAgBhC,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AA0F3D,qBAAa,aAAc,SAAQ,aAAa;IAC5C,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,aAAa,gBAAuB;IAEpC,mBAAmB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,CAAmB;IAC5D,cAAc,EAAE;QACZ,UAAU,EAAE,SAAS,EAAE,CAAC;QACxB,eAAe,EAAE,SAAS,EAAE,CAAC;QAC7B,eAAe,EAAE,YAAY,CAAC;QAC9B,iBAAiB,EAAE,YAAY,CAAC;QAChC,aAAa,EAAE,QAAQ,EAAE,EAAE,CAAC;QAC5B,sBAAsB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACjD,YAAY,EAAE,OAAO,CAAC;QACtB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;KACzC,GAAG,IAAI,CAAQ;gBAEJ,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,CAAC,EAAE,qBAAqB;IAS9F,KAAK,CAAC,IAAI,EAAE,WAAW;IAiBvB,OAAO;IAIP,qBAAqB,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,gBAAgB;IA2BjE,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO;IAIhD,MAAM,IAAI,MAAM;IAKhB,mCAAmC,CAAC,YAAY,EAAE,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB;IAYtG,+BAA+B,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS;IAUpE,WAAW;IAiHX,gBAAgB;IAoBhB,YAAY;CAwBf"}

package/dist/discrete/index.js

@@ -1,237 +1,217 @@
-var O = Object.defineProperty;
-var F = (o, r, e) => r in o ? O(o, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : o[r] = e;
-var y = (o, r, e) => F(o, typeof r != "symbol" ? r + "" : r, e);
-import { l as x } from "../_virtual/lodash.js";
-import { s as T } from "../_virtual/server.browser.js";
-import { AbstractChart as M } from "../AbstractChart.js";
-import { NO_GROUPED as D } from "../DataFrame.js";
-import { getUnknownErrorInfo as v, isErrorInfo as w } from "../types/common.js";
+var P = Object.defineProperty;
+var O = (s, r, a) => r in s ? P(s, r, { enumerable: !0, configurable: !0, writable: !0, value: a }) : s[r] = a;
+var y = (s, r, a) => O(s, typeof r != "symbol" ? r + "" : r, a);
+import { l as G } from "../_virtual/lodash.js";
+import { s as U } from "../_virtual/server.browser.js";
+import { AbstractChart as F } from "../AbstractChart.js";
+import { NO_GROUPED as _ } from "../DataFrame.js";
+import { getUnknownErrorInfo as w, isErrorInfo as v } from "../types/common.js";
 import "../types/discrete.js";
 import "../types/scatterplot.js";
 import "../types/heatmap.js";
 import "../types/dendro.js";
 import "../types/histogram.js";
 import "../types/bubble.js";
-import j from "./ChartRenderer.js";
-import { MAX_GROUPS_COUNT as g, MAX_FACETS_COUNT as b } from "../constants.js";
-import { DiscreteSettingsImpl as B, StatLayer as G, BoxLayer as H, ViolinLayer as X, DotLayer as q, LineLayer as z, ErrorBarLayer as J, BarLayer as Q, StackedBarLayer as W, StackedAreaLayer as Y, BinnedDotsLayer as Z, PairedPointsLayer as $, SinaLayer as tt, LogoPlotLayer as at } from "./DiscreteSettingsImpl.js";
-import { getBoxesData as et } from "./layers/boxes.js";
-import { getViolinsData as rt } from "./layers/violins.js";
-import { getSinaData as nt } from "./layers/sina.js";
-import { getDotsData as ot } from "./layers/dots.js";
-import { getLinesData as st } from "./layers/lines.js";
-import { getErrorBarsData as it } from "./layers/errorbars.js";
-import { getBarsData as lt } from "./layers/bar.js";
-import { getStackedBarsData as ct } from "./layers/stackedBar.js";
-import { getStackedAreaData as ut } from "./layers/stackedArea.js";
-import { getBinnedDotsData as ht } from "./layers/binnedDots.js";
-import { getPairedPointsData as dt } from "./layers/pairedPoints.js";
-import { getLogoData as mt } from "./layers/logo.js";
-import { getStatsData as ft } from "./layers/stats/index.js";
-import { getFacetStringKey as _ } from "./utils/getFacetStringKey.js";
-import { arraysAreDifferent as pt } from "../utils/arraysAreDifferent.js";
-import { getFacetLabels as yt } from "./utils/getFacetLabels.js";
-function k(o, r, e = null) {
-  const t = r.value, n = o.getColumnCategories(t);
-  return x.intersection(e ?? n, n).map(String);
+import T from "./ChartRenderer.js";
+import { DiscreteSettingsImpl as B, StatLayer as C, BoxLayer as j, ViolinLayer as H, DotLayer as q, LineLayer as z, ErrorBarLayer as J, BarLayer as M, StackedBarLayer as Q, StackedAreaLayer as W, BinnedDotsLayer as X, PairedPointsLayer as Y, SinaLayer as Z, LogoPlotLayer as $ } from "./DiscreteSettingsImpl.js";
+import { getBoxesData as tt } from "./layers/boxes.js";
+import { getViolinsData as et } from "./layers/violins.js";
+import { getSinaData as at } from "./layers/sina.js";
+import { getDotsData as rt } from "./layers/dots.js";
+import { getLinesData as nt } from "./layers/lines.js";
+import { getErrorBarsData as st } from "./layers/errorbars.js";
+import { getBarsData as ot } from "./layers/bar.js";
+import { getStackedBarsData as it } from "./layers/stackedBar.js";
+import { getStackedAreaData as lt } from "./layers/stackedArea.js";
+import { getBinnedDotsData as ct } from "./layers/binnedDots.js";
+import { getPairedPointsData as ut } from "./layers/pairedPoints.js";
+import { getLogoData as ht } from "./layers/logo.js";
+import { getStatsData as dt } from "./layers/stats/index.js";
+import { getFacetStringKey as D } from "./utils/getFacetStringKey.js";
+import { arraysAreDifferent as k } from "../utils/arraysAreDifferent.js";
+import { getFacetLabels as mt } from "./utils/getFacetLabels.js";
+function ft(s, r, a = null) {
+  const t = r.value, n = s.getColumnCategories(t);
+  return G.intersection(a ?? n, n).map(String);
 }
-function A(o) {
-  if (!o.length)
+function pt(s) {
+  if (!s.length)
     return [];
   let r = [[]];
-  return o.forEach((e) => {
+  return s.forEach((a) => {
     const t = [];
-    e.forEach((n) => {
-      t.push(...r.map((i) => [...i, n]));
+    a.forEach((n) => {
+      t.push(...r.map((o) => [...o, n]));
     }), r = t;
   }), r;
 }
-function N(o, r) {
-  return !o && r || o && !r ? !0 : !o || !r ? !1 : o.columnName.value !== r.columnName.value || o.columnName.nullValueLabel !== r.columnName.nullValueLabel || pt(o.order, r.order, { ignoreOrder: !0 }) || o.allowNullGroup !== r.allowNullGroup;
+function K(s, r) {
+  return !s && r || s && !r ? !0 : !s || !r ? !1 : s.columnName.value !== r.columnName.value || s.columnName.nullValueLabel !== r.columnName.nullValueLabel || k(s.order, r.order, { ignoreOrder: !0 }) || s.allowNullGroup !== r.allowNullGroup;
 }
-function C(o, r) {
-  const e = (r == null ? void 0 : r.columnName.nullValueLabel) ?? "NA";
+function L(s, r) {
+  const a = (r == null ? void 0 : r.columnName.nullValueLabel) ?? "NA";
   if (!r)
     return {
+      groupingKeys: [_],
       keys: ["null"],
       value: null,
       label: "",
-      valueLabels: { null: e },
+      valueLabels: { null: "" },
       inheritedAes: null
     };
-  const t = r.columnName.value, n = r.columnName.valueLabels, i = o.getColumnCategories(t, !1), l = (h) => {
-    const d = n ? String(
-      o.getColumnValue(
+  const t = r.columnName.value, n = r.columnName.valueLabels, o = s.getColumnCategories(t, !1), i = (m) => {
+    const h = n ? String(
+      s.getColumnValue(
         n,
-        o.getColumnCategoryRowIndex(t, h)
+        s.getColumnCategoryRowIndex(t, m)
       )
-    ) : h;
-    return d === "null" ? e : d;
-  }, u = o.getColumnCategories(t, !r.allowNullGroup);
+    ) : m;
+    return h === "null" ? a : h;
+  }, l = s.getColumnCategories(t, !r.allowNullGroup), u = r.order === void 0 ? l : G.intersection(r.order.map(String), l);
   return {
-    keys: r.order === void 0 ? u : x.intersection(r.order.map(String), u),
+    keys: u,
+    groupingKeys: u,
     value: t,
     label: r.columnName.label ?? t,
-    valueLabels: i.reduce((h, d) => (h[d] = l(d), h), {}),
+    valueLabels: o.reduce((m, h) => (m[h] = i(h), m), {}),
     inheritedAes: r.inheritedAes ?? null
   };
 }
-class Jt extends M {
-  constructor(e, t, n) {
-    super(e, t);
+class Jt extends F {
+  constructor(a, t, n) {
+    super(a, t);
     y(this, "settings");
-    y(this, "chartRenderer", new j());
+    y(this, "chartRenderer", new T());
     y(this, "onTooltipHintSwitch", () => {
     });
     y(this, "calculatedData", null);
     this.settings = new B(t), n && (this.onTooltipHintSwitch = n[0]);
   }
-  mount(e) {
+  mount(a) {
     try {
-      this.chartRenderer.init(e), this._updateData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
+      this.chartRenderer.init(a), this._updateData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
     } catch (t) {
-      this.hasError = !0, t instanceof Error && (this.errorInfo = w(t.cause) ? t.cause : v(t), this.chartRenderer.renderError(t.message), console.error(t));
+      this.hasError = !0, t instanceof Error && (this.errorInfo = v(t.cause) ? t.cause : w(t), this.chartRenderer.renderError(t.message), console.error(t));
     }
   }
   unmount() {
     this.chartRenderer.clear();
   }
-  updateSettingsAndData(e, t) {
+  updateSettingsAndData(a, t) {
     try {
-      const n = this.settings, i = this.data;
-      this.settings = new B(t), this.data = e, this._needUpdateCalculatedDataBySettings(n, this.settings) || this._needUpdateCalculatedDataByData(i, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
+      const n = this.settings, o = this.data;
+      this.settings = new B(t), this.data = a, this._needUpdateCalculatedDataBySettings(n, this.settings) || this._needUpdateCalculatedDataByData(o, this.data) ? this._updateData() : this._updateAesInData(), this._updateChart(), this.hasError = !1, this.errorInfo = null;
     } catch (n) {
-      this.hasError = !0, n instanceof Error && (this.errorInfo = w(n.cause) ? n.cause : v(n), this.chartRenderer.renderError(n.message), console.error(n));
+      this.hasError = !0, n instanceof Error && (this.errorInfo = v(n.cause) ? n.cause : w(n), this.chartRenderer.renderError(n.message), console.error(n));
     }
   }
-  updateChartState(e, t) {
+  updateChartState(a, t) {
     console.warn("no chart state for discrete");
   }
   export() {
-    return this._updateChart(), T.renderToString(this.chartRenderer.component);
+    return this._updateChart(), U.renderToString(this.chartRenderer.component);
   }
-  _needUpdateCalculatedDataBySettings(e, t) {
-    return e.chartSettings.yAxis.scale !== t.chartSettings.yAxis.scale || N(e.primaryGrouping, t.primaryGrouping) || N(e.secondaryGrouping, t.secondaryGrouping) || e.facetBy.some((n, i) => {
-      var l;
-      return n.value !== ((l = t.facetBy[i]) == null ? void 0 : l.value);
-    }) || e.layers.length !== t.layers.length || e.layers.some((n, i) => !n.isEqualForCalculation(t.layers[i]));
-  }
-  _needUpdateCalculatedDataByData(e, t) {
-    const n = Object.keys(e.data), i = Object.keys(t.data);
-    return e.id !== t.id || n.length !== i.length || n.some((l) => {
+  _needUpdateCalculatedDataBySettings(a, t) {
+    var n, o;
+    return a.chartSettings.yAxis.scale !== t.chartSettings.yAxis.scale || K(a.primaryGrouping, t.primaryGrouping) || K(a.secondaryGrouping, t.secondaryGrouping) || a.facetBy.some((i, l) => {
       var u;
-      return e.data[l].length !== ((u = t.data[l]) == null ? void 0 : u.length);
+      return i.value !== ((u = t.facetBy[l]) == null ? void 0 : u.value);
+    }) || k(((n = a.facetSettings) == null ? void 0 : n.order) ?? [], ((o = t.facetSettings) == null ? void 0 : o.order) ?? []) || a.layers.length !== t.layers.length || a.layers.some((i, l) => !i.isEqualForCalculation(t.layers[l]));
+  }
+  _needUpdateCalculatedDataByData(a, t) {
+    const n = Object.keys(a.data), o = Object.keys(t.data);
+    return a.id !== t.id || n.length !== o.length || n.some((i) => {
+      var l;
+      return a.data[i].length !== ((l = t.data[i]) == null ? void 0 : l.length);
     });
   }
   _updateData() {
-    var E, S;
-    const { chartSettings: e, y: t, keyColumn: n, facetBy: i, layers: l, facetSettings: u } = this.settings, { yAxis: s } = e, h = this.data.getColumn(t.value).every((a) => a === null || !(Number(a) < 0)), d = C(this.data, this.settings.primaryGrouping), f = C(this.data, this.settings.secondaryGrouping), I = i.map((a) => a.value);
-    if (!((E = this.settings.primaryGrouping) != null && E.unlimitedGroupsCount) && d.keys.length > g) {
-      const a = {
-        type: "tooManyPrimaryGroups",
-        info: { count: d.keys.length, maxCount: g }
-      };
-      throw Error(a.type, { cause: a });
-    }
-    if (!((S = this.settings.secondaryGrouping) != null && S.unlimitedGroupsCount) && f.keys.length > g) {
-      const a = {
-        type: "tooManySecondaryGroups",
-        info: { count: f.keys.length, maxCount: g }
-      };
-      throw Error(a.type, { cause: a });
-    }
-    let m = A(
-      i.map((a) => {
-        var p;
-        return k(this.data, a, (p = u == null ? void 0 : u.order) == null ? void 0 : p[a.value]);
-      })
+    var E;
+    const { chartSettings: a, y: t, keyColumn: n, facetBy: o, layers: i, facetSettings: l } = this.settings, { yAxis: u } = a, m = this.data.getColumn(t.value).every((e) => e === null || !(Number(e) < 0)), h = L(this.data, this.settings.primaryGrouping), g = L(this.data, this.settings.secondaryGrouping), S = o.length ? o.map((e) => e.value) : [null];
+    let d = pt(
+      o.map((e) => ft(this.data, e))
     );
-    if (m.length === 0 && (m = [[D]]), m.length > b) {
-      const a = {
-        type: "tooManyFacets",
-        info: { count: m.length, maxCount: b }
-      };
-      throw Error(a.type, { cause: a });
+    if (d.length === 0 && (d = [[_]]), (E = l == null ? void 0 : l.order) != null && E.length) {
+      const e = d.map(D);
+      d = G.intersection(l.order, e).map((f) => d.find((V) => D(V) === f)).filter((f) => f != null);
     }
-    const L = m.map(_), R = yt(this.data, i, L, m);
-    this.data.setGrouping([...I, d.value, f.value]);
+    const b = d.map(D), A = mt(this.data, o, b, d), N = o.length ? S.map((e, p) => [...new Set(d.map((f) => f[p]))]) : [void 0];
+    this.data.setGrouping(
+      [...S, h.value, g.value],
+      [...N, h.groupingKeys, g.groupingKeys]
+    );
     const c = {
-      facet: m,
-      primary: d.value !== null ? d.keys : [D],
-      secondary: f.value !== null ? f.keys : [D]
-    }, K = c.facet.reduce((a, p) => (a[_(p)] = c.primary.filter(
-      (V) => this.data.getRowsByGrouping([...p, V]).length > 0
-    ).map(String), a), {}), P = l.filter((a) => !(a instanceof G)).map((a) => {
-      if (a instanceof H)
-        return et(a, c, this.data, t, n, s);
-      if (a instanceof X)
-        return rt(a, c, this.data, t, s);
-      if (a instanceof q)
-        return ot(a, c, this.data, t, s, n);
-      if (a instanceof z)
-        return st(a, c, this.data, t, s);
-      if (a instanceof J)
-        return it(a, c, this.data, t, s);
-      if (a instanceof Q)
-        return lt(a, c, this.data, t, s);
-      if (a instanceof W)
-        return ct(a, c, this.data, t);
-      if (a instanceof Y)
-        return ut(a, c, this.data, t);
-      if (a instanceof Z)
-        return ht(a, c, this.data, t, s);
-      if (a instanceof $)
-        return dt(a, c, this.data, t, s);
-      if (a instanceof tt)
-        return nt(a, c, this.data, t, s);
-      if (a instanceof at)
-        return mt(a, c, this.data, t);
+      facet: d,
+      primary: h.groupingKeys,
+      secondary: g.groupingKeys
+    }, x = c.facet.reduce((e, p) => (e[D(p)] = c.primary.filter(
+      (f) => this.data.getRowsByGrouping([...p, f]).length > 0
+    ).map(String), e), {}), I = i.filter((e) => !(e instanceof C)).map((e) => {
+      if (e instanceof j)
+        return tt(e, c, this.data, t, n, u);
+      if (e instanceof H)
+        return et(e, c, this.data, t, u);
+      if (e instanceof q)
+        return rt(e, c, this.data, t, u, n);
+      if (e instanceof z)
+        return nt(e, c, this.data, t, u);
+      if (e instanceof J)
+        return st(e, c, this.data, t, u);
+      if (e instanceof M)
+        return ot(e, c, this.data, t, u);
+      if (e instanceof Q)
+        return it(e, c, this.data, t);
+      if (e instanceof W)
+        return lt(e, c, this.data, t);
+      if (e instanceof X)
+        return ct(e, c, this.data, t, u);
+      if (e instanceof Y)
+        return ut(e, c, this.data, t, u);
+      if (e instanceof Z)
+        return at(e, c, this.data, t, u);
+      if (e instanceof $)
+        return ht(e, c, this.data, t);
       throw new Error("Unknown layer type");
-    }), U = l.filter((a) => a instanceof G).map((a) => {
-      if (d.value === null)
+    }), R = i.filter((e) => e instanceof C).map((e) => {
+      if (h.value === null)
         throw new Error("Cannot calculate p-value without data grouping");
-      return ft(a, c.facet, c.primary, t, this.data);
+      return dt(e, c.facet, c.primary, t, this.data);
     });
     this.calculatedData = {
-      layersData: P,
-      statsLayersData: U,
-      primaryGrouping: d,
-      secondaryGrouping: f,
-      facetKeyLists: m,
-      nonEmptyGroupsByFacets: K,
-      onlyPositive: h,
-      facetKeys: L,
-      facetLabels: R
+      layersData: I,
+      statsLayersData: R,
+      primaryGrouping: h,
+      secondaryGrouping: g,
+      facetKeyLists: d,
+      nonEmptyGroupsByFacets: x,
+      onlyPositive: m,
+      facetKeys: b,
+      facetLabels: A
     };
   }
   _updateAesInData() {
     if (this.calculatedData === null)
       return;
-    const { layers: e, facetBy: t, primaryGrouping: n, secondaryGrouping: i, facetSettings: l } = this.settings, u = e.filter((s) => !(s instanceof G));
-    for (let s = 0; s < u.length; s++) {
-      const h = u[s];
-      "aes" in h && (this.calculatedData.layersData[s].aes = h.aes);
+    const { layers: a, primaryGrouping: t, secondaryGrouping: n } = this.settings, o = a.filter((i) => !(i instanceof C));
+    for (let i = 0; i < o.length; i++) {
+      const l = o[i];
+      "aes" in l && (this.calculatedData.layersData[i].aes = l.aes);
     }
-    this.calculatedData.primaryGrouping = C(this.data, n), this.calculatedData.secondaryGrouping = C(this.data, i), this.calculatedData.facetKeyLists = t.length ? A(
-      t.map((s) => {
-        var h;
-        return k(this.data, s, (h = l == null ? void 0 : l.order) == null ? void 0 : h[s.value]);
-      })
-    ) : [[D]];
+    this.calculatedData.primaryGrouping = L(this.data, t), this.calculatedData.secondaryGrouping = L(this.data, n);
   }
   _updateChart() {
     if (!this.calculatedData)
       return;
-    const { id: e, chartSettings: t, keyColumn: n, facetSettings: i } = this.settings, { facetLabels: l } = this.calculatedData;
+    const { id: a, chartSettings: t, keyColumn: n, facetSettings: o } = this.settings, { facetLabels: i } = this.calculatedData;
     this.chartRenderer.render(
       this.data,
-      e,
+      a,
       t,
       this.calculatedData.primaryGrouping,
       this.calculatedData.secondaryGrouping,
-      i,
+      o,
       this.calculatedData.facetKeys,
-      this.calculatedData.facetKeys.map((u) => l[u]),
+      this.calculatedData.facetKeys.map((l) => i[l]),
       this.calculatedData.layersData,
       this.calculatedData.statsLayersData,
       n,