@devgateway/dvz-ui-react 1.9.11 → 1.9.13

package/dist/esm/embeddable/d3Map/Legends.js

@@ -6,136 +6,136 @@ import { injectIntl as X } from "react-intl";
 import Y from "../data/D3MapDataProvider.js";
 import Z from "../data/D3MapDataConsumer.js";
 import ee from "./GradientColors.js";
-import { Icon as G } from "semantic-ui-react";
-const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: l.map((n, c) => n.type !== "graterThan" ? /* @__PURE__ */ a("div", { className: "break", children: [
+import { Icon as V } from "semantic-ui-react";
+const A = ({ breaks: l, isPoint: c, numberFormat: m, intl: C }) => l.length > 0 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: l.map((s, u) => s.type !== "graterThan" ? /* @__PURE__ */ a("div", { className: "break", children: [
   /* @__PURE__ */ e(
     "div",
     {
-      className: `break-item ${o ? "point" : ""}`,
+      className: `break-item ${c ? "point" : ""}`,
       style: {
-        backgroundColor: n.color,
-        border: `1px solid ${n.borderColor}`
+        backgroundColor: s.color,
+        border: `1px solid ${s.borderColor}`
       }
     }
   ),
   /* @__PURE__ */ a("div", { className: "break-label", children: [
     " < ",
-    v.formatNumber(n.end, d)
+    C.formatNumber(s.end, m)
   ] })
 ] }) : /* @__PURE__ */ a("div", { className: "break", children: [
   /* @__PURE__ */ e(
     "div",
     {
-      className: `break-item ${o ? "point" : ""}`,
+      className: `break-item ${c ? "point" : ""}`,
       style: {
-        backgroundColor: n.color,
-        border: `1px solid ${n.borderColor}`
+        backgroundColor: s.color,
+        border: `1px solid ${s.borderColor}`
       }
     }
   ),
   /* @__PURE__ */ a("div", { className: "break-label", children: [
     " > ",
-    v.formatNumber(n.end, d)
+    C.formatNumber(s.end, m)
   ] })
 ] })) }), re = (l) => {
   const {
-    name: o,
-    breaks: d,
-    pointStyleBy: v,
-    dimension2: n,
-    pointDimensionStyles: c = {},
-    markFillColor: s,
-    markBorderColor: m,
-    measures: k,
-    visible: h,
-    format: g,
+    name: c,
+    breaks: m,
+    pointStyleBy: C,
+    dimension2: s,
+    pointDimensionStyles: u = {},
+    markFillColor: o,
+    markBorderColor: g,
+    measures: f,
+    visible: p,
+    format: h,
     intl: D,
     id: r,
-    onItemClick: y,
-    customMeasuresLabels: f
-  } = l, u = {
-    style: g.style === "compacted" ? "decimal" : g.style,
-    notation: g.style === "compacted" ? "compact" : "standard",
-    currency: g.currency,
-    minimumFractionDigits: parseInt(g.minimumFractionDigits),
-    maximumFractionDigits: parseInt(g.maximumFractionDigits)
+    onItemClick: v,
+    customMeasuresLabels: k
+  } = l, t = {
+    style: h.style === "compacted" ? "decimal" : h.style,
+    notation: h.style === "compacted" ? "compact" : "standard",
+    currency: h.currency,
+    minimumFractionDigits: parseInt(h.minimumFractionDigits),
+    maximumFractionDigits: parseInt(h.maximumFractionDigits)
   };
-  let p = k[0];
-  return f && (p = f[k[0]]), [...new Set(Object.keys(c).map((b) => b.split("_")[0]))], /* @__PURE__ */ e("div", { className: "legend", children: /* @__PURE__ */ a("div", { children: [
+  let d = f[0];
+  return k && (d = k[f[0]]), [...new Set(Object.keys(u).map((b) => b.split("_")[0]))], /* @__PURE__ */ e("div", { className: "legend", children: /* @__PURE__ */ a("div", { children: [
     /* @__PURE__ */ a("div", { className: "legend-item", children: [
       /* @__PURE__ */ e(
         "div",
         {
           className: "legend-color legend-check",
-          onClick: (b) => y(r),
+          onClick: (b) => v(r),
           style: {
-            backgroundColor: s,
-            borderColor: m
+            backgroundColor: o,
+            borderColor: g
           },
-          children: h != !1 && /* @__PURE__ */ e($, { children: "✓" })
+          children: p != !1 && /* @__PURE__ */ e($, { children: "✓" })
         }
       ),
       /* @__PURE__ */ a("div", { className: "legend-label", children: [
-        o,
+        c,
         " (",
-        p,
+        d,
         ")"
       ] })
     ] }),
-    h != !1 && /* @__PURE__ */ e(U, { breaks: d, symbol: "arrow", numberFormat: u, intl: D })
+    p != !1 && /* @__PURE__ */ e(A, { breaks: m, symbol: "arrow", numberFormat: t, intl: D })
   ] }) });
 }, ae = (l) => {
   const {
-    id: o,
-    name: d,
-    breaks: v,
-    intl: n,
-    pointStyleBy: c,
-    format: s,
-    dimension2: m,
-    pointDimensionStyles: k = {},
-    markFillColor: h,
-    markBorderColor: g,
+    id: c,
+    name: m,
+    breaks: C,
+    intl: s,
+    pointStyleBy: u,
+    format: o,
+    dimension2: g,
+    pointDimensionStyles: f = {},
+    markFillColor: p,
+    markBorderColor: h,
     measures: D,
     visible: r,
-    onItemClick: y,
-    customMeasuresLabels: f,
-    allCategories: u,
-    showDim2OnLegends: p,
+    onItemClick: v,
+    customMeasuresLabels: k,
+    allCategories: t,
+    showDim2OnLegends: d,
     dim2LegendLabel: b,
     type: L,
     d2Click: x,
     selectedItem: F
-  } = l, C = {
-    style: s.style === "compacted" ? "decimal" : s.style,
-    notation: s.style === "compacted" ? "compact" : "standard",
-    currency: s.currency,
-    minimumFractionDigits: parseInt(s.minimumFractionDigits),
-    maximumFractionDigits: parseInt(s.maximumFractionDigits)
+  } = l, y = {
+    style: o.style === "compacted" ? "decimal" : o.style,
+    notation: o.style === "compacted" ? "compact" : "standard",
+    currency: o.currency,
+    minimumFractionDigits: parseInt(o.minimumFractionDigits),
+    maximumFractionDigits: parseInt(o.maximumFractionDigits)
   };
   let S = D[0];
-  f && (S = f[D[0]]);
-  const w = m && u ? u.filter((i) => i.type.toUpperCase() == m.toUpperCase()) : [], N = (w.length > 0 ? w[0].items : []).map((i) => i.value), P = c === "dimension" || p ? m : S;
+  k && (S = k[D[0]]);
+  const w = g && t ? t.filter((i) => i.type.toUpperCase() == g.toUpperCase()) : [], N = (w.length > 0 ? w[0].items : []).map((i) => i.value), P = u === "dimension" || d ? g : S;
   return /* @__PURE__ */ e("div", { className: "legend", children: /* @__PURE__ */ a("div", { children: [
     /* @__PURE__ */ a("div", { className: "legend-item", children: [
       /* @__PURE__ */ e(
         "div",
         {
           className: "legend-color legend-check",
-          onClick: (i) => y(o),
-          style: c === "measure" || p ? {} : {
-            backgroundColor: h,
-            borderColor: g
+          onClick: (i) => v(c),
+          style: u === "measure" || d ? {} : {
+            backgroundColor: p,
+            borderColor: h
           },
           children: r != !1 && /* @__PURE__ */ e($, { children: "✓" })
         }
       ),
       /* @__PURE__ */ a("div", { className: "legend-label", children: [
-        d,
+        m,
         " "
       ] })
     ] }),
-    c === "measure" && r != !1 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: v.map((i, z) => /* @__PURE__ */ a("div", { className: "break", children: [
+    u === "measure" && r != !1 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: C.map((i, z) => /* @__PURE__ */ a("div", { className: "break", children: [
       /* @__PURE__ */ e("div", { className: "break-item", style: {
         backgroundColor: i.color,
         border: `1px solid ${i.borderColor}`,
@@ -143,12 +143,12 @@ const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0
       } }),
       /* @__PURE__ */ a("div", { className: "break-label", children: [
         " < ",
-        n.formatNumber(i.end, C)
+        s.formatNumber(i.end, y)
       ] })
     ] })) }),
-    r != !1 && p != !1 && /* @__PURE__ */ e("div", { className: "legend", children: /* @__PURE__ */ e("div", { className: "legend-item", children: /* @__PURE__ */ e("div", { className: "legend-label", children: b || P }) }) }),
-    r != !1 && p != !1 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: N.map((i) => /* @__PURE__ */ a("div", { className: "break", children: [
-      c === "measure" ? /* @__PURE__ */ e(
+    r != !1 && d != !1 && /* @__PURE__ */ e("div", { className: "legend", children: /* @__PURE__ */ e("div", { className: "legend-item", children: /* @__PURE__ */ e("div", { className: "legend-label", children: b || P }) }) }),
+    r != !1 && d != !1 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: N.map((i) => /* @__PURE__ */ a("div", { className: "break", children: [
+      u === "measure" ? /* @__PURE__ */ e(
         "span",
         {
           className: "break-item dim2-item"
@@ -158,8 +158,8 @@ const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0
         {
           className: "break-item",
           style: {
-            backgroundColor: k[i + "_color"] || h,
-            border: `1px solid ${k[i + "_border"] || g}`,
+            backgroundColor: f[i + "_color"] || p,
+            border: `1px solid ${f[i + "_border"] || h}`,
             borderRadius: L == "dataPoints" ? "50%" : "0"
           }
         }
@@ -168,55 +168,55 @@ const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0
     ] })) })
   ] }) });
 }, ie = (l) => {
-  const { fillColor: o, borderColor: d, name: v, visible: n, id: c, onItemClick: s } = l;
+  const { fillColor: c, borderColor: m, name: C, visible: s, id: u, onItemClick: o } = l;
   return /* @__PURE__ */ e("div", { className: "legend", children: /* @__PURE__ */ a("div", { className: "legend-item", children: [
     /* @__PURE__ */ e(
       "div",
       {
         className: "legend-color legend-check",
-        onClick: (m) => s(c),
-        style: { backgroundColor: o, borderColor: d },
-        children: n != !1 && /* @__PURE__ */ e($, { children: "✓" })
+        onClick: (g) => o(u),
+        style: { backgroundColor: c, borderColor: m },
+        children: s != !1 && /* @__PURE__ */ e($, { children: "✓" })
       }
     ),
-    /* @__PURE__ */ e("div", { className: "legend-label", children: v })
+    /* @__PURE__ */ e("div", { className: "legend-label", children: C })
   ] }) });
 }, le = (l) => {
   const {
-    markFillColor: o,
-    fillColor: d,
-    markSizeScale: v,
-    markBorderColor: n,
-    useCentroidPoint: c,
-    name: s,
-    useBreaks: m,
-    useGradients: k,
-    breaks: h,
-    intl: g,
+    markFillColor: c,
+    fillColor: m,
+    markSizeScale: C,
+    markBorderColor: s,
+    useCentroidPoint: u,
+    name: o,
+    useBreaks: g,
+    useGradients: f,
+    breaks: p,
+    intl: h,
     usePattern: D,
     patternsData: r,
-    patternDiscriminator: y,
-    patternDiscriminatorLabel: f,
-    measures: u,
-    borderColor: p,
+    patternDiscriminator: v,
+    patternDiscriminatorLabel: k,
+    measures: t,
+    borderColor: d,
     data: b,
     app: L,
     customMeasuresLabels: x,
     divRef: F,
-    id: C,
+    id: y,
     patternWidth: S = 0.35,
     patternHeight: w = 0.25,
-    group: E,
+    group: j,
     format: N,
     csv: P,
     visible: i,
     onItemClick: z,
-    gradientScheme: q,
-    gradientReverse: A,
-    toggleColorLayer: j,
+    gradientScheme: G,
+    gradientReverse: J,
+    toggleColorLayer: E,
     colorLayerVisible: B = !0,
-    gradientStartColor: H,
-    gradientEndColor: J
+    gradientStartColor: U,
+    gradientEndColor: q
   } = l;
   let I = "";
   const R = {
@@ -225,62 +225,62 @@ const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0
     currency: N.currency,
     minimumFractionDigits: parseInt(N.minimumFractionDigits),
     maximumFractionDigits: parseInt(N.maximumFractionDigits)
-  }, V = (t) => new ee({
-    data: t.children,
-    measure: u[0],
-    defaultFillColor: o,
-    gradientScheme: q,
-    gradientReverse: A,
-    gradientStartColor: H,
-    gradientEndColor: J
+  }, T = (n) => new ee({
+    data: n.children,
+    measure: t[0],
+    defaultFillColor: c,
+    gradientScheme: G,
+    gradientReverse: J,
+    gradientStartColor: U,
+    gradientEndColor: q
   });
   if (L != "csv" && x)
-    I = x[u[0]];
+    I = x[t[0]];
   else {
-    const t = Q.parse(P, { header: !0, dynamicTyping: !0 });
-    I = t.meta.fields.length > 0 ? t.meta.fields[1] : "";
+    const n = Q.parse(P, { header: !0, dynamicTyping: !0 });
+    I = n.meta.fields.length > 0 ? n.meta.fields[1] : "";
   }
-  const M = (t) => t ? t.toString().replace(/ /g, "_").toLocaleLowerCase() : "";
+  const M = (n) => n ? n.toString().replace(/ /g, "_").toLocaleLowerCase() : "";
   if (F.current) {
-    const t = F.current.querySelector(
-      `.legend.layer_${M(C)} svg`
+    const n = F.current.querySelector(
+      `.legend.layer_${M(y)} svg`
     );
-    t && (t.style.display = i === !1 ? "none" : "block");
+    n && (n.style.display = i === !1 ? "none" : "block");
   }
-  const O = (t) => Math.min(...t.children.map((_) => _[u[0]])), T = (t) => Math.max(...t.children.map((_) => _[u[0]]));
-  return /* @__PURE__ */ e("div", { className: `legend layer_${M(C)}`, id: M(`${E} ${s} ${C}`), children: /* @__PURE__ */ a("div", { children: [
+  const H = (n) => Math.min(...n.children.map((_) => _[t[0]])), O = (n) => Math.max(...n.children.map((_) => _[t[0]]));
+  return /* @__PURE__ */ e("div", { className: `legend layer_${M(y)}`, id: M(`${j} ${o} ${y}`), children: /* @__PURE__ */ a("div", { children: [
     /* @__PURE__ */ a("div", { className: "legend-item", children: [
       /* @__PURE__ */ e(
         "div",
         {
           className: "legend-color legend-check",
-          onClick: (t) => z(C),
-          style: { backgroundColor: d, borderColor: p },
+          onClick: (n) => z(y),
+          style: { backgroundColor: m, borderColor: d },
           children: i != !1 && /* @__PURE__ */ e($, { children: "✓" })
         }
       ),
-      /* @__PURE__ */ e("div", { className: "legend-label", children: s })
+      /* @__PURE__ */ e("div", { className: "legend-label", children: o })
     ] }),
-    c && !m && i != !1 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: /* @__PURE__ */ a("div", { className: "break", children: [
+    u && !g && i != !1 && /* @__PURE__ */ e("div", { className: "legend-breaks", children: /* @__PURE__ */ a("div", { className: "break", children: [
       /* @__PURE__ */ e(
         "div",
         {
           className: `break-item point ${B ? "checked" : ""}`,
-          onClick: (t) => j(C),
+          onClick: (n) => E(y),
           style: {
-            backgroundColor: o,
-            border: `1px solid ${n}`
+            backgroundColor: c,
+            border: `1px solid ${s}`
           }
         }
       ),
       I
     ] }) }),
-    m && i != !1 && /* @__PURE__ */ a("div", { children: [
+    g && i != !1 && /* @__PURE__ */ a("div", { children: [
       /* @__PURE__ */ e("div", { className: "legend-breaks", children: /* @__PURE__ */ a(
         "div",
         {
           className: "legend-section-title",
-          onClick: (t) => j(C),
+          onClick: (n) => E(y),
           children: [
             /* @__PURE__ */ e("div", { className: `legend-section-title-checkbox ${B ? "checked" : ""}` }),
             /* @__PURE__ */ e("span", { className: "measure-label", children: I })
@@ -288,25 +288,25 @@ const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0
         }
       ) }),
       B && /* @__PURE__ */ e(
-        U,
+        A,
         {
-          isPoint: c,
+          isPoint: u,
           numberFormat: R,
-          breaks: h,
+          breaks: p,
           visible: i,
-          intl: g
+          intl: h
         }
       )
     ] }),
-    k && b && b.children && b.children.length > 0 && i != !1 && /* @__PURE__ */ a("div", { className: "gradient-container", children: [
-      /* @__PURE__ */ e("div", { className: "gradient-label", style: { float: "right" }, children: g.formatNumber(T(b), R) }),
-      /* @__PURE__ */ e("div", { className: "gradient-label", style: { float: "left" }, children: g.formatNumber(O(b), R) }),
+    f && b && b.children && b.children.length > 0 && i != !1 && /* @__PURE__ */ a("div", { className: "gradient-container", children: [
+      /* @__PURE__ */ e("div", { className: "gradient-label", style: { float: "right" }, children: h.formatNumber(O(b), R) }),
+      /* @__PURE__ */ e("div", { className: "gradient-label", style: { float: "left" }, children: h.formatNumber(H(b), R) }),
       /* @__PURE__ */ e(
         "div",
         {
           className: "gradient-bar",
           style: {
-            background: `linear-gradient(to right, ${V(b).getStartColor()}, ${V(b).getEndColor()})`,
+            background: `linear-gradient(to right, ${T(b).getStartColor()}, ${T(b).getEndColor()})`,
             width: "120px",
             height: "10px"
           }
@@ -315,42 +315,46 @@ const U = ({ breaks: l, isPoint: o, numberFormat: d, intl: v }) => l.length > 0
     ] })
   ] }) });
 }, te = (l) => {
-  const o = W(null), [d, v] = K(!1), n = ({ size: r = 16, color: y = "currentColor" }) => /* @__PURE__ */ e(G, { name: "chevron down" }), c = ({ size: r = 16, color: y = "currentColor" }) => /* @__PURE__ */ e(G, { name: "chevron right" }), { layers: s = [], onItemClick: m, patternsData: k, group: h, intl: g, toggleColorLayer: D } = l;
-  return /* @__PURE__ */ a("div", { className: `legends ${d ? "collapsed" : ""}`, ref: o, children: [
-    /* @__PURE__ */ e("div", { className: "legend-collapsible-control", onClick: () => v(!d), children: d ? /* @__PURE__ */ a("div", { children: [
+  const c = W(null), [m, C] = K(!1), s = ({ size: r = 16, color: v = "currentColor" }) => /* @__PURE__ */ e(V, { name: "chevron down" }), u = ({ size: r = 16, color: v = "currentColor" }) => /* @__PURE__ */ e(V, { name: "chevron right" }), { layers: o = [], onItemClick: g, patternsData: f, group: p, intl: h, toggleColorLayer: D } = l;
+  return /* @__PURE__ */ a("div", { className: `legends ${m ? "collapsed" : ""}`, ref: c, children: [
+    /* @__PURE__ */ e("div", { className: "legend-collapsible-control", onClick: () => C(!m), children: m ? /* @__PURE__ */ a("div", { children: [
       " ",
-      /* @__PURE__ */ e(c, { size: 14 }),
+      /* @__PURE__ */ e(u, { size: 14 }),
       "   Show Legend"
     ] }) : /* @__PURE__ */ a("div", { children: [
-      /* @__PURE__ */ e(n, { size: 14 }),
+      /* @__PURE__ */ e(s, { size: 14 }),
       "Hide Legend"
     ] }) }),
-    /* @__PURE__ */ e("div", { className: "legends-content", children: s && s.map((r) => {
-      const y = {}, f = r.filters || {};
-      return f && f.forEach && f.forEach((u) => {
-        u.value != null && u.value.filter((p) => p != null && p.toString().trim() != "").length > 0 && (y[u.param] = u.value);
-      }), r.dvzProxyDatasetId && (y.dvzProxyDatasetId = r.dvzProxyDatasetId), /* @__PURE__ */ a("div", { children: [
-        r.type == "base" && /* @__PURE__ */ e(ie, { ...r, group: h, onItemClick: m }),
+    /* @__PURE__ */ e("div", { className: "legends-content", children: o && o.map((r) => {
+      const v = {}, k = r.filters || {};
+      if (k && k.forEach && k.forEach((t) => {
+        t.value != null && t.value.filter((d) => d != null && d.toString().trim() != "").length > 0 && (v[t.param] = t.value);
+      }), r.dvzProxyDatasetId && (v.dvzProxyDatasetId = r.dvzProxyDatasetId), r.extraTooltipColumns && r.extraTooltipColumns.length > 0) {
+        const t = r.extraTooltipColumns.filter((d) => d && d !== r.apiJoinAttribute && d !== r.patternDiscriminator);
+        t.length > 0 && (v.includeColumns = t.join(","));
+      }
+      return /* @__PURE__ */ a("div", { children: [
+        r.type == "base" && /* @__PURE__ */ e(ie, { ...r, group: p, onItemClick: g }),
         r.type == "data" && r.apiJoinAttribute && /* @__PURE__ */ e(
           Y,
           {
             waitForFilters: !0,
             editing: r.editing,
-            params: y,
+            params: v,
             app: r.app,
             verbose: !1,
             csv: decodeURIComponent(r.csv),
-            group: h,
+            group: p,
             ignoreErrors: !0,
             isSvg: !0,
             mySelf: "Legends",
             store: [r.app, l.unique, r.id],
             source: r.apiJoinAttribute + (r.patternDiscriminator != "none" ? "/" + r.patternDiscriminator : ""),
-            children: /* @__PURE__ */ e(Z, { children: /* @__PURE__ */ e(le, { group: h, patternsData: k ? k[r.id] : null, divRef: o, ...r, intl: l.intl, onItemClick: m, toggleColorLayer: D }) })
+            children: /* @__PURE__ */ e(Z, { children: /* @__PURE__ */ e(le, { group: p, patternsData: f ? f[r.id] : null, divRef: c, ...r, intl: l.intl, onItemClick: g, toggleColorLayer: D }) })
           }
         ),
-        r.type == "dataPoints" && /* @__PURE__ */ e(ae, { selectedItem: l.selectedItem, d2Click: l.d2Click, intl: l.intl, group: h, ...r, onItemClick: m }),
-        r.type == "flow" && /* @__PURE__ */ e(re, { group: h, ...r, onItemClick: m, intl: l.intl })
+        r.type == "dataPoints" && /* @__PURE__ */ e(ae, { selectedItem: l.selectedItem, d2Click: l.d2Click, intl: l.intl, group: p, ...r, onItemClick: g }),
+        r.type == "flow" && /* @__PURE__ */ e(re, { group: p, ...r, onItemClick: g, intl: l.intl })
       ] }, r.id);
     }) })
   ] });

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

@@ -1,28 +1,72 @@
-import { jsx as m } from "react/jsx-runtime";
+import { jsx as d } from "react/jsx-runtime";
 import "react";
 import g from "string-template";
-const x = /(\+?\%)[\(]([A-z0-9,.,-]+)\)/gi, d = /(\+?\#)[\(]([A-z0-9,.,-]+)\)/gi, y = /(\+?\#C)[\(]([A-z0-9,.,-]+)\)/gi, a = (o, e, r, t, l, h) => {
-  let n, s = e;
-  for (; (n = o.exec(e)) !== null; ) {
-    const p = n[2], c = n[1], u = ((i, f = 2) => l.formatNumber(t ? i / 100 : i, {
-      maximumFractionDigits: f,
-      ...r,
-      signDisplay: c && c.startsWith("+") ? "never" : "auto"
-    })).apply(void 0, p.split(","));
-    s = s.replaceAll(n[0], u);
+const b = /(\+?\%)[\(]([A-z0-9,.,-]+)\)/gi, h = /(\+?\#)[\(]([A-z0-9,.,-]+)\)/gi, x = /(\+?\#C)[\(]([A-z0-9,.,-]+)\)/gi, S = /(\$)[\(]([A-Za-z0-9,.]+)\)/gi, A = [
+  {
+    name: "USD Dollar",
+    code: "USD",
+    symbol: "$"
+  },
+  {
+    name: "Naira",
+    code: "NGN",
+    symbol: "₦"
+  },
+  {
+    name: "South Africa Rand",
+    code: "ZAR",
+    symbol: "R"
+  },
+  {
+    name: "Ethiopian Birr",
+    code: "ETB",
+    symbol: "Br"
+  },
+  {
+    name: "Zambian Kwacha",
+    code: "ZMW",
+    symbol: "ZK"
+  },
+  {
+    name: "Kenyan Shilling",
+    code: "KES",
+    symbol: "KSh"
   }
+], l = (t) => t && t.trim().toLowerCase(), E = (t, n) => {
+  let o, s = n;
+  for (; (o = t.exec(n)) !== null; )
+    if (o.length > 2) {
+      const a = o[0], c = o[2], e = A.find((r) => l(r.code) == l(c) || l(r.name) == l(c) || l(r.symbol) == l(c));
+      e && (s = s.replaceAll(a, e.symbol));
+    }
   return s;
-}, A = (o, e, r) => {
-  let t = g(o, { ...e, ...e.meta }).replace(/(?:\r\n|\r|\n)/g, "<br>");
-  return t = a(x, t, { style: "percent" }, !0, r), t = a(d, t, { style: "decimal" }, !1, r), t = a(y, t, { notation: "compact" }, !1, r), t;
-}, C = ({ tooltip: o, data: e, intl: r }) => {
-  if (e) {
-    const t = A(o, e, r);
-    return /* @__PURE__ */ m("div", { dangerouslySetInnerHTML: { __html: t } });
+}, p = (t, n, o, s, a, c) => {
+  let e, r = n;
+  for (; (e = t.exec(n)) !== null; ) {
+    const i = e[2], m = e[1], y = ((u, f = 2) => a.formatNumber(s ? u / 100 : u, {
+      maximumFractionDigits: f,
+      ...o,
+      signDisplay: m && m.startsWith("+") ? "never" : "auto"
+    })).apply(void 0, i.split(","));
+    r = r.replaceAll(e[0], y);
+  }
+  return r;
+}, z = (t, n, o) => {
+  const s = { ...n, ...n.meta }, a = {};
+  Object.keys(s).forEach((r) => {
+    a[r] = s[r], a[r.replace(/\s+/g, "_")] = s[r];
+  });
+  const c = t.replace(/\{([^}]+)\}/g, (r, i) => `{${i.replace(/\s+/g, "_")}}`);
+  let e = g(c, a).replace(/(?:\r\n|\r|\n)/g, "<br>");
+  return e = p(b, e, { style: "percent" }, !0, o), e = p(h, e, { style: "decimal" }, !1, o), e = p(x, e, { notation: "compact" }, !1, o), e = E(S, e), e;
+}, Z = ({ tooltip: t, data: n, intl: o }) => {
+  if (n) {
+    const s = z(t, n, o);
+    return /* @__PURE__ */ d("div", { dangerouslySetInnerHTML: { __html: s } });
   } else
-    return /* @__PURE__ */ m("div", {});
+    return /* @__PURE__ */ d("div", {});
 };
 export {
-  C as default,
-  A as formatContent
+  Z as default,
+  z as formatContent
 };

package/dist/esm/embeddable/d3Map/Utils.js

@@ -1,15 +1,29 @@
-import * as a from "d3";
-const n = {}, o = {}, u = 3 * 60 * 1e3, r = (t) => JSON.parse(JSON.stringify(t)), l = (t) => {
-  const i = Date.now(), e = t;
-  if (n[e])
-    return n[e].then(r);
-  if (o[e] && i - o[e].timestamp < u)
-    return Promise.resolve(r(o[e].data));
-  const s = a.json(t).then((c) => (o[e] = { data: c, timestamp: Date.now() }, c)).finally(() => {
-    delete n[e];
+import * as l from "d3";
+const u = "_Color_", i = ["value", "count", "type", "children", "label", "measure"], d = (e) => {
+  const n = {};
+  return e && (Object.keys(e).forEach((r) => {
+    i.includes(r) || (n[r] = e[r]);
+  }), e.type && e.value !== void 0 && (n[e.type] = e.value)), n;
+}, f = (e) => {
+  let n = d(e);
+  return e && e.children && Array.isArray(e.children) && e.children.forEach((r) => {
+    n = { ...n, ...f(r) };
+  }), n;
+}, v = (e, n) => !e || !n ? null : e[(u + n).trim()] || null, t = {}, o = {}, p = 3 * 60 * 1e3, s = (e) => JSON.parse(JSON.stringify(e)), h = (e) => {
+  const n = Date.now(), r = e;
+  if (t[r])
+    return t[r].then(s);
+  if (o[r] && n - o[r].timestamp < p)
+    return Promise.resolve(s(o[r].data));
+  const a = l.json(e).then((c) => (o[r] = { data: c, timestamp: Date.now() }, c)).finally(() => {
+    delete t[r];
   });
-  return n[e] = s, s.then(r);
-}, m = (t) => l(t);
+  return t[r] = a, a.then(s);
+}, y = (e) => h(e);
 export {
-  m as loadJSON
+  u as COLOR_VARIABLE,
+  d as extractVariables,
+  f as extractVariablesDeep,
+  y as loadJSON,
+  v as resolveOverrideColor
 };