@devgateway/dvz-ui-react 1.9.9 → 1.9.10

package/dist/cjs/embeddable/map/MapDataFrame.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const K=require("react"),ee=x=>{var P,j;const{data:l,measures:D,customMeasureLabels:h,children:W,source:B,extraDimension:A,allDimensions:C}=x;console.log("MapDataFrame props:",x);const T=(B||"").split("/").filter(Boolean),y=T.length>0?T[0]:null,i={locationsData:[],nationalData:{},measureLabelMap:{}};l.metadata&&l.metadata.measures&&Array.isArray(l.metadata.measures),l.children&&l.children[0]&&l.children[0].children;const L=l.metadata||{},q=["value","count","type","children","label","measure"],O=C&&C.length>0?C:L.types||[],b={};O.forEach(e=>{const n=e.category||e.type;n&&(b[n]=e.items||[])});const w=(e,n)=>{const a=b[e];if(!a)return null;const t=n!=null?String(n):n;return a.find(r=>{const o=r.value!=null?String(r.value):r.value,c=r.id!=null?String(r.id):r.id,s=r.code!=null?String(r.code):r.code;return o===t||c===t||s===t})||null},f=(e,n)=>{const a=w(e,n);return a?a.value??a.label??a.id??a.code??n:n},J=(e={})=>{const n={};return Object.keys(e).forEach(a=>{const t=e[a];t!=null&&(Array.isArray(t)?n[a]=t.map(r=>f(a,r)).join(" ,"):n[a]=f(a,t))}),n},$=e=>{const n=b[e]||[];return n.length===1?f(e,n[0].value??n[0].id??n[0].code):null},d=e=>e!=null&&e!=="",R=e=>{if(e)return d(e.value)?e.value:d(e.id)?e.id:e.code},V=e=>e==null?"":String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g,"_").replace(/^_+|_+$/g,""),v=(e,n)=>{if(!e)return;const a=V(n),t=e[n];if(t!=null&&t!=="")return t;const r=Object.keys(e);for(let o=0;o<r.length;o++){const c=r[o];if(V(c)===a){const s=e[c];if(s!=null&&s!=="")return s}}},G=(e,n)=>{const a=[y,"country",e.type].filter(Boolean),t=[v(n,"country"),v(e,"country"),y?v(n,y):void 0,y?v(e,y):void 0,e.label,e.value].filter(r=>d(r));for(let r=0;r<a.length;r++){const o=a[r],c=b[o]||[];if(c.length)for(let s=0;s<t.length;s++){const g=t[s],U=V(g),N=c.findIndex(k=>{const m=R(k);return V(m)===U});if(N>=0)return N}}return-1},H=(e,n,a)=>{const t=G(n,a);if(t<0)return;const r=b[e]||[];if(!r.length||t>=r.length)return;const o=R(r[t]);if(d(o))return f(e,o)},Q=(e,n,a)=>{const t=v(a,e);if(d(t))return t;if(d(S[e]))return S[e];const r=v(n,e);if(d(r))return r;const o=H(e,n,a);if(d(o))return o;const c=$(e);if(d(c))return c;const s=n.value;return w(e,s)?f(e,s):""},E=l.appliedFilters||{};if(A){const e=E[A]?E[A][0]:void 0;f(A,e)}const S=J(E),X=e=>{const n={};return Object.keys(e).forEach(a=>{q.includes(a)||(n[a]=e[a])}),e.type&&e.value!==void 0&&(n[e.type]=f(e.type,e.value)),n},F=e=>{let n=X(e);return e.children&&Array.isArray(e.children)&&e.children.forEach(a=>{n={...n,...F(a)}}),n},_=(e,n)=>{if(!(!e.children||!Array.isArray(e.children)))return e.children.map(a=>({...a,label:a.value,value:a[n],variables:F(a),children:_(a,n)}))};L.measures&&L.measures.forEach(e=>{h&&h[e.value]&&h[e.value].hasCustomLabel&&h[e.value].customLabel?i.measureLabelMap[e.value]=h[e.value].customLabel:i.measureLabelMap[e.value]=e.label});const z=(((P=l==null?void 0:l.metadata)==null?void 0:P.measures)||[]).map(e=>e==null?void 0:e.value).filter(Boolean),u=(()=>{if(Array.isArray(D))return D.map(e=>(""+e).trim()).filter(Boolean);if(typeof D=="string"){const e=D.trim();if(!e||e==="[]")return z;if(e.startsWith("[")&&e.endsWith("]"))try{const n=JSON.parse(e);if(Array.isArray(n))return n.map(a=>(""+a).trim()).filter(Boolean)}catch{}return e.split(",").map(n=>n.trim()).filter(Boolean)}return z})(),M=((j=l==null?void 0:l.metadata)==null?void 0:j.types)||[],Y=(B||"").split("/")[0],Z=M.find(e=>e.dimension===Y)||M[0],I=(e,n)=>{var o;if(typeof(e==null?void 0:e.value)=="string")return e.value;const t=M.find(c=>c.dimension===(e==null?void 0:e.type))||Z,r=(o=t==null?void 0:t.items)==null?void 0:o[n];return(r==null?void 0:r.value)||(r==null?void 0:r.code)||(e==null?void 0:e.label)||(e==null?void 0:e.value)},p=(e,n)=>{if(e&&Object.prototype.hasOwnProperty.call(e,n))return e[n];if(n==="value")return e==null?void 0:e.value};if(l&&l.children){l.children.forEach((n,a)=>{const t=I(n,a);u.forEach(r=>{const o={...F(n),...S};O.forEach(s=>{const g=s.category||s.type;g&&(o[g]=Q(g,n,o))});const c={...n,label:t,value:p(n,r),measure:r,variables:o};c.variables.selectedDataFrameTooltipValue=p(n,r),n.children&&(c.children=[],n.children.forEach(s=>{c.children.push({...s,label:s.value,value:p(s,r)})})),c.children=_(n,r),i.locationsData.push(c)})}),i.measures=u.length>1?u:null;const e=u.length>0?u[0]:null;i.nationalData.value=e?p(l,e):null}else if(l&&u.length>0){const e=typeof l.value=="string"&&l.value||l.label||l.type||"total";u.forEach(n=>{const a=p(l,n);a!==void 0&&i.locationsData.push({label:e,value:a,measure:n})}),i.measures=u.length>1?u:null,i.nationalData.value=p(l,u[0])}return K.Children.map(W,e=>K.cloneElement(e,{transformedData:{...i,types:M}}))};exports.default=ee;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const q=require("react"),re=F=>{var N,K;const{data:o,measures:D,customMeasureLabels:y,children:J,source:x,extraDimension:f,allDimensions:C}=F;console.log("MapDataFrame props:",F);const B=(x||"").split("/").filter(Boolean),b=B.length>0?B[0]:null,d={locationsData:[],nationalData:{},measureLabelMap:{}};o.metadata&&o.metadata.measures&&Array.isArray(o.metadata.measures),o.children&&o.children[0]&&o.children[0].children;const E=o.metadata||{},$=["value","count","type","children","label","measure"],T=C&&C.length>0?C:E.types||[],V={};T.forEach(e=>{const n=e.category||e.type;n&&(V[n]=e.items||[])});const O=(e,n)=>{const r=V[e];if(!r)return null;const t=n!=null?String(n):n;return r.find(a=>{const l=a.value!=null?String(a.value):a.value,i=a.id!=null?String(a.id):a.id,s=a.code!=null?String(a.code):a.code;return l===t||i===t||s===t})||null},v=(e,n)=>{const r=O(e,n);return r?r.value??r.label??r.id??r.code??n:n},G=(e={})=>{const n={};return Object.keys(e).forEach(r=>{const t=e[r];t!=null&&(Array.isArray(t)?n[r]=t.map(a=>v(r,a)).join(" ,"):n[r]=v(r,t))}),n},H=e=>{const n=V[e]||[];return n.length===1?v(e,n[0].value??n[0].id??n[0].code):null},c=e=>e!=null&&e!=="",w=e=>{if(e)return c(e.value)?e.value:c(e.id)?e.id:e.code},A=e=>e==null?"":String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g,"_").replace(/^_+|_+$/g,""),p=(e,n)=>{if(!e)return;const r=A(n),t=e[n];if(t!=null&&t!=="")return t;const a=Object.keys(e);for(let l=0;l<a.length;l++){const i=a[l];if(A(i)===r){const s=e[i];if(s!=null&&s!=="")return s}}},Q=e=>Array.isArray(e)?e.length>0?e[0]:void 0:e,X=(e,n)=>{const r=[b,"country",e.type].filter(Boolean),t=[p(n,"country"),p(e,"country"),b?p(n,b):void 0,b?p(e,b):void 0,e.label,e.value].filter(a=>c(a));for(let a=0;a<r.length;a++){const l=r[a],i=V[l]||[];if(i.length)for(let s=0;s<t.length;s++){const h=t[s],m=A(h),W=i.findIndex(ee=>{const ne=w(ee);return A(ne)===m});if(W>=0)return W}}return-1},Y=(e,n,r)=>{const t=X(n,r);if(t<0)return;const a=V[e]||[];if(!a.length||t>=a.length)return;const l=w(a[t]);if(c(l))return v(e,l)},R=(e,n,r)=>{const t=p(r,e);if(c(t))return t;if(c(L[e]))return L[e];const a=p(n,e);if(c(a))return a;const l=Y(e,n,r);if(c(l))return l;const i=H(e);if(c(i))return i;const s=n.value;return O(e,s)?v(e,s):""},_=o.appliedFilters||{};let z="";if(f){const e=p(_,f),n=Q(e);z=v(f,n)||""}const L=G(_),Z=e=>{const n={};return Object.keys(e).forEach(r=>{$.includes(r)||(n[r]=e[r])}),e.type&&e.value!==void 0&&(n[e.type]=v(e.type,e.value)),n},S=e=>{let n=Z(e);return e.children&&Array.isArray(e.children)&&e.children.forEach(r=>{n={...n,...S(r)}}),n},P=(e,n)=>{if(!(!e.children||!Array.isArray(e.children)))return e.children.map(r=>({...r,label:r.value,value:r[n],variables:S(r),children:P(r,n)}))};E.measures&&E.measures.forEach(e=>{y&&y[e.value]&&y[e.value].hasCustomLabel&&y[e.value].customLabel?d.measureLabelMap[e.value]=y[e.value].customLabel:d.measureLabelMap[e.value]=e.label});const j=(((N=o==null?void 0:o.metadata)==null?void 0:N.measures)||[]).map(e=>e==null?void 0:e.value).filter(Boolean),u=(()=>{if(Array.isArray(D))return D.map(e=>(""+e).trim()).filter(Boolean);if(typeof D=="string"){const e=D.trim();if(!e||e==="[]")return j;if(e.startsWith("[")&&e.endsWith("]"))try{const n=JSON.parse(e);if(Array.isArray(n))return n.map(r=>(""+r).trim()).filter(Boolean)}catch{}return e.split(",").map(n=>n.trim()).filter(Boolean)}return j})(),M=((K=o==null?void 0:o.metadata)==null?void 0:K.types)||[],I=(x||"").split("/")[0],U=M.find(e=>e.dimension===I)||M[0],k=(e,n)=>{var l;if(typeof(e==null?void 0:e.value)=="string")return e.value;const t=M.find(i=>i.dimension===(e==null?void 0:e.type))||U,a=(l=t==null?void 0:t.items)==null?void 0:l[n];return(a==null?void 0:a.value)||(a==null?void 0:a.code)||(e==null?void 0:e.label)||(e==null?void 0:e.value)},g=(e,n)=>{if(e&&Object.prototype.hasOwnProperty.call(e,n))return e[n];if(n==="value")return e==null?void 0:e.value};if(o&&o.children){o.children.forEach((n,r)=>{const t=k(n,r);u.forEach(a=>{const l={...S(n),...L};if(T.forEach(s=>{const h=s.category||s.type;h&&(l[h]=R(h,n,l))}),f){const s=R(f,n,l);l[f]=c(s)?s:z,l.dimension3=l[f],l.additionalDimension=l[f]}const i={...n,label:t,value:g(n,a),measure:a,variables:l};i.variables.selectedDataFrameTooltipValue=g(n,a),n.children&&(i.children=[],n.children.forEach(s=>{i.children.push({...s,label:s.value,value:g(s,a)})})),i.children=P(n,a),d.locationsData.push(i)})}),d.measures=u.length>1?u:null;const e=u.length>0?u[0]:null;d.nationalData.value=e?g(o,e):null}else if(o&&u.length>0){const e=typeof o.value=="string"&&o.value||o.label||o.type||"total";u.forEach(n=>{const r=g(o,n);r!==void 0&&d.locationsData.push({label:e,value:r,measure:n})}),d.measures=u.length>1?u:null,d.nationalData.value=g(o,u[0])}return q.Children.map(J,e=>q.cloneElement(e,{transformedData:{...d,types:M}}))};exports.default=re;

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

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const i=require("react/jsx-runtime"),k=require("react"),C=require("react-redux"),Ke=require("../data/DataProvider.js"),_e=require("../data/DataConsumer.js"),Ye=require("../reducers/data.js"),$e=require("./map.js"),Qe=require("./MapDataFrame.js"),Xe=require("./MapCSVDataFrame.js"),ea=[{label:"KENYA",value:"KEN",center:[35.8166634,.1],scale:2e3},{label:"Nigeria",value:"NGA",center:[7.491302,9.072264],scale:2e3},{label:"South Africa",value:"ZAF",center:[24.676997,-28.48322],scale:2e3},{label:"West Africa",value:"West Africa",center:[-7.293255,13.90572],scale:1500},{label:"Africa",value:"Africa",center:[13.134227,-11.523088],scale:550},{label:"Ethiopia",value:"ETH",center:[35.8166634,1.7],scale:2e3},{label:"Zambia",value:"ZMB",center:[26.459455,-14.668135],scale:2e3},{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}],aa=n=>i.jsx(ta,{...n}),ta=n=>{var E;const{unique:u,editing:d,"data-filters":q="{}","data-app":o="csv","data-csv":O="","data-dimension1":j="","data-dimension2":W="","data-dimension3":p="","data-measures":f="[]","data-height":V=600,width:G=960,"data-data-source-text":J="","data-data-source-label":Z="Source","data-national-average-label":H="National Average","data-legend-title":K="Legend Title","data-legend-breaks":_="[]","data-zoom-enabled":v=!1,"data-show-legend-labels":y=!1,"data-map-file":Y,"data-mapping-field":$="zone","data-map-label-field":Q="admin","data-has-multiple-measures":F="false",topoJSONField:X="collection","data-map-center":ee="NGA","data-map-label-show-value":L="false","data-show-tooltip":w="true","data-measure-selector-label":ae="","data-value-format":te="","data-show-overall-value":S="false","data-auto-generate-breaks":D="false","data-number-of-breaks":oe=5,"data-scheme":le="reds","data-show-no-data-label":I="false","data-group":x="default","data-map-symbols":re="[]","data-tooltip-theme":ne="map-tooltip-dark","data-label-font-size":se=12,"data-label-font-weight":ie="normal","data-label-font-color":de="#595959","data-legend-font-size":ce=12,"data-legend-font-weight":me="normal","data-custom-tooltips":ue="[]","data-format-style":g="decimal","data-decimals":N="2","data-currency":pe="","data-tooltip-font-size":fe=14,"data-show-admin-unit-label":ge="showAll","data-map-no-data-color":be="#f8f8f8","data-map-boundary-color":he="#000","data-map-focus-boundary-color":Ce="#000","data-highlighted-location":ve="","data-tooltip-format":ye=`{locationName} %({value},2) 
- {label}: %({value},2)`,"data-show-no-data-tooltip":T="false","data-map-container-bg-color":Fe="#fff","data-map-position":Le="{}","data-main-layer-id":we="","data-enabled-layers":Se,"data-point-label-color":De="#fff","data-point-label-format":Ie="{locationName} %({value},2)","data-show-no-data-legend-item":z=!1,"data-highlighted-loc-label-format":xe="{locationName} - Score: #({value},2)","data-enable-summary-view":na="false","data-map-type":R="DEFAULT","data-default-point-color":Ne="#FFFF00","data-aggregation-formula":Te="COUNT","data-zoom-level-to-show-points":ze=2,"data-zoom-on-filter":U="false","data-zoom-on-filter-field":Re="","data-no-data-text":Ue="No Data","data-labels-exclusion-list":Ae="","data-custom-measure-labels":Be="{}","data-show-shading-layer-labels":Me="ifUnitHasData","data-dvz-proxy-dataset-id":r,"data-recently-toggled-layer-id":Ee=null,intl:sa,settings:ia}=n;console.log("MapWrapper props",n);const Pe=e=>d?e:decodeURIComponent(e),l=e=>{try{if(e)return JSON.parse(Pe(e))}catch{console.error("error parsing value:"+e)}return null},ke=e=>{let t=l(e)||[];return t=t.map(a=>(a.min&&(a.min=parseFloat(a.min)),a.max&&(a.max=parseFloat(a.max)),a.color=decodeURIComponent(a.color),a)),t},qe=e=>{const t=l(e)||[];let a={};return t&&t.forEach?t.forEach(m=>{m.value!=null&&m.value.filter(P=>P!=null&&P.toString().trim()!="").length>0&&(a[m.param]=m.value)}):a=t,a},Oe={style:g==="compacted"?"decimal":g,notation:g==="compacted"?"compact":"standard",currency:pe,minimumFractionDigits:parseInt(N),maximumFractionDigits:parseInt(N)};let b=l(Se)||[];b=b.map(e=>(e.bgColor=decodeURIComponent(e.bgColor),e.fontColor=decodeURIComponent(e.fontColor),e));const A=ea.find(e=>e.value===ee),B=F==!0||F=="true";let s=[j,W].filter(e=>e!=="none"&&e!==null).join("/");const je=p&&p!=="none"?p:null,c={unique:u,editing:d,source:`/${Y}`,center:A.center,scale:A.scale,measures:f,legendTitle:K,height:V,width:G,topoJSONField:X,mappingField:$,dataSourceText:J,dataSourceLabel:Z,nationalAverageLabel:H,legendBreaks:ke(_),mapLabelField:Q,zoomEnabled:v==!0||v=="true",showLegendLabels:y==!0||y=="true",multipleMeasures:B,app:o,mapLabelShowValue:L==!0||L=="true",showTooltip:w==!0||w=="true",showOverallValue:S==!0||S=="true",measureSelectorLabel:ae,valueFormat:te,autoGenerateBreaks:D==!0||D=="true",showNoDataLabel:I==!0||I=="true",numberOfBreaks:oe,colorScheme:le,group:x,symbols:l(re)||[],tooltipTheme:ne,labelFontSize:se,labelFontColor:decodeURIComponent(de),labelFontWeight:ie,legendFontSize:ce,legendFontWeight:me,customTooltips:l(ue)||[],format:Oe,tooltipFontSize:fe,showAdminUnitLabel:ge,mapNoDataColor:decodeURIComponent(be),mapBoundaryColor:decodeURIComponent(he),mapFocusBoundaryColor:decodeURIComponent(Ce),highlightedLocation:ve,tooltipFormat:ye,showNoDataTooltip:T==!0||T=="true",fields:s.split("/"),mapContainerBgColor:decodeURIComponent(Fe),mapPosition:l(Le),mainLayerId:we,enabledLayers:b,pointLabelColor:decodeURIComponent(De),pointLabelFormat:Ie,showNoDataLegendItem:z==!0||z=="true",highlightedLocLabelFormat:xe,mapType:R,defaultPointColor:decodeURIComponent(Ne),zoomLevelToShowPoints:ze,zoomOnFilter:U==!0||U=="true",zoomOnFilterField:Re,noDataText:Ue,labelsExclusionList:Ae.split(",").map(e=>e.trim()),showShadingLayerLabels:Me,dvzProxyDatasetId:r,recentlyToggledLayerId:Ee};if(c.recentlyToggledLayerId){const e=c.enabledLayers.find(t=>String(t.id)===String(c.recentlyToggledLayerId));e&&(e!=null&&e.apiField)&&(s=(E=e.apiField)==null?void 0:E.toLowerCase())}const We=l(Be)||{},Ve=o==="csv"?Xe.default:Qe.default,Ge=d?(l(f)||[]).join(","):f,M=qe(q);r&&(M.dvzProxyDatasetId=r);const Je=C.useDispatch(),Ze=["data","categories",o,...r?[r]:[],"items"],h=C.useSelector(e=>e.getIn(Ze)),He=k.useMemo(()=>h?h.toJS():[],[h]);return k.useEffect(()=>{o&&o!=="csv"&&Je(Ye.getCategories({app:o,dvzProxyDatasetId:r}))},[o,r]),i.jsx(Ke.default,{params:M,app:o,csv:decodeURIComponent(O),group:x,editing:d,store:[o,u,...s.split("/")],source:s,children:i.jsx(_e.default,{children:i.jsx(Ve,{measures:Ge,multipleMeasures:B,mapType:R,aggregationFormula:Te,customMeasureLabels:We,source:s,extraDimension:je,allDimensions:He,children:i.jsx($e.default,{...c})})})})},oa=(n,u)=>{},la={},ra=C.connect(oa,la)(aa);exports.default=ra;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const u=require("react/jsx-runtime"),j=require("react"),y=require("react-redux"),ea=require("../data/DataProvider.js"),aa=require("../data/DataConsumer.js"),ta=require("../reducers/data.js"),oa=require("./map.js"),la=require("./MapDataFrame.js"),ra=require("./MapCSVDataFrame.js"),na=[{label:"KENYA",value:"KEN",center:[35.8166634,.1],scale:2e3},{label:"Nigeria",value:"NGA",center:[7.491302,9.072264],scale:2e3},{label:"South Africa",value:"ZAF",center:[24.676997,-28.48322],scale:2e3},{label:"West Africa",value:"West Africa",center:[-7.293255,13.90572],scale:1500},{label:"Africa",value:"Africa",center:[13.134227,-11.523088],scale:550},{label:"Ethiopia",value:"ETH",center:[35.8166634,1.7],scale:2e3},{label:"Zambia",value:"ZMB",center:[26.459455,-14.668135],scale:2e3},{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}],sa=s=>u.jsx(ia,{...s}),ia=s=>{var k;const{unique:f,editing:m,"data-filters":W="{}","data-app":o="csv","data-csv":_="","data-dimension1":G="","data-dimension2":J="","data-dimension3":g="","data-extra-tooltip-columns":Z="[]","data-measures":h="[]","data-height":H=600,width:K=960,"data-data-source-text":$="","data-data-source-label":Y="Source","data-national-average-label":Q="National Average","data-legend-title":X="Legend Title","data-legend-breaks":ee="[]","data-zoom-enabled":L=!1,"data-show-legend-labels":w=!1,"data-map-file":ae,"data-mapping-field":te="zone","data-map-label-field":oe="admin","data-has-multiple-measures":F="false",topoJSONField:le="collection","data-map-center":re="NGA","data-map-label-show-value":S="false","data-show-tooltip":x="true","data-measure-selector-label":ne="","data-value-format":se="","data-show-overall-value":D="false","data-auto-generate-breaks":I="false","data-number-of-breaks":ie=5,"data-scheme":de="reds","data-show-no-data-label":N="false","data-group":T="default","data-map-symbols":ce="[]","data-tooltip-theme":ue="map-tooltip-dark","data-label-font-size":me=12,"data-label-font-weight":pe="normal","data-label-font-color":fe="#595959","data-legend-font-size":ge=12,"data-legend-font-weight":he="normal","data-custom-tooltips":be="[]","data-format-style":b="decimal","data-decimals":z="2","data-currency":ve="","data-tooltip-font-size":Ce=14,"data-show-admin-unit-label":ye="showAll","data-map-no-data-color":Le="#f8f8f8","data-map-boundary-color":we="#000","data-map-focus-boundary-color":Fe="#000","data-highlighted-location":Se="","data-tooltip-format":xe=`{locationName} %({value},2) 
+ {label}: %({value},2)`,"data-show-no-data-tooltip":A="false","data-map-container-bg-color":De="#fff","data-map-position":Ie="{}","data-main-layer-id":Ne="","data-enabled-layers":Te,"data-point-label-color":ze="#fff","data-point-label-format":Ae="{locationName} %({value},2)","data-show-no-data-legend-item":R=!1,"data-highlighted-loc-label-format":Re="{locationName} - Score: #({value},2)","data-enable-summary-view":ma="false","data-map-type":B="DEFAULT","data-default-point-color":Be="#FFFF00","data-aggregation-formula":Ue="COUNT","data-zoom-level-to-show-points":Pe=2,"data-zoom-on-filter":U="false","data-zoom-on-filter-field":Me="","data-no-data-text":Ee="No Data","data-labels-exclusion-list":Ve="","data-custom-measure-labels":ke="{}","data-show-shading-layer-labels":qe="ifUnitHasData","data-dvz-proxy-dataset-id":n,"data-recently-toggled-layer-id":Oe=null,intl:pa,settings:fa}=s;console.log("MapWrapper props",s);const je=e=>m?e:decodeURIComponent(e),P=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 t=P(a),r=Object.keys(e).find(q=>P(q)===t);return r?e[r]:void 0},l=e=>{try{if(e)return JSON.parse(je(e))}catch{console.error("error parsing value:"+e)}return null},_e=e=>{let a=l(e)||[];return a=a.map(t=>(t.min&&(t.min=parseFloat(t.min)),t.max&&(t.max=parseFloat(t.max)),t.color=decodeURIComponent(t.color),t)),a},Ge=e=>{const a=l(e)||[];let t={};return a&&a.forEach?a.forEach(r=>{(Array.isArray(r.value)?r.value:[r.value]).filter(O=>O!=null&&O.toString().trim()!="").length>0&&(t[r.param]=r.value)}):t=a,t},Je={style:b==="compacted"?"decimal":b,notation:b==="compacted"?"compact":"standard",currency:ve,minimumFractionDigits:parseInt(z),maximumFractionDigits:parseInt(z)};let v=l(Te)||[];v=v.map(e=>(e.bgColor=decodeURIComponent(e.bgColor),e.fontColor=decodeURIComponent(e.fontColor),e));const M=na.find(e=>e.value===re),E=F==!0||F=="true";let i=[G,J].filter(e=>e!=="none"&&e!==null).join("/");const d=g&&g!=="none"?g:null,p={unique:f,editing:m,source:`/${ae}`,center:M.center,scale:M.scale,measures:h,legendTitle:X,height:H,width:K,topoJSONField:le,mappingField:te,dataSourceText:$,dataSourceLabel:Y,nationalAverageLabel:Q,legendBreaks:_e(ee),mapLabelField:oe,zoomEnabled:L==!0||L=="true",showLegendLabels:w==!0||w=="true",multipleMeasures:E,app:o,mapLabelShowValue:S==!0||S=="true",showTooltip:x==!0||x=="true",showOverallValue:D==!0||D=="true",measureSelectorLabel:ne,valueFormat:se,autoGenerateBreaks:I==!0||I=="true",showNoDataLabel:N==!0||N=="true",numberOfBreaks:ie,colorScheme:de,group:T,symbols:l(ce)||[],tooltipTheme:ue,labelFontSize:me,labelFontColor:decodeURIComponent(fe),labelFontWeight:pe,legendFontSize:ge,legendFontWeight:he,customTooltips:l(be)||[],format:Je,tooltipFontSize:Ce,showAdminUnitLabel:ye,mapNoDataColor:decodeURIComponent(Le),mapBoundaryColor:decodeURIComponent(we),mapFocusBoundaryColor:decodeURIComponent(Fe),highlightedLocation:Se,tooltipFormat:xe,showNoDataTooltip:A==!0||A=="true",fields:i.split("/"),mapContainerBgColor:decodeURIComponent(De),mapPosition:l(Ie),mainLayerId:Ne,enabledLayers:v,pointLabelColor:decodeURIComponent(ze),pointLabelFormat:Ae,showNoDataLegendItem:R==!0||R=="true",highlightedLocLabelFormat:Re,mapType:B,defaultPointColor:decodeURIComponent(Be),zoomLevelToShowPoints:Pe,zoomOnFilter:U==!0||U=="true",zoomOnFilterField:Me,noDataText:Ee,labelsExclusionList:Ve.split(",").map(e=>e.trim()),showShadingLayerLabels:qe,dvzProxyDatasetId:n,recentlyToggledLayerId:Oe};if(p.recentlyToggledLayerId){const e=p.enabledLayers.find(a=>String(a.id)===String(p.recentlyToggledLayerId));e&&(e!=null&&e.apiField)&&(i=(k=e.apiField)==null?void 0:k.toLowerCase())}const Ze=l(ke)||{},He=o==="csv"?ra.default:la.default,Ke=m?(l(h)||[]).join(","):h,c=Ge(W);if(d){const e=We(c,d);e!=null&&e!==""&&(c[d]=e)}const $e=(l(Z)||[]).filter(e=>e&&e!=="none"),V=Array.from(new Set([d,...$e].filter(Boolean)));V.length>0&&(c.includeColumns=V.join(",")),n&&(c.dvzProxyDatasetId=n);const Ye=y.useDispatch(),Qe=["data","categories",o,...n?[n]:[],"items"],C=y.useSelector(e=>e.getIn(Qe)),Xe=j.useMemo(()=>C?C.toJS():[],[C]);return j.useEffect(()=>{o&&o!=="csv"&&Ye(ta.getCategories({app:o,dvzProxyDatasetId:n}))},[o,n]),u.jsx(ea.default,{params:c,app:o,csv:decodeURIComponent(_),group:T,editing:m,store:[o,f,...i.split("/")],source:i,children:u.jsx(aa.default,{children:u.jsx(He,{measures:Ke,multipleMeasures:E,mapType:B,aggregationFormula:Ue,customMeasureLabels:Ze,source:i,extraDimension:d,allDimensions:Xe,children:u.jsx(oa.default,{...p})})})})},da=(s,f)=>{},ca={},ua=y.connect(da,ca)(sa);exports.default=ua;

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("react/jsx-runtime"),u=require("react"),l=require("semantic-ui-react"),h=require("@devgateway/wp-react-lib"),N=require("react-intl"),S=require("react-redux"),y=require("../connected-templates/PostIntro.js"),L=require("../../lib/hooks/window-dimensions.js"),q=require("../utils/parseUtils.js"),A=({posts:t,activeItem:a,setActive:i,showLabels:n})=>t?t.map(s=>e.jsx(l.Menu.Item,{onClick:()=>i(s.slug),className:s.slug===a?"active":"",children:n?e.jsx(h.PostLabel,{post:s}):e.jsx(l.Label,{children:e.jsx("span",{dangerouslySetInnerHTML:{__html:s.title.rendered}})})},s.id)):null,k=({posts:t,activeItem:a,setActive:i,showIcons:n,showLabels:s})=>{const r=t.length;return t?t.map(o=>{var m,g;return(m=o._embedded)!=null&&m["wp:featuredmedia"]&&o._embedded["wp:featuredmedia"][0].source_url,e.jsx(l.Grid.Column,{className:(o.slug===a?"active":"")+(n?" has-icon":""),children:e.jsxs(l.Button,{onClick:()=>i(o.slug),className:`nav  ${r===1?"one":""}`,children:[n&&e.jsx(h.MediaProvider,{id:(g=o.meta_fields)!=null&&g.icon?o.meta_fields.icon[0]:null,children:e.jsx(h.MediaConsumer,{children:e.jsx(h.PostIcon,{className:"icon"})})}),s?e.jsx(h.PostLabel,{post:o}):e.jsx(l.Label,{children:e.jsx("span",{dangerouslySetInnerHTML:{__html:o.title.rendered}})})]})},o.id)}):null},I=({posts:t,activeItem:a})=>(u.useEffect(()=>{const i=document.querySelector(".ui.container.content-tab");i&&(i.scrollTop=0)},[a]),t?t.map(i=>{let n={};return i.slug!==a?n={position:"absolute",left:"-3000px",width:"auto",height:"0px",overflow:"hidden",visibility:"hidden"}:n={visibility:"visible",position:"relative",width:"auto"},e.jsx(y.default,{as:l.Container,fluid:!0,post:i,style:n},i.slug)}):null),R=({posts:t,activeItem:a,setActive:i})=>{const[n,s]=u.useState(t.findIndex(d=>d.slug===a)),[r,o]=u.useState(null),m=u.useRef(null);u.useEffect(()=>{if(r){const d=r.getBoundingClientRect().top+window.scrollY;window.scrollTo({top:d,behavior:"smooth"})}},[r]);const g=(d,x)=>{const{index:c}=x,j=n===c?-1:c;s(j),i(t[c].slug),j!==-1&&o(d.currentTarget)};return e.jsx(l.Accordion,{fluid:!0,styled:!0,children:t.map((d,x)=>{var j;const c=(j=d.meta_fields)!=null&&j.icon?d.meta_fields.icon[0]:null;return e.jsxs(u.Fragment,{children:[e.jsx(l.Accordion.Title,{active:n===x,index:x,onClick:g,children:e.jsxs("div",{style:{display:"flex",alignItems:"center",justifyContent:"space-between",width:"100%"},children:[e.jsxs("div",{style:{display:"flex",alignItems:"center"},children:[c&&e.jsx(h.MediaProvider,{id:c,children:e.jsx(h.MediaConsumer,{children:e.jsx(h.PostIcon,{className:"icon"})})}),e.jsx("span",{dangerouslySetInnerHTML:{__html:d.title.rendered},style:{marginLeft:c?"10px":"0"}})]}),e.jsx(l.Icon,{name:"chevron down"})]})}),e.jsx(l.Accordion.Content,{className:"accordion-post-content",active:n===x,children:e.jsx("div",{ref:m,children:e.jsx(y.default,{post:d,as:l.Container,fluid:!0})})})]},d.id)})})},$=({posts:t,showLabels:a,height:i})=>{const[n,s]=u.useState(t?t[0].slug:null);return u.useEffect(()=>{setTimeout(()=>{if(window.location.hash){const r=window.location.hash.substr(1),o=document.getElementById(r);o&&t.map(m=>m.slug).indexOf(r)>-1&&(s(r),o.scrollIntoView({behavior:"auto",block:"start"}))}},0)},[t]),e.jsxs(u.Fragment,{children:[t.map(r=>e.jsx("anchor",{id:r.slug},r.slug)),e.jsx(l.Menu,{className:"tabbed posts",text:!0,children:e.jsx(A,{showLabels:a,posts:t,setActive:s,activeItem:n})}),e.jsx(l.Container,{className:"content-tab",style:{height:`${i}px`},children:e.jsx(I,{posts:t,activeItem:n})})]})},D=({posts:t,showLabels:a,showIcons:i,height:n})=>{const[s,r]=u.useState(t?t[0].slug:null);return e.jsx(u.Fragment,{children:e.jsxs(l.Grid,{stackable:!0,className:"tabbed posts",columns:t.length,style:{height:n+"px"},children:[e.jsx(k,{showIcons:i,showLabels:a,posts:t,activeItem:s,setActive:r}),e.jsx(l.Grid.Row,{style:{height:`${n}px`},children:e.jsx(l.Grid.Column,{width:16,className:"content",children:e.jsx(l.Container,{className:"content-tab",style:{height:`${n}px`},children:e.jsx(I,{className:"content-tab",posts:t,activeItem:s})})})})]})})},G=t=>{var v;let{"data-type":a,"data-taxonomy":i,"data-categories":n,"data-items":s,"data-theme":r="light","data-show-icons":o,"data-use-scrolls":m,"data-show-labels":g,"data-height":d,"data-preview-mode":x="Desktop",pageModuleProps:c,parent:j,editing:b,unique:C}=t;c!=null&&c.previewMode&&(c!=null&&c.editing)&&(x=c.previewMode,b=c.editing);const p=t.intl.locale,f=m==="true",w=f?d:void 0,{width:M}=L.useWindowDimensionsAndDevice(),_=M<=1024,P=x!=="Desktop"&&b,T=_&&!b;return e.jsx(l.Container,{className:`viz tabbed posts ${b?"editing":""} ${f?"scrollable":""}`,fluid:!0,children:e.jsx(h.PostProvider,{locale:p,type:a,taxonomy:i,categories:q.parse(n,b),store:`tabbedposts_${j}_${C}`,page:1,perPage:s,children:e.jsx(h.PostConsumer,{children:e.jsx(h.PostConsumer,{children:T||P?e.jsx(R,{posts:s,activeItem:(v=s[0])==null?void 0:v.slug,setActive:()=>{}}):r==="light"?e.jsx($,{height:w,showLabels:g==="true"}):e.jsx(D,{height:w,showLabels:g==="true",showIcons:o==="true"})})})})})},E=(t,a)=>{const i=t.getIn(["data","pageModuleProps"]),n={};return i&&(n.pageModuleProps=i),n},H={},B=S.connect(E,H)(N.injectIntl(G));exports.default=B;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("react/jsx-runtime"),u=require("react"),l=require("semantic-ui-react"),h=require("@devgateway/wp-react-lib"),S=require("react-intl"),A=require("react-redux"),y=require("../connected-templates/PostIntro.js"),L=require("../../lib/hooks/window-dimensions.js"),q=({posts:t,activeItem:c,setActive:i,showLabels:n})=>t?t.map(s=>e.jsx(l.Menu.Item,{onClick:()=>i(s.slug),className:s.slug===c?"active":"",children:n?e.jsx(h.PostLabel,{post:s}):e.jsx(l.Label,{children:e.jsx("span",{dangerouslySetInnerHTML:{__html:s.title.rendered}})})},s.id)):null,k=({posts:t,activeItem:c,setActive:i,showIcons:n,showLabels:s})=>{const r=t.length;return t?t.map(o=>{var m,g;return(m=o._embedded)!=null&&m["wp:featuredmedia"]&&o._embedded["wp:featuredmedia"][0].source_url,e.jsx(l.Grid.Column,{className:(o.slug===c?"active":"")+(n?" has-icon":""),children:e.jsxs(l.Button,{onClick:()=>i(o.slug),className:`nav  ${r===1?"one":""}`,children:[n&&e.jsx(h.MediaProvider,{id:(g=o.meta_fields)!=null&&g.icon?o.meta_fields.icon[0]:null,children:e.jsx(h.MediaConsumer,{children:e.jsx(h.PostIcon,{className:"icon"})})}),s?e.jsx(h.PostLabel,{post:o}):e.jsx(l.Label,{children:e.jsx("span",{dangerouslySetInnerHTML:{__html:o.title.rendered}})})]})},o.id)}):null},C=({posts:t,activeItem:c})=>(u.useEffect(()=>{const i=document.querySelector(".ui.container.content-tab");i&&(i.scrollTop=0)},[c]),t?t.map(i=>{let n={};return i.slug!==c?n={position:"absolute",left:"-3000px",width:"auto",height:"0px",overflow:"hidden",visibility:"hidden"}:n={visibility:"visible",position:"relative",width:"auto"},e.jsx(y.default,{as:l.Container,fluid:!0,post:i,style:n},i.slug)}):null),R=({posts:t,activeItem:c,setActive:i})=>{const[n,s]=u.useState(t.findIndex(d=>d.slug===c)),[r,o]=u.useState(null),m=u.useRef(null);u.useEffect(()=>{if(r){const d=r.getBoundingClientRect().top+window.scrollY;window.scrollTo({top:d,behavior:"smooth"})}},[r]);const g=(d,x)=>{const{index:a}=x,j=n===a?-1:a;s(j),i(t[a].slug),j!==-1&&o(d.currentTarget)};return e.jsx(l.Accordion,{fluid:!0,styled:!0,children:t.map((d,x)=>{var j;const a=(j=d.meta_fields)!=null&&j.icon?d.meta_fields.icon[0]:null;return e.jsxs(u.Fragment,{children:[e.jsx(l.Accordion.Title,{active:n===x,index:x,onClick:g,children:e.jsxs("div",{style:{display:"flex",alignItems:"center",justifyContent:"space-between",width:"100%"},children:[e.jsxs("div",{style:{display:"flex",alignItems:"center"},children:[a&&e.jsx(h.MediaProvider,{id:a,children:e.jsx(h.MediaConsumer,{children:e.jsx(h.PostIcon,{className:"icon"})})}),e.jsx("span",{dangerouslySetInnerHTML:{__html:d.title.rendered},style:{marginLeft:a?"10px":"0"}})]}),e.jsx(l.Icon,{name:"chevron down"})]})}),e.jsx(l.Accordion.Content,{className:"accordion-post-content",active:n===x,children:e.jsx("div",{ref:m,children:e.jsx(y.default,{post:d,as:l.Container,fluid:!0})})})]},d.id)})})},$=({posts:t,showLabels:c,height:i})=>{const[n,s]=u.useState(t?t[0].slug:null);return u.useEffect(()=>{setTimeout(()=>{if(window.location.hash){const r=window.location.hash.substr(1),o=document.getElementById(r);o&&t.map(m=>m.slug).indexOf(r)>-1&&(s(r),o.scrollIntoView({behavior:"auto",block:"start"}))}},0)},[t]),e.jsxs(u.Fragment,{children:[t.map(r=>e.jsx("anchor",{id:r.slug},r.slug)),e.jsx(l.Menu,{className:"tabbed posts",text:!0,children:e.jsx(q,{showLabels:c,posts:t,setActive:s,activeItem:n})}),e.jsx(l.Container,{className:"content-tab",style:{height:`${i}px`},children:e.jsx(C,{posts:t,activeItem:n})})]})},D=({posts:t,showLabels:c,showIcons:i,height:n})=>{const[s,r]=u.useState(t?t[0].slug:null);return e.jsx(u.Fragment,{children:e.jsxs(l.Grid,{stackable:!0,className:"tabbed posts",columns:t.length,style:{height:n+"px"},children:[e.jsx(k,{showIcons:i,showLabels:c,posts:t,activeItem:s,setActive:r}),e.jsx(l.Grid.Row,{style:{height:`${n}px`},children:e.jsx(l.Grid.Column,{width:16,className:"content",children:e.jsx(l.Container,{className:"content-tab",style:{height:`${n}px`},children:e.jsx(C,{className:"content-tab",posts:t,activeItem:s})})})})]})})},G=t=>{var v;let{"data-type":c,"data-taxonomy":i,"data-categories":n,"data-items":s,"data-theme":r="light","data-show-icons":o,"data-use-scrolls":m,"data-show-labels":g,"data-height":d,"data-preview-mode":x="Desktop",pageModuleProps:a,parent:j,editing:b,unique:I}=t;a!=null&&a.previewMode&&(a!=null&&a.editing)&&(x=a.previewMode,b=a.editing);const p=t.intl.locale,M=Array.isArray(n)?n.join(","):n,f=m==="true",w=f?d:void 0,{width:_}=L.useWindowDimensionsAndDevice(),P=_<=1024,T=x!=="Desktop"&&b,N=P&&!b;return e.jsx(l.Container,{className:`viz tabbed posts ${b?"editing":""} ${f?"scrollable":""}`,fluid:!0,children:e.jsx(h.PostProvider,{locale:p,type:c,taxonomy:i,categories:M,store:`tabbedposts_${j}_${I}`,page:1,perPage:s,children:e.jsx(h.PostConsumer,{children:e.jsx(h.PostConsumer,{children:N||T?e.jsx(R,{posts:s,activeItem:(v=s[0])==null?void 0:v.slug,setActive:()=>{}}):r==="light"?e.jsx($,{height:w,showLabels:g==="true"}):e.jsx(D,{height:w,showLabels:g==="true",showIcons:o==="true"})})})})})},E=(t,c)=>{const i=t.getIn(["data","pageModuleProps"]),n={};return i&&(n.pageModuleProps=i),n},H={},B=A.connect(E,H)(S.injectIntl(G));exports.default=B;

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

@@ -1,146 +1,147 @@
-import K from "react";
-const ae = (S) => {
-  var P, _;
-  const { data: l, measures: D, customMeasureLabels: h, children: W, source: B, extraDimension: A, allDimensions: C } = S;
-  console.log("MapDataFrame props:", S);
-  const T = (B || "").split("/").filter(Boolean), y = T.length > 0 ? T[0] : null, u = {
+import J from "react";
+const te = (F) => {
+  var j, K;
+  const { data: o, measures: D, customMeasureLabels: y, children: $, source: S, extraDimension: f, allDimensions: C } = F;
+  console.log("MapDataFrame props:", F);
+  const B = (S || "").split("/").filter(Boolean), b = B.length > 0 ? B[0] : null, d = {
     locationsData: [],
     nationalData: {},
     measureLabelMap: {}
   };
-  l.metadata && l.metadata.measures && Array.isArray(l.metadata.measures), l.children && l.children[0] && l.children[0].children;
-  const L = l.metadata || {}, J = ["value", "count", "type", "children", "label", "measure"], O = C && C.length > 0 ? C : L.types || [], b = {};
-  O.forEach((e) => {
+  o.metadata && o.metadata.measures && Array.isArray(o.metadata.measures), o.children && o.children[0] && o.children[0].children;
+  const E = o.metadata || {}, q = ["value", "count", "type", "children", "label", "measure"], T = C && C.length > 0 ? C : E.types || [], V = {};
+  T.forEach((e) => {
     const n = e.category || e.type;
-    n && (b[n] = e.items || []);
+    n && (V[n] = e.items || []);
   });
-  const w = (e, n) => {
-    const a = b[e];
+  const O = (e, n) => {
+    const a = V[e];
     if (!a)
       return null;
     const t = n != null ? String(n) : n;
     return a.find((r) => {
-      const o = r.value != null ? String(r.value) : r.value, c = r.id != null ? String(r.id) : r.id, s = r.code != null ? String(r.code) : r.code;
-      return o === t || c === t || s === t;
+      const l = r.value != null ? String(r.value) : r.value, i = r.id != null ? String(r.id) : r.id, s = r.code != null ? String(r.code) : r.code;
+      return l === t || i === t || s === t;
     }) || null;
-  }, f = (e, n) => {
-    const a = w(e, n);
+  }, p = (e, n) => {
+    const a = O(e, n);
     return a ? a.value ?? a.label ?? a.id ?? a.code ?? n : n;
-  }, $ = (e = {}) => {
+  }, G = (e = {}) => {
     const n = {};
     return Object.keys(e).forEach((a) => {
       const t = e[a];
-      t != null && (Array.isArray(t) ? n[a] = t.map((r) => f(a, r)).join(" ,") : n[a] = f(a, t));
+      t != null && (Array.isArray(t) ? n[a] = t.map((r) => p(a, r)).join(" ,") : n[a] = p(a, t));
     }), n;
-  }, q = (e) => {
-    const n = b[e] || [];
-    return n.length === 1 ? f(e, n[0].value ?? n[0].id ?? n[0].code) : null;
-  }, d = (e) => e != null && e !== "", R = (e) => {
+  }, H = (e) => {
+    const n = V[e] || [];
+    return n.length === 1 ? p(e, n[0].value ?? n[0].id ?? n[0].code) : null;
+  }, c = (e) => e != null && e !== "", w = (e) => {
     if (e)
-      return d(e.value) ? e.value : d(e.id) ? e.id : e.code;
-  }, V = (e) => e == null ? "" : String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, ""), p = (e, n) => {
+      return c(e.value) ? e.value : c(e.id) ? e.id : e.code;
+  }, A = (e) => e == null ? "" : String(e).trim().toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, ""), v = (e, n) => {
     if (!e)
       return;
-    const a = V(n), t = e[n];
+    const a = A(n), t = e[n];
     if (t != null && t !== "")
       return t;
     const r = Object.keys(e);
-    for (let o = 0; o < r.length; o++) {
-      const c = r[o];
-      if (V(c) === a) {
-        const s = e[c];
+    for (let l = 0; l < r.length; l++) {
+      const i = r[l];
+      if (A(i) === a) {
+        const s = e[i];
         if (s != null && s !== "")
           return s;
       }
     }
-  }, G = (e, n) => {
+  }, Q = (e) => Array.isArray(e) ? e.length > 0 ? e[0] : void 0 : e, X = (e, n) => {
     const a = [
-      y,
+      b,
       "country",
       e.type
     ].filter(Boolean), t = [
-      p(n, "country"),
-      p(e, "country"),
-      y ? p(n, y) : void 0,
-      y ? p(e, y) : void 0,
+      v(n, "country"),
+      v(e, "country"),
+      b ? v(n, b) : void 0,
+      b ? v(e, b) : void 0,
       e.label,
       e.value
-    ].filter((r) => d(r));
+    ].filter((r) => c(r));
     for (let r = 0; r < a.length; r++) {
-      const o = a[r], c = b[o] || [];
-      if (c.length)
+      const l = a[r], i = V[l] || [];
+      if (i.length)
         for (let s = 0; s < t.length; s++) {
-          const g = t[s], U = V(g), j = c.findIndex((k) => {
-            const m = R(k);
-            return V(m) === U;
+          const h = t[s], k = A(h), W = i.findIndex((ee) => {
+            const ne = w(ee);
+            return A(ne) === k;
           });
-          if (j >= 0)
-            return j;
+          if (W >= 0)
+            return W;
         }
     }
     return -1;
-  }, H = (e, n, a) => {
-    const t = G(n, a);
+  }, Y = (e, n, a) => {
+    const t = X(n, a);
     if (t < 0)
       return;
-    const r = b[e] || [];
+    const r = V[e] || [];
     if (!r.length || t >= r.length)
       return;
-    const o = R(r[t]);
-    if (d(o))
-      return f(e, o);
-  }, Q = (e, n, a) => {
-    const t = p(a, e);
-    if (d(t))
+    const l = w(r[t]);
+    if (c(l))
+      return p(e, l);
+  }, R = (e, n, a) => {
+    const t = v(a, e);
+    if (c(t))
       return t;
-    if (d(x[e]))
-      return x[e];
-    const r = p(n, e);
-    if (d(r))
+    if (c(L[e]))
+      return L[e];
+    const r = v(n, e);
+    if (c(r))
       return r;
-    const o = H(e, n, a);
-    if (d(o))
-      return o;
-    const c = q(e);
-    if (d(c))
-      return c;
+    const l = Y(e, n, a);
+    if (c(l))
+      return l;
+    const i = H(e);
+    if (c(i))
+      return i;
     const s = n.value;
-    return w(e, s) ? f(e, s) : "";
-  }, E = l.appliedFilters || {};
-  if (A) {
-    const e = E[A] ? E[A][0] : void 0;
-    f(A, e);
+    return O(e, s) ? p(e, s) : "";
+  }, z = o.appliedFilters || {};
+  let N = "";
+  if (f) {
+    const e = v(z, f), n = Q(e);
+    N = p(f, n) || "";
   }
-  const x = $(E), X = (e) => {
+  const L = G(z), Z = (e) => {
     const n = {};
     return Object.keys(e).forEach((a) => {
-      J.includes(a) || (n[a] = e[a]);
-    }), e.type && e.value !== void 0 && (n[e.type] = f(e.type, e.value)), n;
-  }, F = (e) => {
-    let n = X(e);
+      q.includes(a) || (n[a] = e[a]);
+    }), e.type && e.value !== void 0 && (n[e.type] = p(e.type, e.value)), n;
+  }, x = (e) => {
+    let n = Z(e);
     return e.children && Array.isArray(e.children) && e.children.forEach((a) => {
-      n = { ...n, ...F(a) };
+      n = { ...n, ...x(a) };
     }), n;
-  }, z = (e, n) => {
+  }, P = (e, n) => {
     if (!(!e.children || !Array.isArray(e.children)))
       return e.children.map((a) => ({
         ...a,
         label: a.value,
         value: a[n],
-        variables: F(a),
-        children: z(a, n)
+        variables: x(a),
+        children: P(a, n)
       }));
   };
-  L.measures && L.measures.forEach((e) => {
-    h && h[e.value] && h[e.value].hasCustomLabel && h[e.value].customLabel ? u.measureLabelMap[e.value] = h[e.value].customLabel : u.measureLabelMap[e.value] = e.label;
+  E.measures && E.measures.forEach((e) => {
+    y && y[e.value] && y[e.value].hasCustomLabel && y[e.value].customLabel ? d.measureLabelMap[e.value] = y[e.value].customLabel : d.measureLabelMap[e.value] = e.label;
   });
-  const N = (((P = l == null ? void 0 : l.metadata) == null ? void 0 : P.measures) || []).map((e) => e == null ? void 0 : e.value).filter(Boolean), i = (() => {
+  const _ = (((j = o == null ? void 0 : o.metadata) == null ? void 0 : j.measures) || []).map((e) => e == null ? void 0 : e.value).filter(Boolean), u = (() => {
     if (Array.isArray(D))
       return D.map((e) => ("" + e).trim()).filter(Boolean);
     if (typeof D == "string") {
       const e = D.trim();
       if (!e || e === "[]")
-        return N;
+        return _;
       if (e.startsWith("[") && e.endsWith("]"))
         try {
           const n = JSON.parse(e);
@@ -150,62 +151,65 @@ const ae = (S) => {
         }
       return e.split(",").map((n) => n.trim()).filter(Boolean);
     }
-    return N;
-  })(), M = ((_ = l == null ? void 0 : l.metadata) == null ? void 0 : _.types) || [], Y = (B || "").split("/")[0], Z = M.find((e) => e.dimension === Y) || M[0], I = (e, n) => {
-    var o;
+    return _;
+  })(), M = ((K = o == null ? void 0 : o.metadata) == null ? void 0 : K.types) || [], m = (S || "").split("/")[0], I = M.find((e) => e.dimension === m) || M[0], U = (e, n) => {
+    var l;
     if (typeof (e == null ? void 0 : e.value) == "string")
       return e.value;
-    const t = M.find((c) => c.dimension === (e == null ? void 0 : e.type)) || Z, r = (o = t == null ? void 0 : t.items) == null ? void 0 : o[n];
+    const t = M.find((i) => i.dimension === (e == null ? void 0 : e.type)) || I, r = (l = t == null ? void 0 : t.items) == null ? void 0 : l[n];
     return (r == null ? void 0 : r.value) || (r == null ? void 0 : r.code) || (e == null ? void 0 : e.label) || (e == null ? void 0 : e.value);
-  }, v = (e, n) => {
+  }, g = (e, n) => {
     if (e && Object.prototype.hasOwnProperty.call(e, n))
       return e[n];
     if (n === "value")
       return e == null ? void 0 : e.value;
   };
-  if (l && l.children) {
-    l.children.forEach((n, a) => {
-      const t = I(n, a);
-      i.forEach((r) => {
-        const o = {
-          ...F(n),
+  if (o && o.children) {
+    o.children.forEach((n, a) => {
+      const t = U(n, a);
+      u.forEach((r) => {
+        const l = {
+          ...x(n),
           // Dynamic fields for both formats, including nested dimensions
-          ...x
+          ...L
         };
-        O.forEach((s) => {
-          const g = s.category || s.type;
-          g && (o[g] = Q(g, n, o));
-        });
-        const c = {
+        if (T.forEach((s) => {
+          const h = s.category || s.type;
+          h && (l[h] = R(h, n, l));
+        }), f) {
+          const s = R(f, n, l);
+          l[f] = c(s) ? s : N, l.dimension3 = l[f], l.additionalDimension = l[f];
+        }
+        const i = {
           ...n,
           label: t,
-          value: v(n, r),
+          value: g(n, r),
           measure: r,
-          variables: o
+          variables: l
         };
-        c.variables.selectedDataFrameTooltipValue = v(n, r), n.children && (c.children = [], n.children.forEach((s) => {
-          c.children.push({ ...s, label: s.value, value: v(s, r) });
-        })), c.children = z(n, r), u.locationsData.push(c);
+        i.variables.selectedDataFrameTooltipValue = g(n, r), n.children && (i.children = [], n.children.forEach((s) => {
+          i.children.push({ ...s, label: s.value, value: g(s, r) });
+        })), i.children = P(n, r), d.locationsData.push(i);
       });
-    }), u.measures = i.length > 1 ? i : null;
-    const e = i.length > 0 ? i[0] : null;
-    u.nationalData.value = e ? v(l, e) : null;
-  } else if (l && i.length > 0) {
-    const e = typeof l.value == "string" && l.value || l.label || l.type || "total";
-    i.forEach((n) => {
-      const a = v(l, n);
-      a !== void 0 && u.locationsData.push({
+    }), d.measures = u.length > 1 ? u : null;
+    const e = u.length > 0 ? u[0] : null;
+    d.nationalData.value = e ? g(o, e) : null;
+  } else if (o && u.length > 0) {
+    const e = typeof o.value == "string" && o.value || o.label || o.type || "total";
+    u.forEach((n) => {
+      const a = g(o, n);
+      a !== void 0 && d.locationsData.push({
         label: e,
         value: a,
         measure: n
       });
-    }), u.measures = i.length > 1 ? i : null, u.nationalData.value = v(l, i[0]);
+    }), d.measures = u.length > 1 ? u : null, d.nationalData.value = g(o, u[0]);
   }
-  return K.Children.map(W, (e) => K.cloneElement(e, { transformedData: {
-    ...u,
+  return J.Children.map($, (e) => J.cloneElement(e, { transformedData: {
+    ...d,
     types: M
   } }));
 };
 export {
-  ae as default
+  te as default
 };

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

@@ -1,13 +1,13 @@
-import { jsx as i } from "react/jsx-runtime";
-import { useMemo as He, useEffect as Ke } from "react";
-import { connect as qe, useDispatch as Ye, useSelector as $e } from "react-redux";
-import Qe from "../data/DataProvider.js";
-import Xe from "../data/DataConsumer.js";
-import { getCategories as _e } from "../reducers/data.js";
-import ea from "./map.js";
-import aa from "./MapDataFrame.js";
-import ta from "./MapCSVDataFrame.js";
-const oa = [
+import { jsx as c } from "react/jsx-runtime";
+import { useMemo as Qe, useEffect as Xe } from "react";
+import { connect as ea, useDispatch as aa, useSelector as oa } from "react-redux";
+import ta from "../data/DataProvider.js";
+import la from "../data/DataConsumer.js";
+import { getCategories as ra } from "../reducers/data.js";
+import na from "./map.js";
+import sa from "./MapDataFrame.js";
+import ia from "./MapCSVDataFrame.js";
+const da = [
   { label: "KENYA", value: "KEN", center: [35.8166634, 0.1], scale: 2e3 },
   { label: "Nigeria", value: "NGA", center: [7.491302, 9.072264], scale: 2e3 },
   { label: "South Africa", value: "ZAF", center: [24.676997, -28.48322], scale: 2e3 },
@@ -17,222 +17,235 @@ const oa = [
   { label: "Zambia", value: "ZMB", center: [26.459455, -14.668135], scale: 2e3 },
   { 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 }
-], la = (n) => /* @__PURE__ */ i(ra, { ...n }), ra = (n) => {
-  var E;
+], ma = (s) => /* @__PURE__ */ c(ca, { ...s }), ca = (s) => {
+  var V;
   const {
-    unique: u,
-    editing: d,
-    "data-filters": P = "{}",
-    "data-app": o = "csv",
-    "data-csv": k = "",
-    "data-dimension1": O = "",
-    "data-dimension2": W = "",
-    "data-dimension3": p = "",
-    "data-measures": f = "[]",
-    "data-height": V = 600,
-    width: G = 960,
-    "data-data-source-text": j = "",
-    "data-data-source-label": J = "Source",
-    "data-national-average-label": Z = "National Average",
-    "data-legend-title": H = "Legend Title",
-    "data-legend-breaks": K = "[]",
-    "data-zoom-enabled": C = !1,
-    "data-show-legend-labels": y = !1,
-    "data-map-file": q,
-    "data-mapping-field": Y = "zone",
-    "data-map-label-field": $ = "admin",
-    "data-has-multiple-measures": v = "false",
-    topoJSONField: Q = "collection",
-    "data-map-center": X = "NGA",
+    unique: f,
+    editing: u,
+    "data-filters": W = "{}",
+    "data-app": t = "csv",
+    "data-csv": G = "",
+    "data-dimension1": J = "",
+    "data-dimension2": Z = "",
+    "data-dimension3": g = "",
+    "data-extra-tooltip-columns": _ = "[]",
+    "data-measures": h = "[]",
+    "data-height": j = 600,
+    width: H = 960,
+    "data-data-source-text": K = "",
+    "data-data-source-label": $ = "Source",
+    "data-national-average-label": q = "National Average",
+    "data-legend-title": Y = "Legend Title",
+    "data-legend-breaks": Q = "[]",
+    "data-zoom-enabled": y = !1,
+    "data-show-legend-labels": L = !1,
+    "data-map-file": X,
+    "data-mapping-field": ee = "zone",
+    "data-map-label-field": ae = "admin",
+    "data-has-multiple-measures": w = "false",
+    topoJSONField: oe = "collection",
+    "data-map-center": te = "NGA",
     //country
     "data-map-label-show-value": F = "false",
-    "data-show-tooltip": L = "true",
-    "data-measure-selector-label": _ = "",
-    "data-value-format": ee = "",
-    "data-show-overall-value": w = "false",
-    "data-auto-generate-breaks": D = "false",
-    "data-number-of-breaks": ae = 5,
-    "data-scheme": te = "reds",
-    "data-show-no-data-label": S = "false",
-    "data-group": I = "default",
-    "data-map-symbols": oe = "[]",
-    "data-tooltip-theme": le = "map-tooltip-dark",
-    "data-label-font-size": re = 12,
-    "data-label-font-weight": ne = "normal",
-    "data-label-font-color": se = "#595959",
-    "data-legend-font-size": ie = 12,
-    "data-legend-font-weight": de = "normal",
-    "data-custom-tooltips": me = "[]",
-    "data-format-style": g = "decimal",
-    "data-decimals": N = "2",
-    "data-currency": ce = "",
-    "data-tooltip-font-size": ue = 14,
-    "data-show-admin-unit-label": pe = "showAll",
-    "data-map-no-data-color": fe = "#f8f8f8",
-    "data-map-boundary-color": ge = "#000",
-    "data-map-focus-boundary-color": he = "#000",
-    "data-highlighted-location": be = "",
-    "data-tooltip-format": Ce = `{locationName} %({value},2) 
+    "data-show-tooltip": S = "true",
+    "data-measure-selector-label": le = "",
+    "data-value-format": re = "",
+    "data-show-overall-value": D = "false",
+    "data-auto-generate-breaks": I = "false",
+    "data-number-of-breaks": ne = 5,
+    "data-scheme": se = "reds",
+    "data-show-no-data-label": N = "false",
+    "data-group": z = "default",
+    "data-map-symbols": ie = "[]",
+    "data-tooltip-theme": de = "map-tooltip-dark",
+    "data-label-font-size": me = 12,
+    "data-label-font-weight": ce = "normal",
+    "data-label-font-color": ue = "#595959",
+    "data-legend-font-size": pe = 12,
+    "data-legend-font-weight": fe = "normal",
+    "data-custom-tooltips": ge = "[]",
+    "data-format-style": b = "decimal",
+    "data-decimals": T = "2",
+    "data-currency": he = "",
+    "data-tooltip-font-size": be = 14,
+    "data-show-admin-unit-label": Ce = "showAll",
+    "data-map-no-data-color": ve = "#f8f8f8",
+    "data-map-boundary-color": ye = "#000",
+    "data-map-focus-boundary-color": Le = "#000",
+    "data-highlighted-location": we = "",
+    "data-tooltip-format": Fe = `{locationName} %({value},2) 
  {label}: %({value},2)`,
-    "data-show-no-data-tooltip": z = "false",
-    "data-map-container-bg-color": ye = "#fff",
-    "data-map-position": ve = "{}",
-    "data-main-layer-id": Fe = "",
-    "data-enabled-layers": Le,
-    "data-point-label-color": we = "#fff",
-    "data-point-label-format": De = "{locationName} %({value},2)",
-    "data-show-no-data-legend-item": T = !1,
-    "data-highlighted-loc-label-format": Se = "{locationName} - Score: #({value},2)",
-    "data-enable-summary-view": ia = "false",
-    "data-map-type": x = "DEFAULT",
-    "data-default-point-color": Ie = "#FFFF00",
-    "data-aggregation-formula": Ne = "COUNT",
-    "data-zoom-level-to-show-points": ze = 2,
+    "data-show-no-data-tooltip": x = "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": A = !1,
+    "data-highlighted-loc-label-format": xe = "{locationName} - Score: #({value},2)",
+    "data-enable-summary-view": fa = "false",
+    "data-map-type": B = "DEFAULT",
+    "data-default-point-color": Ae = "#FFFF00",
+    "data-aggregation-formula": Be = "COUNT",
+    "data-zoom-level-to-show-points": Ue = 2,
     "data-zoom-on-filter": U = "false",
-    "data-zoom-on-filter-field": Te = "",
-    "data-no-data-text": xe = "No Data",
-    "data-labels-exclusion-list": Ue = "",
-    "data-custom-measure-labels": Ae = "{}",
-    "data-show-shading-layer-labels": Be = "ifUnitHasData",
-    "data-dvz-proxy-dataset-id": r,
-    "data-recently-toggled-layer-id": Re = null,
-    intl: da,
-    settings: ma
-  } = n;
-  console.log("MapWrapper props", n);
-  const Ee = (e) => d ? e : decodeURIComponent(e), l = (e) => {
+    "data-zoom-on-filter-field": Pe = "",
+    "data-no-data-text": Re = "No Data",
+    "data-labels-exclusion-list": Ee = "",
+    "data-custom-measure-labels": Me = "{}",
+    "data-show-shading-layer-labels": Ve = "ifUnitHasData",
+    "data-dvz-proxy-dataset-id": n,
+    "data-recently-toggled-layer-id": ke = null,
+    intl: ga,
+    settings: ha
+  } = s;
+  console.log("MapWrapper props", s);
+  const Oe = (e) => u ? e : decodeURIComponent(e), P = (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 = P(a), r = Object.keys(e).find((k) => P(k) === o);
+    return r ? e[r] : void 0;
+  }, l = (e) => {
     try {
       if (e)
-        return JSON.parse(Ee(e));
+        return JSON.parse(Oe(e));
     } catch {
       console.error("error parsing value:" + e);
     }
     return null;
-  }, Me = (e) => {
-    let t = l(e) || [];
-    return t = t.map((a) => (a.min && (a.min = parseFloat(a.min)), a.max && (a.max = parseFloat(a.max)), a.color = decodeURIComponent(a.color), a)), t;
-  }, Pe = (e) => {
-    const t = l(e) || [];
-    let a = {};
-    return t && t.forEach ? t.forEach((c) => {
-      c.value != null && c.value.filter((M) => M != null && M.toString().trim() != "").length > 0 && (a[c.param] = c.value);
-    }) : a = t, a;
-  }, ke = {
-    style: g === "compacted" ? "decimal" : g,
-    notation: g === "compacted" ? "compact" : "standard",
-    currency: ce,
-    minimumFractionDigits: parseInt(N),
-    maximumFractionDigits: parseInt(N)
+  }, Ge = (e) => {
+    let a = l(e) || [];
+    return a = a.map((o) => (o.min && (o.min = parseFloat(o.min)), o.max && (o.max = parseFloat(o.max)), o.color = decodeURIComponent(o.color), o)), a;
+  }, Je = (e) => {
+    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);
+    }) : o = a, o;
+  }, Ze = {
+    style: b === "compacted" ? "decimal" : b,
+    notation: b === "compacted" ? "compact" : "standard",
+    currency: he,
+    minimumFractionDigits: parseInt(T),
+    maximumFractionDigits: parseInt(T)
   };
-  let h = l(Le) || [];
-  h = h.map((e) => (e.bgColor = decodeURIComponent(e.bgColor), e.fontColor = decodeURIComponent(e.fontColor), e));
-  const A = oa.find((e) => e.value === X), B = v == !0 || v == "true";
-  let s = [O, W].filter((e) => e !== "none" && e !== null).join("/");
-  const Oe = p && p !== "none" ? p : null, m = {
-    unique: u,
-    editing: d,
-    source: `/${q}`,
-    center: A.center,
-    scale: A.scale,
-    measures: f,
-    legendTitle: H,
-    height: V,
-    width: G,
-    topoJSONField: Q,
-    mappingField: Y,
-    dataSourceText: j,
-    dataSourceLabel: J,
-    nationalAverageLabel: Z,
-    legendBreaks: Me(K),
-    mapLabelField: $,
-    zoomEnabled: C == !0 || C == "true",
-    showLegendLabels: y == !0 || y == "true",
-    multipleMeasures: B,
-    app: o,
+  let C = l(Ne) || [];
+  C = C.map((e) => (e.bgColor = decodeURIComponent(e.bgColor), e.fontColor = decodeURIComponent(e.fontColor), e));
+  const R = da.find((e) => e.value === te), E = w == !0 || w == "true";
+  let i = [J, Z].filter((e) => e !== "none" && e !== null).join("/");
+  const d = g && g !== "none" ? g : null, p = {
+    unique: f,
+    editing: u,
+    source: `/${X}`,
+    center: R.center,
+    scale: R.scale,
+    measures: h,
+    legendTitle: Y,
+    height: j,
+    width: H,
+    topoJSONField: oe,
+    mappingField: ee,
+    dataSourceText: K,
+    dataSourceLabel: $,
+    nationalAverageLabel: q,
+    legendBreaks: Ge(Q),
+    mapLabelField: ae,
+    zoomEnabled: y == !0 || y == "true",
+    showLegendLabels: L == !0 || L == "true",
+    multipleMeasures: E,
+    app: t,
     mapLabelShowValue: F == !0 || F == "true",
-    showTooltip: L == !0 || L == "true",
-    showOverallValue: w == !0 || w == "true",
-    measureSelectorLabel: _,
-    valueFormat: ee,
-    autoGenerateBreaks: D == !0 || D == "true",
-    showNoDataLabel: S == !0 || S == "true",
-    numberOfBreaks: ae,
-    colorScheme: te,
-    group: I,
-    symbols: l(oe) || [],
-    tooltipTheme: le,
-    labelFontSize: re,
-    labelFontColor: decodeURIComponent(se),
-    labelFontWeight: ne,
-    legendFontSize: ie,
-    legendFontWeight: de,
-    customTooltips: l(me) || [],
-    format: ke,
-    tooltipFontSize: ue,
-    showAdminUnitLabel: pe,
-    mapNoDataColor: decodeURIComponent(fe),
-    mapBoundaryColor: decodeURIComponent(ge),
-    mapFocusBoundaryColor: decodeURIComponent(he),
-    highlightedLocation: be,
-    tooltipFormat: Ce,
-    showNoDataTooltip: z == !0 || z == "true",
-    fields: s.split("/"),
-    mapContainerBgColor: decodeURIComponent(ye),
-    mapPosition: l(ve),
-    mainLayerId: Fe,
-    enabledLayers: h,
-    pointLabelColor: decodeURIComponent(we),
-    pointLabelFormat: De,
-    showNoDataLegendItem: T == !0 || T == "true",
-    highlightedLocLabelFormat: Se,
-    mapType: x,
-    defaultPointColor: decodeURIComponent(Ie),
-    zoomLevelToShowPoints: ze,
+    showTooltip: S == !0 || S == "true",
+    showOverallValue: D == !0 || D == "true",
+    measureSelectorLabel: le,
+    valueFormat: re,
+    autoGenerateBreaks: I == !0 || I == "true",
+    showNoDataLabel: N == !0 || N == "true",
+    numberOfBreaks: ne,
+    colorScheme: se,
+    group: z,
+    symbols: l(ie) || [],
+    tooltipTheme: de,
+    labelFontSize: me,
+    labelFontColor: decodeURIComponent(ue),
+    labelFontWeight: ce,
+    legendFontSize: pe,
+    legendFontWeight: fe,
+    customTooltips: l(ge) || [],
+    format: Ze,
+    tooltipFontSize: be,
+    showAdminUnitLabel: Ce,
+    mapNoDataColor: decodeURIComponent(ve),
+    mapBoundaryColor: decodeURIComponent(ye),
+    mapFocusBoundaryColor: decodeURIComponent(Le),
+    highlightedLocation: we,
+    tooltipFormat: Fe,
+    showNoDataTooltip: x == !0 || x == "true",
+    fields: i.split("/"),
+    mapContainerBgColor: decodeURIComponent(Se),
+    mapPosition: l(De),
+    mainLayerId: Ie,
+    enabledLayers: C,
+    pointLabelColor: decodeURIComponent(ze),
+    pointLabelFormat: Te,
+    showNoDataLegendItem: A == !0 || A == "true",
+    highlightedLocLabelFormat: xe,
+    mapType: B,
+    defaultPointColor: decodeURIComponent(Ae),
+    zoomLevelToShowPoints: Ue,
     zoomOnFilter: U == !0 || U == "true",
-    zoomOnFilterField: Te,
-    noDataText: xe,
-    labelsExclusionList: Ue.split(",").map((e) => e.trim()),
-    showShadingLayerLabels: Be,
-    dvzProxyDatasetId: r,
-    recentlyToggledLayerId: Re
+    zoomOnFilterField: Pe,
+    noDataText: Re,
+    labelsExclusionList: Ee.split(",").map((e) => e.trim()),
+    showShadingLayerLabels: Ve,
+    dvzProxyDatasetId: n,
+    recentlyToggledLayerId: ke
   };
-  if (m.recentlyToggledLayerId) {
-    const e = m.enabledLayers.find((t) => String(t.id) === String(m.recentlyToggledLayerId));
-    e && (e != null && e.apiField) && (s = (E = e.apiField) == null ? void 0 : E.toLowerCase());
+  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());
   }
-  const We = l(Ae) || {}, Ve = o === "csv" ? ta : aa, Ge = d ? (l(f) || []).join(",") : f, R = Pe(P);
-  r && (R.dvzProxyDatasetId = r);
-  const je = Ye(), Je = ["data", "categories", o, ...r ? [r] : [], "items"], b = $e((e) => e.getIn(Je)), Ze = He(() => b ? b.toJS() : [], [b]);
-  return Ke(() => {
-    o && o !== "csv" && je(_e({ app: o, dvzProxyDatasetId: r }));
-  }, [o, r]), /* @__PURE__ */ i(
-    Qe,
+  const _e = l(Me) || {}, je = t === "csv" ? ia : sa, He = u ? (l(h) || []).join(",") : h, m = Je(W);
+  if (d) {
+    const e = We(m, d);
+    e != null && e !== "" && (m[d] = e);
+  }
+  const Ke = (l(_) || []).filter((e) => e && e !== "none"), M = Array.from(new Set([d, ...Ke].filter(Boolean)));
+  M.length > 0 && (m.includeColumns = M.join(",")), n && (m.dvzProxyDatasetId = n);
+  const $e = aa(), qe = ["data", "categories", t, ...n ? [n] : [], "items"], v = oa((e) => e.getIn(qe)), Ye = Qe(() => v ? v.toJS() : [], [v]);
+  return Xe(() => {
+    t && t !== "csv" && $e(ra({ app: t, dvzProxyDatasetId: n }));
+  }, [t, n]), /* @__PURE__ */ c(
+    ta,
     {
-      params: R,
-      app: o,
-      csv: decodeURIComponent(k),
-      group: I,
-      editing: d,
-      store: [o, u, ...s.split("/")],
-      source: s,
-      children: /* @__PURE__ */ i(Xe, { children: /* @__PURE__ */ i(
-        Ve,
+      params: m,
+      app: t,
+      csv: decodeURIComponent(G),
+      group: z,
+      editing: u,
+      store: [t, f, ...i.split("/")],
+      source: i,
+      children: /* @__PURE__ */ c(la, { children: /* @__PURE__ */ c(
+        je,
         {
-          measures: Ge,
-          multipleMeasures: B,
-          mapType: x,
-          aggregationFormula: Ne,
-          customMeasureLabels: We,
-          source: s,
-          extraDimension: Oe,
-          allDimensions: Ze,
-          children: /* @__PURE__ */ i(ea, { ...m })
+          measures: He,
+          multipleMeasures: E,
+          mapType: B,
+          aggregationFormula: Be,
+          customMeasureLabels: _e,
+          source: i,
+          extraDimension: d,
+          allDimensions: Ye,
+          children: /* @__PURE__ */ c(na, { ...p })
         }
       ) })
     }
   );
-}, na = (n, u) => {
-}, sa = {}, Fa = qe(na, sa)(la);
+}, ua = (s, f) => {
+}, pa = {}, za = ea(ua, pa)(ma);
 export {
-  Fa as default
+  za as default
 };

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

@@ -1,18 +1,17 @@
 import { jsx as e, jsxs as g } from "react/jsx-runtime";
-import y, { useState as v, useRef as G, useEffect as I } from "react";
-import { Container as b, Accordion as p, Icon as V, Menu as T, Grid as w, Label as M, Button as W } from "semantic-ui-react";
-import { PostProvider as q, PostConsumer as N, MediaProvider as P, MediaConsumer as k, PostIcon as L, PostLabel as S } from "@devgateway/wp-react-lib";
+import y, { useState as v, useRef as V, useEffect as I } from "react";
+import { Container as f, Accordion as p, Icon as W, Menu as T, Grid as w, Label as M, Button as q } from "semantic-ui-react";
+import { PostProvider as z, PostConsumer as N, MediaProvider as P, MediaConsumer as A, PostIcon as k, PostLabel as L } from "@devgateway/wp-react-lib";
 import { injectIntl as E } from "react-intl";
-import { connect as z } from "react-redux";
-import A from "../connected-templates/PostIntro.js";
-import { useWindowDimensionsAndDevice as O } from "../../lib/hooks/window-dimensions.js";
-import { parse as U } from "../utils/parseUtils.js";
+import { connect as O } from "react-redux";
+import S from "../connected-templates/PostIntro.js";
+import { useWindowDimensionsAndDevice as U } from "../../lib/hooks/window-dimensions.js";
 const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.map((l) => /* @__PURE__ */ e(
   T.Item,
   {
     onClick: () => i(l.slug),
     className: l.slug === c ? "active" : "",
-    children: n ? /* @__PURE__ */ e(S, { post: l }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e("span", { dangerouslySetInnerHTML: { __html: l.title.rendered } }) })
+    children: n ? /* @__PURE__ */ e(L, { post: l }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e("span", { dangerouslySetInnerHTML: { __html: l.title.rendered } }) })
   },
   l.id
 )) : null, J = ({
@@ -30,7 +29,7 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
       {
         className: (r.slug === c ? "active" : "") + (n ? " has-icon" : ""),
         children: /* @__PURE__ */ g(
-          W,
+          q,
           {
             onClick: () => i(r.slug),
             className: `nav  ${o === 1 ? "one" : ""}`,
@@ -39,10 +38,10 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
                 P,
                 {
                   id: (m = r.meta_fields) != null && m.icon ? r.meta_fields.icon[0] : null,
-                  children: /* @__PURE__ */ e(k, { children: /* @__PURE__ */ e(L, { className: "icon" }) })
+                  children: /* @__PURE__ */ e(A, { children: /* @__PURE__ */ e(k, { className: "icon" }) })
                 }
               ),
-              l ? /* @__PURE__ */ e(S, { post: r }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e(
+              l ? /* @__PURE__ */ e(L, { post: r }) : /* @__PURE__ */ e(M, { children: /* @__PURE__ */ e(
                 "span",
                 {
                   dangerouslySetInnerHTML: { __html: r.title.rendered }
@@ -71,11 +70,11 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
     visibility: "visible",
     position: "relative",
     width: "auto"
-  }, /* @__PURE__ */ e(A, { as: b, fluid: !0, post: i, style: n }, i.slug);
+  }, /* @__PURE__ */ e(S, { as: f, fluid: !0, post: i, style: n }, i.slug);
 }) : null), K = ({ posts: t, activeItem: c, setActive: i }) => {
   const [n, l] = v(
     t.findIndex((s) => s.slug === c)
-  ), [o, r] = v(null), d = G(null);
+  ), [o, r] = v(null), d = V(null);
   I(() => {
     if (o) {
       const s = o.getBoundingClientRect().top + window.scrollY;
@@ -110,7 +109,7 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
               },
               children: [
                 /* @__PURE__ */ g("div", { style: { display: "flex", alignItems: "center" }, children: [
-                  a && /* @__PURE__ */ e(P, { id: a, children: /* @__PURE__ */ e(k, { children: /* @__PURE__ */ e(L, { className: "icon" }) }) }),
+                  a && /* @__PURE__ */ e(P, { id: a, children: /* @__PURE__ */ e(A, { children: /* @__PURE__ */ e(k, { className: "icon" }) }) }),
                   /* @__PURE__ */ e(
                     "span",
                     {
@@ -119,7 +118,7 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
                     }
                   )
                 ] }),
-                /* @__PURE__ */ e(V, { name: "chevron down" })
+                /* @__PURE__ */ e(W, { name: "chevron down" })
               ]
             }
           )
@@ -130,7 +129,7 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
         {
           className: "accordion-post-content",
           active: n === u,
-          children: /* @__PURE__ */ e("div", { ref: d, children: /* @__PURE__ */ e(A, { post: s, as: b, fluid: !0 }) })
+          children: /* @__PURE__ */ e("div", { ref: d, children: /* @__PURE__ */ e(S, { post: s, as: f, fluid: !0 }) })
         }
       )
     ] }, s.id);
@@ -147,13 +146,13 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
   }, [t]), /* @__PURE__ */ g(y.Fragment, { children: [
     t.map((o) => /* @__PURE__ */ e("anchor", { id: o.slug }, o.slug)),
     /* @__PURE__ */ e(T, { className: "tabbed posts", text: !0, children: /* @__PURE__ */ e(Y, { showLabels: c, posts: t, setActive: l, activeItem: n }) }),
-    /* @__PURE__ */ e(b, { className: "content-tab", style: { height: `${i}px` }, children: /* @__PURE__ */ e($, { posts: t, activeItem: n }) })
+    /* @__PURE__ */ e(f, { className: "content-tab", style: { height: `${i}px` }, children: /* @__PURE__ */ e($, { posts: t, activeItem: n }) })
   ] });
 }, X = ({ posts: t, showLabels: c, showIcons: i, height: n }) => {
   const [l, o] = v(t ? t[0].slug : null);
   return /* @__PURE__ */ e(y.Fragment, { children: /* @__PURE__ */ g(w, { stackable: !0, className: "tabbed posts", columns: t.length, style: { height: n + "px" }, children: [
     /* @__PURE__ */ e(J, { showIcons: i, showLabels: c, posts: t, activeItem: l, setActive: o }),
-    /* @__PURE__ */ e(w.Row, { style: { height: `${n}px` }, children: /* @__PURE__ */ e(w.Column, { width: 16, className: "content", children: /* @__PURE__ */ e(b, { className: "content-tab", style: { height: `${n}px` }, children: /* @__PURE__ */ e($, { className: "content-tab", posts: t, activeItem: l }) }) }) })
+    /* @__PURE__ */ e(w.Row, { style: { height: `${n}px` }, children: /* @__PURE__ */ e(w.Column, { width: 16, className: "content", children: /* @__PURE__ */ e(f, { className: "content-tab", style: { height: `${n}px` }, children: /* @__PURE__ */ e($, { className: "content-tab", posts: t, activeItem: l }) }) }) })
   ] }) });
 }, Z = (t) => {
   var _;
@@ -170,22 +169,22 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
     "data-preview-mode": u = "Desktop",
     pageModuleProps: a,
     parent: h,
-    editing: f,
-    unique: D
+    editing: b,
+    unique: j
   } = t;
-  a != null && a.previewMode && (a != null && a.editing) && (u = a.previewMode, f = a.editing);
-  const R = t.intl.locale, x = d === "true", C = x ? s : void 0, { width: j } = O(), H = j <= 1024, B = u !== "Desktop" && f, F = H && !f;
-  return /* @__PURE__ */ e(b, { className: `viz tabbed posts ${f ? "editing" : ""} ${x ? "scrollable" : ""}`, fluid: !0, children: /* @__PURE__ */ e(
-    q,
+  a != null && a.previewMode && (a != null && a.editing) && (u = a.previewMode, b = a.editing);
+  const D = t.intl.locale, R = Array.isArray(n) ? n.join(",") : n, x = d === "true", C = x ? s : void 0, { width: H } = U(), B = H <= 1024, F = u !== "Desktop" && b, G = B && !b;
+  return /* @__PURE__ */ e(f, { className: `viz tabbed posts ${b ? "editing" : ""} ${x ? "scrollable" : ""}`, fluid: !0, children: /* @__PURE__ */ e(
+    z,
     {
-      locale: R,
+      locale: D,
       type: c,
       taxonomy: i,
-      categories: U(n, f),
-      store: `tabbedposts_${h}_${D}`,
+      categories: R,
+      store: `tabbedposts_${h}_${j}`,
       page: 1,
       perPage: l,
-      children: /* @__PURE__ */ e(N, { children: /* @__PURE__ */ e(N, { children: F || B ? /* @__PURE__ */ e(K, { posts: l, activeItem: (_ = l[0]) == null ? void 0 : _.slug, setActive: () => {
+      children: /* @__PURE__ */ e(N, { children: /* @__PURE__ */ e(N, { children: G || F ? /* @__PURE__ */ e(K, { posts: l, activeItem: (_ = l[0]) == null ? void 0 : _.slug, setActive: () => {
       } }) : o === "light" ? /* @__PURE__ */ e(Q, { height: C, showLabels: m === "true" }) : /* @__PURE__ */ e(
         X,
         {
@@ -202,7 +201,7 @@ const Y = ({ posts: t, activeItem: c, setActive: i, showLabels: n }) => t ? t.ma
     "pageModuleProps"
   ]), n = {};
   return i && (n.pageModuleProps = i), n;
-}, te = {}, ue = z(ee, te)(E(Z));
+}, te = {}, de = O(ee, te)(E(Z));
 export {
-  ue as default
+  de as default
 };

package/package.json

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