@devgateway/dvz-ui-react 1.9.12 → 1.9.13

package/dist/esm/embeddable/map/index.js

@@ -18,15 +18,15 @@ const ma = [
   { label: "Democratic Republic of the Congo", value: "DRC", center: [23.174338, -5.837475], scale: 1250 },
   { label: "World", value: "World", center: [0, 20.050043], scale: 150 }
 ], ca = (s) => /* @__PURE__ */ c(ua, { ...s }), ua = (s) => {
-  var V;
+  var O;
   const {
     unique: f,
     editing: u,
-    "data-filters": W = "{}",
+    "data-filters": J = "{}",
     "data-app": t = "csv",
-    "data-csv": G = "",
-    "data-dimension1": J = "",
-    "data-dimension2": Z = "",
+    "data-csv": Z = "",
+    "data-dimension1": L = "",
+    "data-dimension2": w = "",
     "data-dimension3": g = "",
     "data-extra-tooltip-columns": _ = "[]",
     "data-measures": h = "[]",
@@ -37,25 +37,25 @@ const ma = [
     "data-national-average-label": q = "National Average",
     "data-legend-title": Y = "Legend Title",
     "data-legend-breaks": Q = "[]",
-    "data-zoom-enabled": L = !1,
-    "data-show-legend-labels": w = !1,
+    "data-zoom-enabled": F = !1,
+    "data-show-legend-labels": S = !1,
     "data-map-file": X,
     "data-mapping-field": ee = "zone",
     "data-map-label-field": ae = "admin",
-    "data-has-multiple-measures": F = "false",
+    "data-has-multiple-measures": D = "false",
     topoJSONField: oe = "collection",
     "data-map-center": te = "NGA",
     //country
-    "data-map-label-show-value": S = "false",
-    "data-show-tooltip": D = "true",
+    "data-map-label-show-value": I = "false",
+    "data-show-tooltip": N = "true",
     "data-measure-selector-label": le = "",
     "data-value-format": re = "",
-    "data-show-overall-value": I = "false",
-    "data-auto-generate-breaks": N = "false",
+    "data-show-overall-value": z = "false",
+    "data-auto-generate-breaks": T = "false",
     "data-number-of-breaks": ne = 5,
     "data-scheme": se = "reds",
-    "data-show-no-data-label": z = "false",
-    "data-group": T = "default",
+    "data-show-no-data-label": x = "false",
+    "data-group": A = "default",
     "data-map-symbols": ie = "[]",
     "data-tooltip-theme": de = "map-tooltip-dark",
     "data-label-font-size": me = 14,
@@ -65,7 +65,7 @@ const ma = [
     "data-legend-font-weight": fe = "normal",
     "data-custom-tooltips": ge = "[]",
     "data-format-style": b = "decimal",
-    "data-decimals": x = "2",
+    "data-decimals": B = "2",
     "data-currency": he = "",
     "data-tooltip-font-size": be = 14,
     "data-show-admin-unit-label": Ce = "showAll",
@@ -75,21 +75,21 @@ const ma = [
     "data-highlighted-location": we = "",
     "data-tooltip-format": Fe = `{locationName} %({value},2) 
  {label}: %({value},2)`,
-    "data-show-no-data-tooltip": A = "false",
+    "data-show-no-data-tooltip": U = "false",
     "data-map-container-bg-color": Se = "#fff",
     "data-map-position": De = "{}",
     "data-main-layer-id": Ie = "",
     "data-enabled-layers": Ne,
     "data-point-label-color": ze = "#fff",
     "data-point-label-format": Te = "{locationName} %({value},2)",
-    "data-show-no-data-legend-item": B = !1,
+    "data-show-no-data-legend-item": P = !1,
     "data-highlighted-loc-label-format": xe = "{locationName} - Score: #({value},2)",
     "data-enable-summary-view": ga = "false",
-    "data-map-type": U = "DEFAULT",
+    "data-map-type": R = "DEFAULT",
     "data-default-point-color": Ae = "#FFFF00",
     "data-aggregation-formula": Be = "COUNT",
     "data-zoom-level-to-show-points": Ue = 2,
-    "data-zoom-on-filter": P = "false",
+    "data-zoom-on-filter": E = "false",
     "data-zoom-on-filter-field": Pe = "",
     "data-no-data-text": Re = "No Data",
     "data-labels-exclusion-list": Ee = "",
@@ -101,12 +101,12 @@ const ma = [
     settings: ba
   } = s;
   console.log("MapWrapper props", s);
-  const Oe = (e) => u ? e : decodeURIComponent(e), R = (e) => e == null ? "" : String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, ""), We = (e, a) => {
+  const Oe = (e) => u ? e : decodeURIComponent(e), M = (e) => e == null ? "" : String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, ""), We = (e, a) => {
     if (!e || !a)
       return;
     if (Object.prototype.hasOwnProperty.call(e, a))
       return e[a];
-    const o = R(a), r = Object.keys(e).find((k) => R(k) === o);
+    const o = M(a), r = Object.keys(e).find((W) => M(W) === o);
     return r ? e[r] : void 0;
   }, l = (e) => {
     try {
@@ -123,19 +123,19 @@ const ma = [
     const a = l(e) || [];
     let o = {};
     return a && a.forEach ? a.forEach((r) => {
-      (Array.isArray(r.value) ? r.value : [r.value]).filter((O) => O != null && O.toString().trim() != "").length > 0 && (o[r.param] = r.value);
+      (Array.isArray(r.value) ? r.value : [r.value]).filter((G) => G != null && G.toString().trim() != "").length > 0 && (o[r.param] = r.value);
     }) : o = a, o;
   }, Ze = {
     style: b === "compacted" ? "decimal" : b,
     notation: b === "compacted" ? "compact" : "standard",
     currency: he,
-    minimumFractionDigits: parseInt(x),
-    maximumFractionDigits: parseInt(x)
+    minimumFractionDigits: parseInt(B),
+    maximumFractionDigits: parseInt(B)
   };
   let C = l(Ne) || [];
   C = C.map((e) => (e.bgColor = decodeURIComponent(e.bgColor), e.fontColor = decodeURIComponent(e.fontColor), e));
-  const v = ma.find((e) => e.value === te), E = F == !0 || F == "true";
-  let i = [J, Z].filter((e) => e !== "none" && e !== null).join("/");
+  const v = ma.find((e) => e.value === te), V = D == !0 || D == "true";
+  let i = [L, w].filter((e) => e !== "none" && e !== null).join("/");
   const d = g && g !== "none" ? g : null, _e = v ? v.scale : 2e3, p = {
     unique: f,
     editing: u,
@@ -153,20 +153,20 @@ const ma = [
     nationalAverageLabel: q,
     legendBreaks: Ge(Q),
     mapLabelField: ae,
-    zoomEnabled: L == !0 || L == "true",
-    showLegendLabels: w == !0 || w == "true",
-    multipleMeasures: E,
+    zoomEnabled: F == !0 || F == "true",
+    showLegendLabels: S == !0 || S == "true",
+    multipleMeasures: V,
     app: t,
-    mapLabelShowValue: S == !0 || S == "true",
-    showTooltip: D == !0 || D == "true",
-    showOverallValue: I == !0 || I == "true",
+    mapLabelShowValue: I == !0 || I == "true",
+    showTooltip: N == !0 || N == "true",
+    showOverallValue: z == !0 || z == "true",
     measureSelectorLabel: le,
     valueFormat: re,
-    autoGenerateBreaks: N == !0 || N == "true",
-    showNoDataLabel: z == !0 || z == "true",
+    autoGenerateBreaks: T == !0 || T == "true",
+    showNoDataLabel: x == !0 || x == "true",
     numberOfBreaks: ne,
     colorScheme: se,
-    group: T,
+    group: A,
     symbols: l(ie) || [],
     tooltipTheme: de,
     labelFontSize: me,
@@ -183,7 +183,7 @@ const ma = [
     mapFocusBoundaryColor: decodeURIComponent(Le),
     highlightedLocation: we,
     tooltipFormat: Fe,
-    showNoDataTooltip: A == !0 || A == "true",
+    showNoDataTooltip: U == !0 || U == "true",
     fields: i.split("/"),
     mapContainerBgColor: decodeURIComponent(Se),
     mapPosition: l(De),
@@ -191,12 +191,12 @@ const ma = [
     enabledLayers: C,
     pointLabelColor: decodeURIComponent(ze),
     pointLabelFormat: Te,
-    showNoDataLegendItem: B == !0 || B == "true",
+    showNoDataLegendItem: P == !0 || P == "true",
     highlightedLocLabelFormat: xe,
-    mapType: U,
+    mapType: R,
     defaultPointColor: decodeURIComponent(Ae),
     zoomLevelToShowPoints: Ue,
-    zoomOnFilter: P == !0 || P == "true",
+    zoomOnFilter: E == !0 || E == "true",
     zoomOnFilterField: Pe,
     noDataText: Re,
     labelsExclusionList: Ee.split(",").map((e) => e.trim()),
@@ -206,15 +206,15 @@ const ma = [
   };
   if (p.recentlyToggledLayerId) {
     const e = p.enabledLayers.find((a) => String(a.id) === String(p.recentlyToggledLayerId));
-    e && (e != null && e.apiField) && (i = (V = e.apiField) == null ? void 0 : V.toLowerCase());
+    e && (e != null && e.apiField) && (i = (O = e.apiField) == null ? void 0 : O.toLowerCase());
   }
-  const je = l(Me) || {}, He = t === "csv" ? da : ia, Ke = u ? (l(h) || []).join(",") : h, m = Je(W);
+  const je = l(Me) || {}, He = t === "csv" ? da : ia, Ke = u ? (l(h) || []).join(",") : h, m = Je(J);
   if (d) {
     const e = We(m, d);
     e != null && e !== "" && (m[d] = e);
   }
-  const $e = (l(_) || []).filter((e) => e && e !== "none"), M = Array.from(new Set([d, ...$e].filter(Boolean)));
-  M.length > 0 && (m.includeColumns = M.join(",")), n && (m.dvzProxyDatasetId = n);
+  const $e = (l(_) || []).filter((e) => e && e !== "none" && e !== L && e !== w), k = Array.from(new Set([d, ...$e].filter(Boolean)));
+  k.length > 0 && (m.includeColumns = k.join(",")), n && (m.dvzProxyDatasetId = n);
   const qe = oa(), Ye = ["data", "categories", t, ...n ? [n] : [], "items"], y = ta((e) => e.getIn(Ye)), Qe = Xe(() => y ? y.toJS() : [], [y]);
   return ea(() => {
     t && t !== "csv" && qe(na({ app: t, dvzProxyDatasetId: n }));
@@ -223,8 +223,8 @@ const ma = [
     {
       params: m,
       app: t,
-      csv: decodeURIComponent(G),
-      group: T,
+      csv: decodeURIComponent(Z),
+      group: A,
       editing: u,
       store: [t, f, ...i.split("/")],
       source: i,
@@ -232,8 +232,8 @@ const ma = [
         He,
         {
           measures: Ke,
-          multipleMeasures: E,
-          mapType: U,
+          multipleMeasures: V,
+          mapType: R,
           aggregationFormula: Be,
           customMeasureLabels: je,
           source: i,

package/dist/esm/embeddable/tabbedposts/index.js

@@ -1,17 +1,17 @@
 import { jsx as e, jsxs as f } from "react/jsx-runtime";
 import I, { useState as w, useRef as G, useEffect as x } from "react";
 import { Container as b, Accordion as y, Icon as V, Menu as T, Grid as v, Label as M, Button as W } from "semantic-ui-react";
-import { PostProvider as q, PostConsumer as _, MediaProvider as P, MediaConsumer as A, PostIcon as $, PostLabel as k } from "@devgateway/wp-react-lib";
+import { PostProvider as q, PostConsumer as _, MediaProvider as P, MediaConsumer as A, PostIcon as S, PostLabel as $ } from "@devgateway/wp-react-lib";
 import { injectIntl as E } from "react-intl";
 import { connect as O } from "react-redux";
-import L from "../connected-templates/PostIntro.js";
+import k from "../connected-templates/PostIntro.js";
 import { useWindowDimensionsAndDevice as U } from "../../lib/hooks/window-dimensions.js";
 const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.map((l) => /* @__PURE__ */ e(
   T.Item,
   {
     onClick: () => i(l.slug),
     className: l.slug === o ? "active" : "",
-    children: n ? /* @__PURE__ */ e(k, { post: l }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e("span", { dangerouslySetInnerHTML: { __html: l.title.rendered } }) })
+    children: n ? /* @__PURE__ */ e($, { post: l }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e("span", { dangerouslySetInnerHTML: { __html: l.title.rendered } }) })
   },
   l.id
 )) : null, J = ({
@@ -38,10 +38,10 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
                 P,
                 {
                   id: (m = a.meta_fields) != null && m.icon ? a.meta_fields.icon[0] : null,
-                  children: /* @__PURE__ */ e(A, { children: /* @__PURE__ */ e($, { className: "icon" }) })
+                  children: /* @__PURE__ */ e(A, { children: /* @__PURE__ */ e(S, { className: "icon" }) })
                 }
               ),
-              l ? /* @__PURE__ */ e(k, { post: a }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e(
+              l ? /* @__PURE__ */ e($, { post: a }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e(
                 "span",
                 {
                   dangerouslySetInnerHTML: { __html: a.title.rendered }
@@ -54,7 +54,7 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
       a.id
     );
   }) : null;
-}, S = ({ posts: t, activeItem: o }) => (x(() => {
+}, L = ({ posts: t, activeItem: o }) => (x(() => {
   const i = document.querySelector(".ui.container.content-tab");
   i && (i.scrollTop = 0);
 }, [o]), t ? t.map((i) => {
@@ -70,7 +70,7 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
     visibility: "visible",
     position: "relative",
     width: "auto"
-  }, /* @__PURE__ */ e(L, { as: b, fluid: !0, post: i, style: n }, i.slug);
+  }, /* @__PURE__ */ e(k, { as: b, fluid: !0, post: i, style: n }, i.slug);
 }) : null), K = ({ posts: t, activeItem: o, setActive: i }) => {
   const [n, l] = w(
     t.findIndex((s) => s.slug === o)
@@ -109,7 +109,7 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
               },
               children: [
                 /* @__PURE__ */ f("div", { style: { display: "flex", alignItems: "center" }, children: [
-                  c && /* @__PURE__ */ e(P, { id: c, children: /* @__PURE__ */ e(A, { children: /* @__PURE__ */ e($, { className: "icon" }) }) }),
+                  c && /* @__PURE__ */ e(P, { id: c, children: /* @__PURE__ */ e(A, { children: /* @__PURE__ */ e(S, { className: "icon" }) }) }),
                   /* @__PURE__ */ e(
                     "span",
                     {
@@ -129,7 +129,7 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
         {
           className: "accordion-post-content",
           active: n === u,
-          children: /* @__PURE__ */ e("div", { ref: d, children: /* @__PURE__ */ e(L, { post: s, as: b, fluid: !0 }) })
+          children: /* @__PURE__ */ e("div", { ref: d, children: /* @__PURE__ */ e(k, { post: s, as: b, fluid: !0 }) })
         }
       )
     ] }, s.id);
@@ -146,13 +146,13 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
   }, [t]), /* @__PURE__ */ f(I.Fragment, { children: [
     t.map((r) => /* @__PURE__ */ e("anchor", { id: r.slug }, r.slug)),
     /* @__PURE__ */ e(T, { className: "tabbed posts", text: !0, children: /* @__PURE__ */ e(Y, { showLabels: o, posts: t, setActive: l, activeItem: n }) }),
-    /* @__PURE__ */ e(b, { className: "content-tab", style: { height: `${i}px` }, children: /* @__PURE__ */ e(S, { posts: t, activeItem: n }) })
+    /* @__PURE__ */ e(b, { className: "content-tab", style: { height: `${i}px` }, children: /* @__PURE__ */ e(L, { posts: t, activeItem: n }) })
   ] });
 }, X = ({ posts: t, showLabels: o, showIcons: i, height: n }) => {
   const [l, r] = w(t ? t[0].slug : null);
   return /* @__PURE__ */ e(I.Fragment, { children: /* @__PURE__ */ f(v, { stackable: !0, className: "tabbed posts", columns: t.length, style: { height: n + "px" }, children: [
     /* @__PURE__ */ e(J, { showIcons: i, showLabels: o, posts: t, activeItem: l, setActive: r }),
-    /* @__PURE__ */ e(v.Row, { style: { height: `${n}px` }, children: /* @__PURE__ */ e(v.Column, { width: 16, className: "content", children: /* @__PURE__ */ e(b, { className: "content-tab", style: { height: `${n}px` }, children: /* @__PURE__ */ e(S, { className: "content-tab", posts: t, activeItem: l }) }) }) })
+    /* @__PURE__ */ e(v.Row, { style: { height: `${n}px` }, children: /* @__PURE__ */ e(v.Column, { width: 16, className: "content", children: /* @__PURE__ */ e(b, { className: "content-tab", style: { height: `${n}px` }, children: /* @__PURE__ */ e(L, { className: "content-tab", posts: t, activeItem: l }) }) }) })
   ] }) });
 }, Z = (t) => {
   var N;
@@ -173,7 +173,7 @@ const Y = ({ posts: t, activeItem: o, setActive: i, showLabels: n }) => t ? t.ma
     unique: j
   } = t;
   c != null && c.previewMode && (c != null && c.editing) && (u = c.previewMode, g = c.editing);
-  const D = t.intl.locale, R = Array.isArray(n) ? n.join(",") : n, p = d === "true", C = p ? s : void 0, { width: H } = U(), z = H <= 1024, B = u !== "Desktop" && g, F = z && !g;
+  const D = t.intl.locale, R = Array.isArray(n) ? n.join(",").toString() : n, p = d === "true", C = p ? s : void 0, { width: H } = U(), z = H <= 1024, B = u !== "Desktop" && g, F = z && !g;
   return g && !o ? /* @__PURE__ */ e(b, { className: `viz tabbed posts ${g ? "editing" : ""} ${p ? "scrollable" : ""}`, fluid: !0 }) : /* @__PURE__ */ e(b, { className: `viz tabbed posts ${g ? "editing" : ""} ${p ? "scrollable" : ""}`, fluid: !0, children: /* @__PURE__ */ e(
     q,
     {

package/dist/types/embeddable/d3Map/Utils.d.ts

@@ -1 +1,5 @@
+export const COLOR_VARIABLE: "_Color_";
+export function extractVariables(item: any): {};
+export function extractVariablesDeep(item: any): {};
+export function resolveOverrideColor(meta: any, measure: any): any;
 export function loadJSON(url: any): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devgateway/dvz-ui-react",
-  "version": "1.9.12",
+  "version": "1.9.13",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/types/index.d.ts",