@devgateway/dvz-ui-react 1.9.6 → 1.9.8

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

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

package/dist/esm/embeddable/common/MapTooltip.js

@@ -1,7 +1,7 @@
 import "react/jsx-runtime";
 import "react";
-import b from "string-template";
-const f = /(\%)[\(]([A-z0-9,.]+)\)/gi, g = /(\#)[\(]([A-z0-9,.]+)\)/gi, h = /(\#C)[\(]([A-z0-9,.]+)\)/gi, x = /(\$)[\(]([A-z0-9,.]+)\)/gi, A = [
+import g from "string-template";
+const f = /(\%)[\(]([A-z0-9,.]+)\)/gi, b = /(\#)[\(]([A-z0-9,.]+)\)/gi, h = /(\#C)[\(]([A-z0-9,.]+)\)/gi, x = /(\$)[\(]([A-z0-9,.]+)\)/gi, A = [
   {
     name: "USD Dollar",
     code: "USD",
@@ -32,28 +32,32 @@ const f = /(\%)[\(]([A-z0-9,.]+)\)/gi, g = /(\#)[\(]([A-z0-9,.]+)\)/gi, h = /(\#
     code: "KES",
     symbol: "KSh"
   }
-], i = (r, t, o, e, s) => {
-  let n, c = t;
-  for (; (n = r.exec(t)) !== null; ) {
-    const l = n[2], u = (p, d = 2) => s.formatNumber(e ? p / 100 : p, {
-      maximumFractionDigits: d,
-      ...o
-    }), m = l.split(","), y = m.length > 0 && m[0] ? u.apply(void 0, m) : "No Data";
-    c = c.replaceAll(n[0], y);
+], m = (t, n, r, c, l) => {
+  let e, o = n;
+  for (; (e = t.exec(n)) !== null; ) {
+    const a = e[2], p = (u, y = 2) => l.formatNumber(c ? u / 100 : u, {
+      maximumFractionDigits: y,
+      ...r
+    }), i = a.split(","), d = i.length > 0 && i[0] ? p.apply(void 0, i) : "No Data";
+    o = o.replaceAll(e[0], d);
   }
-  return c;
-}, S = (r, t) => {
-  let o, e = t;
-  for (; (o = r.exec(t)) !== null; )
-    if (o.length > 2) {
-      const s = o[0], n = o[2], c = A.find((l) => a(l.code) == a(n) || a(l.name) == a(n) || a(l.symbol) == a(n));
-      c && (e = e.replaceAll(s, c.symbol));
+  return o;
+}, E = (t, n) => {
+  let r, c = n;
+  for (; (r = t.exec(n)) !== null; )
+    if (r.length > 2) {
+      const l = r[0], e = r[2], o = A.find((a) => s(a.code) == s(e) || s(a.name) == s(e) || s(a.symbol) == s(e));
+      o && (c = c.replaceAll(l, o.symbol));
     }
-  return e;
-}, a = (r) => r && r.trim().toLowerCase(), D = (r, t, o) => {
-  let e = b(r, t).replace(/(?:\r\n|\r|\n)/g, "<br>");
-  return e = i(f, e, { style: "percent" }, !0, o), e = i(g, e, { style: "decimal" }, !1, o), e = i(h, e, { notation: "compact" }, !1, o), e = S(x, e), e;
+  return c;
+}, s = (t) => t && t.trim().toLowerCase(), N = (t, n, r) => {
+  const c = {};
+  Object.keys(n).forEach((o) => {
+    c[o] = n[o], c[o.replace(/\s+/g, "_")] = n[o];
+  });
+  let l = t.replace(/\{([^}]+)\}/g, (o, a) => `{${a.replace(/\s+/g, "_")}}`), e = g(l, c).replace(/(?:\r\n|\r|\n)/g, "<br>");
+  return e = m(f, e, { style: "percent" }, !0, r), e = m(b, e, { style: "decimal" }, !1, r), e = m(h, e, { notation: "compact" }, !1, r), e = E(x, e), e;
 };
 export {
-  D as formatContent
+  N as formatContent
 };

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

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