@devgateway/dvz-ui-react 1.0.7 → 1.1.1

package/dist/esm/embeddable/chart/Tooltip.js

@@ -4,20 +4,20 @@ import y from "react-markdown";
 import h from "remark-gfm";
 import x from "rehype-raw";
 import f from "string-template";
-const F = /(\+?\%)[\(]([A-z0-9,.,-]+)\)/gi, N = /(\+?\#)[\(]([A-z0-9,.,-]+)\)/gi, _ = /(\+?\#C)[\(]([A-z0-9,.,-]+)\)/gi, p = (n, t, o, i, e, r) => {
-  let a, l = t;
-  for (; (a = n.exec(t)) !== null; ) {
-    const s = a[2], m = a[1], d = ((u, g = 2) => e.formatNumber(i ? u / 100 : u, {
+const F = /(\+?\%)[\(]([A-z0-9,.,-]+)\)/gi, N = /(\+?\#)[\(]([A-z0-9,.,-]+)\)/gi, _ = /(\+?\#C)[\(]([A-z0-9,.,-]+)\)/gi, p = (i, t, o, a, e, r) => {
+  let l, n = t;
+  for (; (l = i.exec(t)) !== null; ) {
+    const s = l[2], m = l[1], d = ((u, g = 2) => e.formatNumber(a ? u / 100 : u, {
       maximumFractionDigits: g,
       ...o,
       signDisplay: m && m.startsWith("+") ? "never" : "auto"
     })).apply(void 0, s.split(","));
-    l = l.replaceAll(a[0], d);
+    n = n.replaceAll(l[0], d);
   }
-  return l;
-}, A = (n, t, o, i) => {
+  return n;
+}, v = (i, t, o, a) => {
   t.field && t[`_${t.field}`] && (t._value = t[`_${t.field}`]), !t.field && t.category && (t.field = t.category);
-  let e = i ? f(n, t) : f(n, t).replace(/(?:\r\n|\r|\n)/g, "<br>");
+  let e = a ? f(i, t) : f(i, t).replace(/(?:\r\n|\r|\n)/g, "<br>");
   return e = p(F, e, { style: "percent" }, !0, o), e = p(N, e, { style: "decimal" }, !1, o), e = p(
     _,
     e,
@@ -25,17 +25,19 @@ const F = /(\+?\%)[\(]([A-z0-9,.,-]+)\)/gi, N = /(\+?\#)[\(]([A-z0-9,.,-]+)\)/gi
     !1,
     o
   ), e;
-}, E = ({ tooltip: n, d: t, intl: o, tooltipEnableMarkdown: i }) => {
-  const { color: e, data: r } = t.datum || t.point || t, a = t.value || (t.datum ? t.datum.value : null) || (t.point ? t.point.data.y : null);
+}, D = ({ tooltip: i, d: t, intl: o, tooltipEnableMarkdown: a }) => {
+  const { color: e, data: r } = t.datum || t.point || t, l = t.value || (t.datum ? t.datum.value : null) || (t.point ? t.point.data.y : null);
   if (r) {
-    const l = r.variables ? r.variables[t.id] || r.variables : r, s = {
+    let n;
+    r.variables ? n = typeof r.variables[t.id] == "object" ? r.variables[t.id] : r.variables : n = r;
+    const s = {
       field: t.point ? t.point.serieId : t.id,
-      ...l,
-      value: a
+      ...n,
+      value: l
     };
     r.measureFieldName && (s.populationValue = r.variables[r.measureFieldName + "Population"]);
-    const m = A(n, s, o, i);
-    return i ? /* @__PURE__ */ c(
+    const m = v(i, s, o, a);
+    return a ? /* @__PURE__ */ c(
       y,
       {
         children: m,
@@ -48,6 +50,6 @@ const F = /(\+?\%)[\(]([A-z0-9,.,-]+)\)/gi, N = /(\+?\#)[\(]([A-z0-9,.,-]+)\)/gi
     return /* @__PURE__ */ c("div", {});
 };
 export {
-  E as default,
-  A as formatContent
+  D as default,
+  v as formatContent
 };

package/dist/esm/embeddable/chart/colors/ManualColors.js

@@ -1,36 +1,36 @@
-import g from "./Colors.js";
-class O extends g {
-  constructor(t, a, r, p, y, f, b, v, u, e = {}, n, d, c) {
-    if (super(r, p, y, v, u), this._manualColor = {}, this._manualColor[d] = e ? e.Overall : null, t != "csv") {
-      const _ = (o) => {
-        h = [...f][o].items, e != null && e != null && Object.keys(e).forEach((i) => {
-          const l = h.filter((s) => s.code === i);
+import x from "./Colors.js";
+class O extends x {
+  constructor(t, a, o, m, y, n, b, v, u, e = {}, f, g, c) {
+    if (super(o, m, y, v, u), this._manualColor = {}, this._manualColor[g] = e ? e.Overall : null, t != "csv") {
+      const _ = (i) => {
+        h = [...n][i] ? [...n][i].items : [], e != null && e != null && Object.keys(e).forEach((r) => {
+          const l = h.filter((s) => s.code === r);
           if (l.length > 0 && l[0].labels) {
             let s;
-            n && (s = l[0].labels[n.toUpperCase()]), s ? this._manualColor[s] = e[i] : this._manualColor[l[0].value] = e[i];
+            f && (s = l[0].labels[f.toUpperCase()]), s ? this._manualColor[s] = e[r] : this._manualColor[l[0].value] = e[r];
           }
         });
-      }, m = () => {
-        h = b, Object.keys(e).forEach((o) => {
-          const i = [...h].filter((l) => l.value === o);
-          if (i.length > 0 && i[0].labels) {
-            const l = c[o];
-            c && l && (this._manualColor[l] = e[o]);
+      }, C = () => {
+        h = b, Object.keys(e).forEach((i) => {
+          const r = [...h].filter((l) => l.value === i);
+          if (r.length > 0 && r[0].labels) {
+            const l = c[i];
+            c && l && (this._manualColor[l] = e[i]);
             let s;
-            n && (s = i[0].labels[n.toUpperCase()]), s ? this._manualColor[s] = e[o] : this._manualColor[i[0].label] = e[o];
+            f && (s = r[0].labels[f.toUpperCase()]), s ? this._manualColor[s] = e[i] : this._manualColor[r[0].label] = e[i];
           }
         });
       };
       let h = [];
-      const C = a == "line" ? 1 : r === "index" ? 0 : 1;
-      f ? f.size == 1 && C == 1 ? u == "measure" ? _(0) : m() : _(C) : m();
+      const p = o === "index" ? 0 : 1;
+      n ? n.size == 1 && p == 1 ? u == "measure" ? _(0) : C() : _(p) : C();
     } else
       this._manualColor = e;
   }
   getColor(t, a) {
     if (this.colorBy === "index") {
-      const r = this._manualColor[t] || this._manualColor[a[this.indexBy]];
-      return r || "#5555";
+      const o = this._manualColor[t] || this._manualColor[a[this.indexBy]];
+      return o || "#5555";
     }
     return this.colorBy === "id" && this._manualColor[t] ? this._manualColor[t] : "#5555";
   }

package/dist/esm/embeddable/chart/data/Bar.js

@@ -1,204 +1,203 @@
-import { jsx as R, Fragment as P } from "react/jsx-runtime";
-import J from "react";
-import { measuresMap as U, typesMap as q, getTranslatedValue as _, alphaSort as z, dateSort as G, numericSort as T } from "./Utils.js";
-const H = (s) => {
-  const { data: e, measures: f, swap: O, dimensions: p, locale: w, customLabels: b } = s;
-  let i = {};
-  const M = p.filter((S) => S != ""), k = /* @__PURE__ */ new Set();
-  if (M.length == 0 && e) {
-    const S = U(e), A = /* @__PURE__ */ new Set(), C = /* @__PURE__ */ new Set();
-    let l = [], v;
-    if (e.metadata && e.metadata.measures) {
-      const j = e.metadata.measures.filter((r) => f.includes(r.value)).sort((r, d) => r.position != null && d.position != null && r.position != d.position ? r.position - d.position : 0);
-      l = [], v = "measure", A.add("measure");
-      const x = {};
-      Object.keys(e).forEach((r) => {
-        x[r] = e[r];
-      }), j.forEach((r) => {
-        const d = {}, u = b[r.value] || _(S[r.value], w);
-        d.type = "measure", d.measureFieldName = r.value, d.measure = u, d[u] = e[r.value], d.variables = x, l.push(d), C.add(u), k.add(S[r.value]);
-      }), i = {
-        categories: A,
-        indexBy: v,
-        keys: Array.from(C),
-        measuresMetadata: k,
-        data: l
+import { jsx as F, Fragment as P } from "react/jsx-runtime";
+import K from "react";
+import { measuresMap as U, typesMap as q, getTranslatedValue as _, alphaSort as J, dateSort as V, numericSort as T } from "./Utils.js";
+const z = (a) => {
+  const { data: t, measures: d, swap: w, dimensions: b, locale: E, customLabels: O } = a;
+  let n = {};
+  const A = b.filter((x) => x != ""), C = /* @__PURE__ */ new Set();
+  if (A.length == 0 && t) {
+    const x = U(t), M = /* @__PURE__ */ new Set(), N = /* @__PURE__ */ new Set();
+    let c = [], r;
+    if (t.metadata && t.metadata.measures) {
+      const h = t.metadata.measures.filter((o) => d.includes(o.value)).sort((o, y) => o.position != null && y.position != null && o.position != y.position ? o.position - y.position : 0);
+      c = [], r = "measure", M.add("measure");
+      const B = {};
+      Object.keys(t).forEach((o) => {
+        B[o] = t[o];
+      }), h.forEach((o) => {
+        const y = {}, v = O[o.value] || _(x[o.value], E);
+        y.type = "measure", y.measureFieldName = o.value, y.measure = v, y[v] = t[o.value], y.variables = B, c.push(y), N.add(v), C.add(x[o.value]);
+      }), n = {
+        categories: M,
+        indexBy: r,
+        keys: Array.from(N),
+        measuresMetadata: C,
+        data: c
       };
     }
   }
-  return i;
-}, I = (s) => {
-  const { data: e, measures: f, dimensions: O, overallLabel: p } = s;
-  if (O.length == 1 && e.children) {
-    if (!(e.children.filter((b) => b.value == p).length > 0)) {
-      const b = {};
-      b.type = O[0], b.value = p, b.label = p, Object.keys(e).forEach((i) => {
-        ["children", "metadata", "type", "value"].includes(i) || (b[i] = e[i]);
-      }), e.children = [b, ...e.children];
+  return n;
+}, G = (a) => {
+  const { data: t, measures: d, dimensions: w, overallLabel: b } = a;
+  if (w.length == 1 && t.children) {
+    if (!(t.children.filter((O) => O.value == b).length > 0)) {
+      const O = {};
+      O.type = w[0], O.value = b, O.label = b, Object.keys(t).forEach((n) => {
+        ["children", "metadata", "type", "value"].includes(n) || (O[n] = t[n]);
+      }), t.children = [O, ...t.children];
     }
-  } else O.length == 2 && e.children && e.children.forEach((w) => {
-    if (!(w.children.filter((i) => i.value == p).length > 0)) {
-      const i = {};
-      i.type = O[1], i.value = p, i.label = p, Object.keys(w).forEach((M) => {
-        ["children", "metadata", "type", "value"].includes(M) || (i[M] = w[M]);
-      }), w.children = [i, ...w.children];
+  } else w.length == 2 && t.children && t.children.forEach((E) => {
+    if (!(E.children.filter((n) => n.value == b).length > 0)) {
+      const n = {};
+      n.type = w[1], n.value = b, n.label = b, Object.keys(E).forEach((A) => {
+        ["children", "metadata", "type", "value"].includes(A) || (n[A] = E[A]);
+      }), E.children = [n, ...E.children];
     }
   });
-  return e;
-}, Q = (s) => {
-  let e = {};
+  return t;
+}, Q = (a) => {
+  var c;
+  let t = {};
   const {
-    data: f,
-    measures: O,
-    swap: p,
-    dimensions: w,
-    includeOverall: b,
-    locale: i,
-    customLabels: M,
-    colorBy: k,
-    hiddenBars: S
-  } = s, A = w.filter((l) => l != ""), C = f.metadata.measures.filter((l) => O.includes(l.value)).sort((l, v) => l.position != null && v.position != null && l.position != v.position ? l.position - v.position : 0);
-  if (b && O.length == 1 && I(s), A.length == 0 && f)
-    e = H(s);
-  else if (f && f.children && A.length > 0) {
-    const l = U(f), v = q(f), j = /* @__PURE__ */ new Set(), x = /* @__PURE__ */ new Set(), r = /* @__PURE__ */ new Set(), d = [];
-    let u;
-    p && A.length == 1 && O.length > 0 ? (u = "measure", C.forEach((a) => {
-      const o = {};
-      o.measure = M[a.value] || _(l[a.value], i), x.add(l[a.value]), f.children.forEach((c) => {
-        const m = _(
-          v[c.type].items.filter((t) => t.value === c.value)[0],
-          i
-        ) || c.value, g = {};
-        Object.keys(c).forEach((t) => {
-          g[t] = c[t];
-        }), g[c.type] = c.value.toString(), o.variables = g, j.add(v[c.type]), o[m] = c[a.value], r.add(m);
-      }), d.push({ ...o });
-    })) : (f.children[0] && (u = f.children[0].type), f.children.forEach((a) => {
-      const o = {}, c = {};
-      c[a.type] = _(
-        v[a.type] && v[a.type].items ? v[a.type].items.filter((m) => m.value === a.value)[0] : a.value,
-        i
-      ) || a.value, Object.keys(a).forEach((m) => {
-        o[m] = a[m];
-      }), j.add(v[a.type]), o[a.type] = a.value.toString(), C.map((m) => {
-        const g = M[m.value] || _(l[m.value], i);
-        c[g] = a[m.value], x.add(l[m.value]), r.add(g);
-      }), d.push({ ...c, variables: o, parent_variables: o });
+    data: d,
+    measures: w,
+    swap: b,
+    dimensions: E,
+    includeOverall: O,
+    locale: n,
+    customLabels: A,
+    colorBy: C,
+    hiddenBars: x
+  } = a, M = E.filter((r) => r != ""), N = (c = d == null ? void 0 : d.metadata) == null ? void 0 : c.measures.filter((r) => w.includes(r.value)).sort((r, h) => r.position != null && h.position != null && r.position != h.position ? r.position - h.position : 0);
+  if (O && w.length == 1 && G(a), M.length == 0 && d)
+    t = z(a);
+  else if (d && d.children && M.length > 0) {
+    const r = U(d), h = q(d), B = /* @__PURE__ */ new Set(), o = /* @__PURE__ */ new Set(), y = /* @__PURE__ */ new Set(), v = [];
+    let R;
+    b && M.length == 1 && w.length > 0 ? (R = "measure", N.forEach((s) => {
+      const u = {};
+      u.measure = A[s.value] || _(r[s.value], n), o.add(r[s.value]), d.children.forEach((m) => {
+        const f = _(
+          h[m.type].items.filter((i) => i.value === m.value)[0],
+          n
+        ) || m.value, e = {};
+        Object.keys(m).forEach((i) => {
+          e[i] = m[i];
+        }), e[m.type] = m.value.toString(), u.variables = e, B.add(h[m.type]), u[f] = m[s.value], y.add(f);
+      }), v.push({ ...u });
+    })) : (d.children[0] && (R = d.children[0].type), d.children.forEach((s) => {
+      const u = {}, m = {};
+      m[s.type] = _(
+        h[s.type] && h[s.type].items ? h[s.type].items.filter((f) => f.value === s.value)[0] : s.value,
+        n
+      ) || s.value, Object.keys(s).forEach((f) => {
+        u[f] = s[f];
+      }), B.add(h[s.type]), u[s.type] = s.value.toString(), N.map((f) => {
+        const e = A[f.value] || _(r[f.value], n);
+        m[e] = s[f.value], o.add(r[f.value]), y.add(e);
+      }), v.push({ ...m, variables: u, parent_variables: u });
     }));
-    const F = Array.from(r);
-    let h = S && d ? d.filter((a) => S.indexOf(a[u]) == -1) : d;
-    s.sort == "alphabetically" && (h = h.sort(
-      (a, o) => z(s.sortreverse, i, a[u], o[u])
-    )), s.sort == "date" && (h = h.sort(
-      (a, o) => G(s.sortreverse, a[u], o[u])
-    )), s.sort == "values" && (h = h.sort((a, o) => {
-      const c = Math.max(...F.map((g) => a[g])), m = Math.max(...F.map((g) => o[g]));
-      return T(s.sortreverse, c, m);
-    })), e = {
-      metadata: f.metadata,
-      indexBy: u,
-      dimensionsMetadata: j,
-      measuresMetadata: x,
-      keys: F,
-      data: h
+    const D = Array.from(y);
+    let g = x && v ? v.filter((s) => x.indexOf(s[R]) == -1) : v;
+    a.sort == "alphabetically" && (g = g.sort(
+      (s, u) => J(a.sortReverse, n, s[R], u[R])
+    )), a.sort == "date" && (g = g.sort(
+      (s, u) => V(a.sortReverse, s[R], u[R])
+    )), a.sort == "values" && (g = g.sort((s, u) => {
+      const m = Math.max(...D.map((e) => s[e])), f = Math.max(...D.map((e) => u[e]));
+      return T(a.sortReverse, m, f);
+    })), t = {
+      metadata: d.metadata,
+      indexBy: R,
+      dimensionsMetadata: B,
+      measuresMetadata: o,
+      keys: D,
+      data: g
     };
   }
-  return J.Children.map(
-    s.children,
-    (l) => J.cloneElement(l, { options: e })
+  return K.Children.map(
+    a.children,
+    (r) => K.cloneElement(r, { options: t })
   );
-}, W = (s) => {
-  var A, C;
+}, W = (a) => {
+  var M, N;
   const {
-    data: e,
-    measures: f,
-    includeOverall: O,
-    dimensions: p,
-    hiddenBars: w,
-    colorBy: b,
-    locale: i,
-    customLabels: M
-  } = s, k = p.filter((l) => l != "");
-  let S = {};
-  if (O && I(s), k.length == 0 && e)
-    S = H(s);
-  else if (e && e.children && k.length > 0) {
-    U(e);
-    const l = q(e), v = f[0], j = /* @__PURE__ */ new Set(), x = /* @__PURE__ */ new Set(), r = [], d = [], u = e.children[0].type;
-    let F = 0, h, a;
-    e.children.forEach((t) => {
-      const y = { variables: {} };
-      if (a = _(
-        l[t.type] && l[t.type].items ? l[t.type].items.filter((n) => n.value === t.value)[0] : t.value,
-        i
-      ) || t.value, y[t.type] = a, y[a] = t[v], h = new Object(), h[t.type] = a, y.parent_variables = h, Object.keys(t).forEach((n) => {
-        h[n] = t[n];
-      }), j.add(l[t.type]), t.children || x.add(a), t.children)
-        t.children.forEach((n) => {
-          h = new Object(), j.add(l[n.type]);
-          const E = _(
-            l[n.type] && l[n.type].items ? l[n.type].items.filter((L) => L.value === n.value)[0] : n.value,
-            i
-          ) || n.value;
-          h[t.type] = a, h[n.type] = E, Object.keys(n).forEach((L) => {
-            h[L] = n[L];
-          }), y.variables[E] = h, x.add(E), F += n[v], d.push(n[v]), y[E] = n[v];
+    data: t,
+    measures: d,
+    includeOverall: w,
+    dimensions: b,
+    hiddenBars: E,
+    colorBy: O,
+    locale: n,
+    customLabels: A
+  } = a, C = b.filter((c) => c != "");
+  let x = {};
+  if (w && G(a), C.length == 0 && t)
+    x = z(a);
+  else if (t && t.children && t.children.length > 0 && C.length > 0) {
+    U(t);
+    const c = q(t), r = d[0], h = /* @__PURE__ */ new Set(), B = /* @__PURE__ */ new Set(), o = [], y = [], v = t.children[0].type;
+    let R = 0, D, g;
+    t.children.forEach((e) => {
+      const i = { variables: {} };
+      if (g = _(
+        c[e.type] && c[e.type].items ? c[e.type].items.filter((l) => l.value === e.value)[0] : e.value,
+        n
+      ) || e.value, i[e.type] = g, i[g] = e[r], D = new Object(), D[e.type] = g, i.parent_variables = D, Object.keys(e).forEach((l) => {
+        D[l] = e[l];
+      }), h.add(c[e.type]), e.children || B.add(g), e.children)
+        e.children.forEach((l) => {
+          D = new Object(), h.add(c[l.type]);
+          const S = _(
+            c[l.type] && c[l.type].items ? c[l.type].items.filter((p) => p.value === l.value)[0] : l.value,
+            n
+          ) || l.value;
+          D[e.type] = g, D[l.type] = S, Object.keys(l).forEach((p) => {
+            D[p] = l[p];
+          }), i.variables[S] = D, B.add(S), R += l[r], y.push(l[r]), i[S] = l[r];
         });
       else {
-        const n = new Object();
-        n[t.type] = a, j.add(l[t.type]), Object.keys(e).forEach((E) => {
-          n[E] = t[E];
-        }), y.variables = n;
+        const l = new Object();
+        l[e.type] = g, h.add(c[e.type]), Object.keys(t).forEach((S) => {
+          l[S] = e[S];
+        }), i.variables = l;
       }
-      r.push(y);
+      o.push(i);
     });
-    const o = i.toUpperCase(), c = b == "id" ? r : r.filter((t) => w.indexOf(t[u]) == -1), m = Array.from(x);
-    s.sort == "alphabetically" ? c.sort(
-      (t, y) => z(s.sortreverse, i, t[u], y[u])
-    ) : s.sort == "date" ? c.sort(
-      (t, y) => G(s.sortreverse, t[u], y[u])
-    ) : s.sort == "values" && c.sort((t, y) => {
-      var n, E, L;
-      if (s.sort2Dimension == "_total") {
-        const K = Math.max(...m.map((N) => t[N])), D = Math.max(...m.map((N) => y[N]));
-        return T(s.sortreverse, K, D);
-      } else if (((E = (n = e == null ? void 0 : e.metadata) == null ? void 0 : n.types) == null ? void 0 : E.length) > 1) {
-        const K = (L = e == null ? void 0 : e.metadata) == null ? void 0 : L.types[1].items.filter((D) => !!(s.sort2Dimension === D.value || D.labels && D.labels[o] === s.sort2Dimension));
-        if (K.length > 0) {
-          const D = K[0].labels[o] ? K[0].labels[o] : K[0].value, N = Math.max(
-            ...m.filter((V) => V === D).map((V) => t[V])
-          ), B = Math.max(
-            ...m.filter((V) => V === D).map((V) => y[V])
-          );
-          return T(s.sortreverse, N || 0, B || 0);
-        }
+    const s = n.toUpperCase(), u = O == "id" ? o : o.filter((e) => E.indexOf(e[v]) == -1), m = Array.from(B);
+    a.sort == "alphabetically" ? u.sort(
+      (e, i) => J(a.sortReverse, n, e[v], i[v])
+    ) : a.sort == "date" ? u.sort(
+      (e, i) => V(a.sortReverse, e[v], i[v])
+    ) : a.sort == "values" && u.sort((e, i) => {
+      if (a.sortSecondDimension == "_total") {
+        const l = Math.max(...m.map((p) => e[p])), S = Math.max(...m.map((p) => i[p]));
+        return T(a.sortReverse, l, S);
+      } else {
+        const l = Object.keys(e).reduce((p, j) => j !== v && j !== "variables" && j !== "parent_variables" && !isNaN(e[j]) ? p + (e[j] || 0) : p, 0), S = Object.keys(i).reduce((p, j) => j !== v && j !== "variables" && j !== "parent_variables" && !isNaN(i[j]) ? p + (i[j] || 0) : p, 0);
+        return T(a.sortReverse, l, S);
       }
     });
-    const g = [...x];
-    ((C = (A = e == null ? void 0 : e.metadata) == null ? void 0 : A.types) == null ? void 0 : C.length) > 1 && g.sort((t, y) => {
-      var D, N;
-      const n = e.metadata.types[1].items.filter(
-        (B) => B.value == t || B.labels && B.labels[o] == t
-      ), E = e.metadata.types[1].items.filter(
-        (B) => B.value == y || B.labels && B.labels[o] == y
-      ), L = (D = n[0]) == null ? void 0 : D.position, K = (N = E[0]) == null ? void 0 : N.position;
-      return L - K;
-    }), S = {
-      metadata: e.metadata,
-      dimensionsMetadata: j,
-      indexBy: u,
-      keys: b == "index" ? g : g.filter((t) => w.indexOf(t) == -1),
-      data: c
+    const f = [...B];
+    ((N = (M = t == null ? void 0 : t.metadata) == null ? void 0 : M.types) == null ? void 0 : N.length) > 1 && f.sort((e, i) => {
+      var l, S;
+      if (a.sortSecondDimension == "date")
+        return V(a.sortReverseSecondDimension, e, i);
+      if (a.sortSecondDimension == "alphabetically")
+        return J(a.sortReverseSecondDimension, n, e, i);
+      {
+        const p = t.metadata.types[1].items.filter(
+          (L) => L.value == e || L.labels && L.labels[s] == e
+        ), j = t.metadata.types[1].items.filter(
+          (L) => L.value == i || L.labels && L.labels[s] == i
+        ), H = (l = p[0]) == null ? void 0 : l.position, I = (S = j[0]) == null ? void 0 : S.position;
+        return H - I;
+      }
+    }), x = {
+      metadata: t.metadata,
+      dimensionsMetadata: h,
+      indexBy: v,
+      keys: O == "index" ? f : f.filter((e) => E.indexOf(e) == -1),
+      data: u
     };
   }
-  return /* @__PURE__ */ R(P, { children: J.Children.map(
-    s.children,
-    (l) => J.cloneElement(l, { options: S })
+  return /* @__PURE__ */ F(P, { children: K.Children.map(
+    a.children,
+    (c) => K.cloneElement(c, { options: x })
   ) });
-}, $ = (s) => {
-  const { data: e, measures: f, dimensions: O } = s, p = JSON.parse(JSON.stringify(e));
-  return O.length === 1 ? /* @__PURE__ */ R(Q, { ...s, data: p }) : /* @__PURE__ */ R(W, { ...s, data: p });
+}, $ = (a) => {
+  const { data: t, measures: d, dimensions: w } = a, b = JSON.parse(JSON.stringify(t));
+  return w.length === 1 ? /* @__PURE__ */ F(Q, { ...a, data: b }) : /* @__PURE__ */ F(W, { ...a, data: b });
 };
 export {
   $ as default