@esri/solutions-components 0.4.4 → 0.4.5

package/dist/components/downloadUtils.js

@@ -2122,6 +2122,7 @@ function _downloadPDFFile(labels, labelPageDescription, fileTitle) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const lineSeparatorChar = "|";
 //#endregion
 //#region Public functions
 /**
@@ -2154,7 +2155,12 @@ async function downloadCSV(selectionSetNames, layer, ids, formatUsingLayerPopup,
  */
 async function downloadPDF(selectionSetNames, layer, ids, removeDuplicates, labelPageDescription) {
   console.log("downloadPDF using selectionSetNames " + JSON.stringify(selectionSetNames)); //???
-  const labels = await _prepareLabels(layer, ids, removeDuplicates);
+  let labels = await _prepareLabels(layer, ids, removeDuplicates);
+  labels =
+    // Remove empty lines in labels
+    labels.map(labelLines => labelLines.filter(line => line.length > 0))
+      // Remove empty labels
+      .filter(label => label.length > 0);
   exportPDF(labels, labelPageDescription);
   return Promise.resolve();
 }
@@ -2165,7 +2171,7 @@ async function downloadPDF(selectionSetNames, layer, ids, removeDuplicates, labe
  *
  * @param fieldInfos Layer's fieldInfos structure
  * @param bypassFieldVisiblity Indicates if the configured fieldInfo visibility property should be ignored
- * @return Label spec
+ * @return Label spec with lines separated by `lineSeparatorChar`
  */
 function _convertPopupFieldsToLabelSpec(fieldInfos, bypassFieldVisiblity = false) {
   const labelSpec = [];
@@ -2175,7 +2181,7 @@ function _convertPopupFieldsToLabelSpec(fieldInfos, bypassFieldVisiblity = false
       labelSpec.push(`{${fieldInfo.fieldName}}`);
     }
   });
-  return labelSpec;
+  return labelSpec.join(lineSeparatorChar);
 }
 /**
  * Converts the text of a custom popup into a multiline label specification; conversion splits text into
@@ -2183,22 +2189,19 @@ function _convertPopupFieldsToLabelSpec(fieldInfos, bypassFieldVisiblity = false
  *
  * @param popupInfo Layer's popupInfo structure containing description, fieldInfos, and expressionInfos, e.g.,
  * "<div style='text-align: left;'>{NAME}<br />{STREET}<br />{CITY}, {STATE} {ZIP} <br /></div>"
- * @return Label spec
+ * @return Label spec with lines separated by `lineSeparatorChar`
  */
 function _convertPopupTextToLabelSpec(popupInfo) {
-  // Replace <br>, <br/> with |
-  popupInfo = popupInfo.replace(/<br\s*\/?>/gi, "|");
-  // Remove remaining HTML tags, replace 0xA0 that popup uses for spaces, replace some char representations,
+  // Replace <br>, <br/> with the line separator character
+  popupInfo = popupInfo.replace(/<br\s*\/?>/gi, lineSeparatorChar);
+  // Remove remaining HTML tags, replace 0xA0 that popup uses for spaces, and replace some char representations,
   // and split the label back into individual lines
-  let labelSpec = popupInfo
+  const labelSpec = popupInfo
     .replace(/<[\s.]*[^<>]*\/?>/gi, "")
     .replace(/\xA0/gi, " ")
     .replace(/&lt;/gi, "<")
     .replace(/&gt;/gi, ">")
-    .replace(/&nbsp;/gi, " ")
-    .split("|");
-  // Trim lines and remove empties
-  labelSpec = labelSpec.map(line => line.trim()).filter(line => line.length > 0);
+    .replace(/&nbsp;/gi, " ");
   return labelSpec;
 }
 /**
@@ -2217,7 +2220,7 @@ async function _createArcadeExecutors(labelFormat, layer) {
   }
   // Are there any Arcade expressions in the label format?
   const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
-  const arcadeExpressionsMatches = labelFormat.join("|").match(arcadeExpressionRegExp);
+  const arcadeExpressionsMatches = labelFormat.match(arcadeExpressionRegExp);
   if (!arcadeExpressionsMatches) {
     return Promise.resolve(arcadeExecutors);
   }
@@ -2244,6 +2247,39 @@ async function _createArcadeExecutors(labelFormat, layer) {
     return arcadeExecutors;
   });
 }
+/**
+ * Prepares an attribute's value by applying domain and type information.
+ *
+ * @param attributeValue Value of attribute
+ * @param attributeType Type of attribute
+ * @param attributeDomain Domain info for attribute, if any
+ * @return Attribute value modified appropriate to domain and type
+ */
+function _prepareAttributeValue(attributeValue, attributeType, attributeDomain, intl) {
+  if (attributeDomain && attributeDomain.type === "coded-value") {
+    // "coded-value" domain field
+    const value = attributeDomain.getName(attributeValue);
+    return value;
+  }
+  else {
+    // Non-domain field or unsupported domain type
+    let value = attributeValue;
+    switch (attributeType) {
+      case "date":
+        // Format date produces odd characters for the space between the time and the AM/PM text,
+        // e.g., "12/31/1969, 4:00 PM"
+        value = intl.formatDate(value).replace(/\xe2\x80\xaf/g, "");
+        break;
+      case "double":
+      case "integer":
+      case "long":
+      case "small-integer":
+        value = intl.formatNumber(value);
+        break;
+    }
+    return value;
+  }
+}
 /**
  * Creates labels from items.
  *
@@ -2260,6 +2296,13 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   const [intl] = await loadModules(["esri/intl"]);
   // Get the features to export
   const featureSet = await queryFeaturesByID(ids, layer);
+  // Get field data types. Do we have any domain-based fields?
+  const attributeTypes = {};
+  const attributeDomains = {};
+  layer.fields.forEach(field => {
+    attributeTypes[field.name] = field.type;
+    attributeDomains[field.name] = field.domain;
+  });
   // Get the label formatting, if any
   let labelFormat;
   let arcadeExecutors = {};
@@ -2273,7 +2316,7 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
         // Can we use the popup title?
         // eslint-disable-next-line unicorn/prefer-ternary
         if (typeof layer.popupTemplate.title === "string") {
-          labelFormat = [layer.popupTemplate.title];
+          labelFormat = layer.popupTemplate.title;
           // Otherwise revert to using attributes
         }
         else {
@@ -2292,35 +2335,43 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   // eslint-disable-next-line unicorn/prefer-ternary
   if (labelFormat) {
     const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
-    // Convert attributes into an array of labels
+    const attributeRegExp = /\{\w+\}/g;
+    // Find the label fields that we need to replace with values
+    const arcadeExpressionMatches = labelFormat.match(arcadeExpressionRegExp);
+    const attributeMatches = labelFormat.match(attributeRegExp);
+    // Convert feature attributes into an array of labels
     labels = featureSet.features.map(feature => {
-      const label = [];
-      labelFormat.forEach(labelLineTemplate => {
-        let labelLine = labelLineTemplate;
-        // Replace Arcade expressions
-        const arcadeExpressionsMatches = labelLine.match(arcadeExpressionRegExp);
-        if (arcadeExpressionsMatches) {
-          arcadeExpressionsMatches.forEach((match) => {
-            const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
-            const replacement = arcadeExecutors[expressionName].execute({ "$feature": feature });
-            labelLine = labelLine.replace(match, replacement);
-          });
-        }
-        // Replace fields; must be done after Arcade check because `substitute` will discard Arcade expressions!
-        labelLine = intl.substitute(labelLine, feature.attributes).trim();
-        if (labelLine.length > 0) {
-          label.push(labelLine);
-        }
-      });
+      let labelPrep = labelFormat;
+      // Replace Arcade expressions
+      if (arcadeExpressionMatches) {
+        arcadeExpressionMatches.forEach((match) => {
+          const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
+          const value = arcadeExecutors[expressionName].execute({ "$feature": feature });
+          labelPrep = labelPrep.replace(match, value);
+        });
+      }
+      // Replace non-Arcade fields
+      if (attributeMatches) {
+        attributeMatches.forEach((match) => {
+          const attributeName = match.substring(1, match.length - 1);
+          const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], intl);
+          labelPrep = labelPrep.replace(match, value);
+        });
+      }
+      // Split label into lines
+      let label = labelPrep.split(lineSeparatorChar);
+      // Trim lines
+      label = label.map(line => line.trim());
       return label;
-    })
-      // Remove empty labels
-      .filter(label => label.length > 0);
+    });
   }
   else {
     // Export all attributes
     labels = featureSet.features.map(feature => {
-      return Object.values(feature.attributes).map(attribute => `${attribute}`);
+      return Object.keys(feature.attributes).map((attributeName) => {
+        const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], intl);
+        return `${value}`;
+      });
     });
   }
   // Remove duplicates
@@ -2333,14 +2384,12 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   if (includeHeaderNames) {
     let headerNames = [];
     if (labelFormat) {
-      headerNames = labelFormat.map(labelFormatLine => labelFormatLine.replace(/\{/g, "").replace(/\}/g, ""));
+      headerNames = labelFormat.replace(/\{/g, "").replace(/\}/g, "").split(lineSeparatorChar);
     }
     else {
       const featuresAttrs = featureSet.features[0].attributes;
       Object.keys(featuresAttrs).forEach(k => {
-        if (featuresAttrs[0].hasOwnProperty(k)) {
-          headerNames.push(k);
-        }
+        headerNames.push(k);
       });
     }
     labels.unshift(headerNames);

package/dist/components/map-select-tools2.js

@@ -91,11 +91,6 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * @returns Promise when complete
    */
   async watchSearchConfigurationHandler(newValue, oldValue) {
-    console.log("watchSearchConfigurationHandler");
-    console.log("newValue");
-    console.log(newValue);
-    console.log("oldValue");
-    console.log(oldValue);
     if (JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
       this._initSearchWidget();
     }
@@ -162,7 +157,6 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * Handle changes to the search configuration
    */
   searchConfigurationChangeChanged(event) {
-    console.log("searchConfigurationChange listener");
     this.searchConfiguration = event.detail;
   }
   /**
@@ -295,16 +289,8 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
    * @protected
    */
   _initSearchWidget() {
-    console.log("_initSearchWidget");
-    console.log("this.mapView");
-    console.log(this.mapView);
-    console.log("this._searchElement");
-    console.log(this._searchElement);
     if (this.mapView && this._searchElement) {
-      console.log("this._getSearchConfig");
       const searchConfiguration = this._getSearchConfig(this.searchConfiguration, this.mapView);
-      console.log("searchConfiguration");
-      console.log(searchConfiguration);
       const searchOptions = Object.assign({ view: this.mapView, container: this._searchElement, searchTerm: this._searchTerm }, searchConfiguration);
       this._searchWidget = new this.Search(searchOptions);
       this._searchWidget.popupEnabled = false;
@@ -344,11 +330,9 @@ const MapSelectTools = /*@__PURE__*/ proxyCustomElement(class extends HTMLElemen
             ? view.map.findLayerById(layerSource.layer.id)
             : null;
           if (layerFromMap) {
-            console.log("layerFromMap");
             layerSource.layer = layerFromMap;
           }
           else if ((_b = layerSource === null || layerSource === void 0 ? void 0 : layerSource.layer) === null || _b === void 0 ? void 0 : _b.url) {
-            console.log("create new");
             layerSource.layer = new this.FeatureLayer((_c = layerSource === null || layerSource === void 0 ? void 0 : layerSource.layer) === null || _c === void 0 ? void 0 : _c.url);
           }
         }

package/dist/components/public-notification.js

@@ -100,17 +100,9 @@ const PublicNotification$1 = /*@__PURE__*/ proxyCustomElement(class extends HTML
    * @returns Promise when complete
    */
   async watchSearchConfigurationHandler(newValue, oldValue) {
-    //TODO adding this here to see if its any different than having in map-select-tools
-    // I would have thought that the prop would have made it through on the next render of map-select-tools
-    // however we are still seeing a broken search...need to understand why and don't see a clean way to debug in devext
-    console.log("PN watchSearchConfigurationHandler");
-    console.log("PN newValue");
-    console.log(newValue);
-    console.log("PN oldValue");
-    console.log(oldValue);
-    if (JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
-      console.log("Emit event from parent");
-      this._searchConfiguration = Object.assign({}, newValue);
+    const s_newValue = JSON.stringify(newValue);
+    if (s_newValue !== JSON.stringify(oldValue)) {
+      this._searchConfiguration = JSON.parse(s_newValue);
       this.searchConfigurationChange.emit(this._searchConfiguration);
     }
   }

package/dist/esm/calcite-input-message_5.entry.js

@@ -12,7 +12,7 @@ import { g as goToSelection, h as highlightFeatures, d as queryObjectIds, e as g
 import { E as EWorkflowType, f as ESelectionMode, g as ERefineMode, c as ESketchType } from './interfaces-d0d83efa.js';
 import { s as state } from './publicNotificationStore-b9daaee4.js';
 import { g as getLocaleComponentStrings } from './locale-7bf10e0a.js';
-import { d as downloadCSV, a as downloadPDF } from './downloadUtils-8d64719e.js';
+import { d as downloadCSV, a as downloadPDF } from './downloadUtils-a9b39194.js';
 import { a as getSelectionIds, g as getTotal } from './publicNotificationUtils-5cb5a607.js';
 import './resources-436ae282.js';
 import './guid-15fce7c0.js';
@@ -292,11 +292,6 @@ const MapSelectTools = class {
    * @returns Promise when complete
    */
   async watchSearchConfigurationHandler(newValue, oldValue) {
-    console.log("watchSearchConfigurationHandler");
-    console.log("newValue");
-    console.log(newValue);
-    console.log("oldValue");
-    console.log(oldValue);
     if (JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
       this._initSearchWidget();
     }
@@ -363,7 +358,6 @@ const MapSelectTools = class {
    * Handle changes to the search configuration
    */
   searchConfigurationChangeChanged(event) {
-    console.log("searchConfigurationChange listener");
     this.searchConfiguration = event.detail;
   }
   /**
@@ -496,16 +490,8 @@ const MapSelectTools = class {
    * @protected
    */
   _initSearchWidget() {
-    console.log("_initSearchWidget");
-    console.log("this.mapView");
-    console.log(this.mapView);
-    console.log("this._searchElement");
-    console.log(this._searchElement);
     if (this.mapView && this._searchElement) {
-      console.log("this._getSearchConfig");
       const searchConfiguration = this._getSearchConfig(this.searchConfiguration, this.mapView);
-      console.log("searchConfiguration");
-      console.log(searchConfiguration);
       const searchOptions = Object.assign({ view: this.mapView, container: this._searchElement, searchTerm: this._searchTerm }, searchConfiguration);
       this._searchWidget = new this.Search(searchOptions);
       this._searchWidget.popupEnabled = false;
@@ -545,11 +531,9 @@ const MapSelectTools = class {
             ? view.map.findLayerById(layerSource.layer.id)
             : null;
           if (layerFromMap) {
-            console.log("layerFromMap");
             layerSource.layer = layerFromMap;
           }
           else if ((_b = layerSource === null || layerSource === void 0 ? void 0 : layerSource.layer) === null || _b === void 0 ? void 0 : _b.url) {
-            console.log("create new");
             layerSource.layer = new this.FeatureLayer((_c = layerSource === null || layerSource === void 0 ? void 0 : layerSource.layer) === null || _c === void 0 ? void 0 : _c.url);
           }
         }

package/dist/esm/{downloadUtils-8d64719e.js → downloadUtils-a9b39194.js}

@@ -1080,7 +1080,7 @@ function(t){var e=function(t){for(var e=t.length,r=new Uint8Array(e),n=0;n<e;n++
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  * ====================================================================
  */
-function(t){function e(){return (n.canvg?Promise.resolve(n.canvg):import('./index.es-1d777745.js')).catch((function(t){return Promise.reject(new Error("Could not load canvg: "+t))})).then((function(t){return t.default?t.default:t}))}E.API.addSvgAsImage=function(t,r,n,i,o,s,c,u){if(isNaN(r)||isNaN(n))throw a.error("jsPDF.addSvgAsImage: Invalid coordinates",arguments),new Error("Invalid coordinates passed to jsPDF.addSvgAsImage");if(isNaN(i)||isNaN(o))throw a.error("jsPDF.addSvgAsImage: Invalid measurements",arguments),new Error("Invalid measurements (width and/or height) passed to jsPDF.addSvgAsImage");var h=document.createElement("canvas");h.width=i,h.height=o;var l=h.getContext("2d");l.fillStyle="#fff",l.fillRect(0,0,h.width,h.height);var f={ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0},d=this;return e().then((function(e){return e.fromString(l,t,f)}),(function(){return Promise.reject(new Error("Could not load canvg."))})).then((function(t){return t.render(f)})).then((function(){d.addImage(h.toDataURL("image/jpeg",1),r,n,i,o,c,u);}))};}(),E.API.putTotalPages=function(t){var e,r=0;parseInt(this.internal.getFont().id.substr(1),10)<15?(e=new RegExp(t,"g"),r=this.internal.getNumberOfPages()):(e=new RegExp(this.pdfEscape16(t,this.internal.getFont()),"g"),r=this.pdfEscape16(this.internal.getNumberOfPages()+"",this.internal.getFont()));for(var n=1;n<=this.internal.getNumberOfPages();n++)for(var i=0;i<this.internal.pages[n].length;i++)this.internal.pages[n][i]=this.internal.pages[n][i].replace(e,r);return this},E.API.viewerPreferences=function(e,r){var n;e=e||{},r=r||!1;var i,a,o,s={HideToolbar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideMenubar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideWindowUI:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},FitWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},CenterWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},DisplayDocTitle:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.4},NonFullScreenPageMode:{defaultValue:"UseNone",value:"UseNone",type:"name",explicitSet:!1,valueSet:["UseNone","UseOutlines","UseThumbs","UseOC"],pdfVersion:1.3},Direction:{defaultValue:"L2R",value:"L2R",type:"name",explicitSet:!1,valueSet:["L2R","R2L"],pdfVersion:1.3},ViewArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},ViewClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintScaling:{defaultValue:"AppDefault",value:"AppDefault",type:"name",explicitSet:!1,valueSet:["AppDefault","None"],pdfVersion:1.6},Duplex:{defaultValue:"",value:"none",type:"name",explicitSet:!1,valueSet:["Simplex","DuplexFlipShortEdge","DuplexFlipLongEdge","none"],pdfVersion:1.7},PickTrayByPDFSize:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.7},PrintPageRange:{defaultValue:"",value:"",type:"array",explicitSet:!1,valueSet:null,pdfVersion:1.7},NumCopies:{defaultValue:1,value:1,type:"integer",explicitSet:!1,valueSet:null,pdfVersion:1.7}},c=Object.keys(s),u=[],h=0,l=0,f=0;function d(t,e){var r,n=!1;for(r=0;r<t.length;r+=1)t[r]===e&&(n=!0);return n}if(void 0===this.internal.viewerpreferences&&(this.internal.viewerpreferences={},this.internal.viewerpreferences.configuration=JSON.parse(JSON.stringify(s)),this.internal.viewerpreferences.isSubscribed=!1),n=this.internal.viewerpreferences.configuration,"reset"===e||!0===r){var p=c.length;for(f=0;f<p;f+=1)n[c[f]].value=n[c[f]].defaultValue,n[c[f]].explicitSet=!1;}if("object"===t(e))for(a in e)if(o=e[a],d(c,a)&&void 0!==o){if("boolean"===n[a].type&&"boolean"==typeof o)n[a].value=o;else if("name"===n[a].type&&d(n[a].valueSet,o))n[a].value=o;else if("integer"===n[a].type&&Number.isInteger(o))n[a].value=o;else if("array"===n[a].type){for(h=0;h<o.length;h+=1)if(i=!0,1===o[h].length&&"number"==typeof o[h][0])u.push(String(o[h]-1));else if(o[h].length>1){for(l=0;l<o[h].length;l+=1)"number"!=typeof o[h][l]&&(i=!1);!0===i&&u.push([o[h][0]-1,o[h][1]-1].join(" "));}n[a].value="["+u.join(" ")+"]";}else n[a].value=n[a].defaultValue;n[a].explicitSet=!0;}return !1===this.internal.viewerpreferences.isSubscribed&&(this.internal.events.subscribe("putCatalog",(function(){var t,e=[];for(t in n)!0===n[t].explicitSet&&("name"===n[t].type?e.push("/"+t+" /"+n[t].value):e.push("/"+t+" "+n[t].value));0!==e.length&&this.internal.write("/ViewerPreferences\n<<\n"+e.join("\n")+"\n>>");})),this.internal.viewerpreferences.isSubscribed=!0),this.internal.viewerpreferences.configuration=n,this},
+function(t){function e(){return (n.canvg?Promise.resolve(n.canvg):import('./index.es-4904465f.js')).catch((function(t){return Promise.reject(new Error("Could not load canvg: "+t))})).then((function(t){return t.default?t.default:t}))}E.API.addSvgAsImage=function(t,r,n,i,o,s,c,u){if(isNaN(r)||isNaN(n))throw a.error("jsPDF.addSvgAsImage: Invalid coordinates",arguments),new Error("Invalid coordinates passed to jsPDF.addSvgAsImage");if(isNaN(i)||isNaN(o))throw a.error("jsPDF.addSvgAsImage: Invalid measurements",arguments),new Error("Invalid measurements (width and/or height) passed to jsPDF.addSvgAsImage");var h=document.createElement("canvas");h.width=i,h.height=o;var l=h.getContext("2d");l.fillStyle="#fff",l.fillRect(0,0,h.width,h.height);var f={ignoreMouse:!0,ignoreAnimation:!0,ignoreDimensions:!0},d=this;return e().then((function(e){return e.fromString(l,t,f)}),(function(){return Promise.reject(new Error("Could not load canvg."))})).then((function(t){return t.render(f)})).then((function(){d.addImage(h.toDataURL("image/jpeg",1),r,n,i,o,c,u);}))};}(),E.API.putTotalPages=function(t){var e,r=0;parseInt(this.internal.getFont().id.substr(1),10)<15?(e=new RegExp(t,"g"),r=this.internal.getNumberOfPages()):(e=new RegExp(this.pdfEscape16(t,this.internal.getFont()),"g"),r=this.pdfEscape16(this.internal.getNumberOfPages()+"",this.internal.getFont()));for(var n=1;n<=this.internal.getNumberOfPages();n++)for(var i=0;i<this.internal.pages[n].length;i++)this.internal.pages[n][i]=this.internal.pages[n][i].replace(e,r);return this},E.API.viewerPreferences=function(e,r){var n;e=e||{},r=r||!1;var i,a,o,s={HideToolbar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideMenubar:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},HideWindowUI:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},FitWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},CenterWindow:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.3},DisplayDocTitle:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.4},NonFullScreenPageMode:{defaultValue:"UseNone",value:"UseNone",type:"name",explicitSet:!1,valueSet:["UseNone","UseOutlines","UseThumbs","UseOC"],pdfVersion:1.3},Direction:{defaultValue:"L2R",value:"L2R",type:"name",explicitSet:!1,valueSet:["L2R","R2L"],pdfVersion:1.3},ViewArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},ViewClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintArea:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintClip:{defaultValue:"CropBox",value:"CropBox",type:"name",explicitSet:!1,valueSet:["MediaBox","CropBox","TrimBox","BleedBox","ArtBox"],pdfVersion:1.4},PrintScaling:{defaultValue:"AppDefault",value:"AppDefault",type:"name",explicitSet:!1,valueSet:["AppDefault","None"],pdfVersion:1.6},Duplex:{defaultValue:"",value:"none",type:"name",explicitSet:!1,valueSet:["Simplex","DuplexFlipShortEdge","DuplexFlipLongEdge","none"],pdfVersion:1.7},PickTrayByPDFSize:{defaultValue:!1,value:!1,type:"boolean",explicitSet:!1,valueSet:[!0,!1],pdfVersion:1.7},PrintPageRange:{defaultValue:"",value:"",type:"array",explicitSet:!1,valueSet:null,pdfVersion:1.7},NumCopies:{defaultValue:1,value:1,type:"integer",explicitSet:!1,valueSet:null,pdfVersion:1.7}},c=Object.keys(s),u=[],h=0,l=0,f=0;function d(t,e){var r,n=!1;for(r=0;r<t.length;r+=1)t[r]===e&&(n=!0);return n}if(void 0===this.internal.viewerpreferences&&(this.internal.viewerpreferences={},this.internal.viewerpreferences.configuration=JSON.parse(JSON.stringify(s)),this.internal.viewerpreferences.isSubscribed=!1),n=this.internal.viewerpreferences.configuration,"reset"===e||!0===r){var p=c.length;for(f=0;f<p;f+=1)n[c[f]].value=n[c[f]].defaultValue,n[c[f]].explicitSet=!1;}if("object"===t(e))for(a in e)if(o=e[a],d(c,a)&&void 0!==o){if("boolean"===n[a].type&&"boolean"==typeof o)n[a].value=o;else if("name"===n[a].type&&d(n[a].valueSet,o))n[a].value=o;else if("integer"===n[a].type&&Number.isInteger(o))n[a].value=o;else if("array"===n[a].type){for(h=0;h<o.length;h+=1)if(i=!0,1===o[h].length&&"number"==typeof o[h][0])u.push(String(o[h]-1));else if(o[h].length>1){for(l=0;l<o[h].length;l+=1)"number"!=typeof o[h][l]&&(i=!1);!0===i&&u.push([o[h][0]-1,o[h][1]-1].join(" "));}n[a].value="["+u.join(" ")+"]";}else n[a].value=n[a].defaultValue;n[a].explicitSet=!0;}return !1===this.internal.viewerpreferences.isSubscribed&&(this.internal.events.subscribe("putCatalog",(function(){var t,e=[];for(t in n)!0===n[t].explicitSet&&("name"===n[t].type?e.push("/"+t+" /"+n[t].value):e.push("/"+t+" "+n[t].value));0!==e.length&&this.internal.write("/ViewerPreferences\n<<\n"+e.join("\n")+"\n>>");})),this.internal.viewerpreferences.isSubscribed=!0),this.internal.viewerpreferences.configuration=n,this},
 /** ====================================================================
  * @license
  * jsPDF XMP metadata plugin
@@ -2122,6 +2122,7 @@ function _downloadPDFFile(labels, labelPageDescription, fileTitle) {
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const lineSeparatorChar = "|";
 //#endregion
 //#region Public functions
 /**
@@ -2154,7 +2155,12 @@ async function downloadCSV(selectionSetNames, layer, ids, formatUsingLayerPopup,
  */
 async function downloadPDF(selectionSetNames, layer, ids, removeDuplicates, labelPageDescription) {
   console.log("downloadPDF using selectionSetNames " + JSON.stringify(selectionSetNames)); //???
-  const labels = await _prepareLabels(layer, ids, removeDuplicates);
+  let labels = await _prepareLabels(layer, ids, removeDuplicates);
+  labels =
+    // Remove empty lines in labels
+    labels.map(labelLines => labelLines.filter(line => line.length > 0))
+      // Remove empty labels
+      .filter(label => label.length > 0);
   exportPDF(labels, labelPageDescription);
   return Promise.resolve();
 }
@@ -2165,7 +2171,7 @@ async function downloadPDF(selectionSetNames, layer, ids, removeDuplicates, labe
  *
  * @param fieldInfos Layer's fieldInfos structure
  * @param bypassFieldVisiblity Indicates if the configured fieldInfo visibility property should be ignored
- * @return Label spec
+ * @return Label spec with lines separated by `lineSeparatorChar`
  */
 function _convertPopupFieldsToLabelSpec(fieldInfos, bypassFieldVisiblity = false) {
   const labelSpec = [];
@@ -2175,7 +2181,7 @@ function _convertPopupFieldsToLabelSpec(fieldInfos, bypassFieldVisiblity = false
       labelSpec.push(`{${fieldInfo.fieldName}}`);
     }
   });
-  return labelSpec;
+  return labelSpec.join(lineSeparatorChar);
 }
 /**
  * Converts the text of a custom popup into a multiline label specification; conversion splits text into
@@ -2183,22 +2189,19 @@ function _convertPopupFieldsToLabelSpec(fieldInfos, bypassFieldVisiblity = false
  *
  * @param popupInfo Layer's popupInfo structure containing description, fieldInfos, and expressionInfos, e.g.,
  * "<div style='text-align: left;'>{NAME}<br />{STREET}<br />{CITY}, {STATE} {ZIP} <br /></div>"
- * @return Label spec
+ * @return Label spec with lines separated by `lineSeparatorChar`
  */
 function _convertPopupTextToLabelSpec(popupInfo) {
-  // Replace <br>, <br/> with |
-  popupInfo = popupInfo.replace(/<br\s*\/?>/gi, "|");
-  // Remove remaining HTML tags, replace 0xA0 that popup uses for spaces, replace some char representations,
+  // Replace <br>, <br/> with the line separator character
+  popupInfo = popupInfo.replace(/<br\s*\/?>/gi, lineSeparatorChar);
+  // Remove remaining HTML tags, replace 0xA0 that popup uses for spaces, and replace some char representations,
   // and split the label back into individual lines
-  let labelSpec = popupInfo
+  const labelSpec = popupInfo
     .replace(/<[\s.]*[^<>]*\/?>/gi, "")
     .replace(/\xA0/gi, " ")
     .replace(/&lt;/gi, "<")
     .replace(/&gt;/gi, ">")
-    .replace(/&nbsp;/gi, " ")
-    .split("|");
-  // Trim lines and remove empties
-  labelSpec = labelSpec.map(line => line.trim()).filter(line => line.length > 0);
+    .replace(/&nbsp;/gi, " ");
   return labelSpec;
 }
 /**
@@ -2217,7 +2220,7 @@ async function _createArcadeExecutors(labelFormat, layer) {
   }
   // Are there any Arcade expressions in the label format?
   const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
-  const arcadeExpressionsMatches = labelFormat.join("|").match(arcadeExpressionRegExp);
+  const arcadeExpressionsMatches = labelFormat.match(arcadeExpressionRegExp);
   if (!arcadeExpressionsMatches) {
     return Promise.resolve(arcadeExecutors);
   }
@@ -2244,6 +2247,39 @@ async function _createArcadeExecutors(labelFormat, layer) {
     return arcadeExecutors;
   });
 }
+/**
+ * Prepares an attribute's value by applying domain and type information.
+ *
+ * @param attributeValue Value of attribute
+ * @param attributeType Type of attribute
+ * @param attributeDomain Domain info for attribute, if any
+ * @return Attribute value modified appropriate to domain and type
+ */
+function _prepareAttributeValue(attributeValue, attributeType, attributeDomain, intl) {
+  if (attributeDomain && attributeDomain.type === "coded-value") {
+    // "coded-value" domain field
+    const value = attributeDomain.getName(attributeValue);
+    return value;
+  }
+  else {
+    // Non-domain field or unsupported domain type
+    let value = attributeValue;
+    switch (attributeType) {
+      case "date":
+        // Format date produces odd characters for the space between the time and the AM/PM text,
+        // e.g., "12/31/1969, 4:00 PM"
+        value = intl.formatDate(value).replace(/\xe2\x80\xaf/g, "");
+        break;
+      case "double":
+      case "integer":
+      case "long":
+      case "small-integer":
+        value = intl.formatNumber(value);
+        break;
+    }
+    return value;
+  }
+}
 /**
  * Creates labels from items.
  *
@@ -2260,6 +2296,13 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   const [intl] = await loadModules(["esri/intl"]);
   // Get the features to export
   const featureSet = await queryFeaturesByID(ids, layer);
+  // Get field data types. Do we have any domain-based fields?
+  const attributeTypes = {};
+  const attributeDomains = {};
+  layer.fields.forEach(field => {
+    attributeTypes[field.name] = field.type;
+    attributeDomains[field.name] = field.domain;
+  });
   // Get the label formatting, if any
   let labelFormat;
   let arcadeExecutors = {};
@@ -2273,7 +2316,7 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
         // Can we use the popup title?
         // eslint-disable-next-line unicorn/prefer-ternary
         if (typeof layer.popupTemplate.title === "string") {
-          labelFormat = [layer.popupTemplate.title];
+          labelFormat = layer.popupTemplate.title;
           // Otherwise revert to using attributes
         }
         else {
@@ -2292,35 +2335,43 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   // eslint-disable-next-line unicorn/prefer-ternary
   if (labelFormat) {
     const arcadeExpressionRegExp = /\{expression\/\w+\}/g;
-    // Convert attributes into an array of labels
+    const attributeRegExp = /\{\w+\}/g;
+    // Find the label fields that we need to replace with values
+    const arcadeExpressionMatches = labelFormat.match(arcadeExpressionRegExp);
+    const attributeMatches = labelFormat.match(attributeRegExp);
+    // Convert feature attributes into an array of labels
     labels = featureSet.features.map(feature => {
-      const label = [];
-      labelFormat.forEach(labelLineTemplate => {
-        let labelLine = labelLineTemplate;
-        // Replace Arcade expressions
-        const arcadeExpressionsMatches = labelLine.match(arcadeExpressionRegExp);
-        if (arcadeExpressionsMatches) {
-          arcadeExpressionsMatches.forEach((match) => {
-            const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
-            const replacement = arcadeExecutors[expressionName].execute({ "$feature": feature });
-            labelLine = labelLine.replace(match, replacement);
-          });
-        }
-        // Replace fields; must be done after Arcade check because `substitute` will discard Arcade expressions!
-        labelLine = intl.substitute(labelLine, feature.attributes).trim();
-        if (labelLine.length > 0) {
-          label.push(labelLine);
-        }
-      });
+      let labelPrep = labelFormat;
+      // Replace Arcade expressions
+      if (arcadeExpressionMatches) {
+        arcadeExpressionMatches.forEach((match) => {
+          const expressionName = match.substring(match.indexOf("/") + 1, match.length - 1);
+          const value = arcadeExecutors[expressionName].execute({ "$feature": feature });
+          labelPrep = labelPrep.replace(match, value);
+        });
+      }
+      // Replace non-Arcade fields
+      if (attributeMatches) {
+        attributeMatches.forEach((match) => {
+          const attributeName = match.substring(1, match.length - 1);
+          const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], intl);
+          labelPrep = labelPrep.replace(match, value);
+        });
+      }
+      // Split label into lines
+      let label = labelPrep.split(lineSeparatorChar);
+      // Trim lines
+      label = label.map(line => line.trim());
       return label;
-    })
-      // Remove empty labels
-      .filter(label => label.length > 0);
+    });
   }
   else {
     // Export all attributes
     labels = featureSet.features.map(feature => {
-      return Object.values(feature.attributes).map(attribute => `${attribute}`);
+      return Object.keys(feature.attributes).map((attributeName) => {
+        const value = _prepareAttributeValue(feature.attributes[attributeName], attributeTypes[attributeName], attributeDomains[attributeName], intl);
+        return `${value}`;
+      });
     });
   }
   // Remove duplicates
@@ -2333,14 +2384,12 @@ async function _prepareLabels(layer, ids, removeDuplicates = true, formatUsingLa
   if (includeHeaderNames) {
     let headerNames = [];
     if (labelFormat) {
-      headerNames = labelFormat.map(labelFormatLine => labelFormatLine.replace(/\{/g, "").replace(/\}/g, ""));
+      headerNames = labelFormat.replace(/\{/g, "").replace(/\}/g, "").split(lineSeparatorChar);
     }
     else {
       const featuresAttrs = featureSet.features[0].attributes;
       Object.keys(featuresAttrs).forEach(k => {
-        if (featuresAttrs[0].hasOwnProperty(k)) {
-          headerNames.push(k);
-        }
+        headerNames.push(k);
       });
     }
     labels.unshift(headerNames);

package/dist/esm/{index.es-1d777745.js → index.es-4904465f.js}

@@ -4,7 +4,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { a as commonjsGlobal, c as createCommonjsModule, g as getDefaultExportFromCjs } from './_commonjsHelpers-d5f9d613.js';
-import { _ as _typeof_1 } from './downloadUtils-8d64719e.js';
+import { _ as _typeof_1 } from './downloadUtils-a9b39194.js';
 import './index-c246d90e.js';
 import './loadModules-b299cd43.js';
 import './locale-7bf10e0a.js';

package/dist/esm/layer-table.entry.js

@@ -6,7 +6,7 @@
 import { r as registerInstance, h, H as Host, g as getElement } from './index-c246d90e.js';
 import { g as getLocaleComponentStrings } from './locale-7bf10e0a.js';
 import { g as goToSelection, a as getMapLayerView, q as queryAllFeatures } from './mapViewUtils-02696ab6.js';
-import { d as downloadCSV } from './downloadUtils-8d64719e.js';
+import { d as downloadCSV } from './downloadUtils-a9b39194.js';
 import './_commonjsHelpers-d5f9d613.js';
 import './interfaces-d0d83efa.js';
 import './loadModules-b299cd43.js';

package/dist/esm/public-notification.entry.js

@@ -65,17 +65,9 @@ const PublicNotification = class {
    * @returns Promise when complete
    */
   async watchSearchConfigurationHandler(newValue, oldValue) {
-    //TODO adding this here to see if its any different than having in map-select-tools
-    // I would have thought that the prop would have made it through on the next render of map-select-tools
-    // however we are still seeing a broken search...need to understand why and don't see a clean way to debug in devext
-    console.log("PN watchSearchConfigurationHandler");
-    console.log("PN newValue");
-    console.log(newValue);
-    console.log("PN oldValue");
-    console.log(oldValue);
-    if (JSON.stringify(newValue) !== JSON.stringify(oldValue)) {
-      console.log("Emit event from parent");
-      this._searchConfiguration = Object.assign({}, newValue);
+    const s_newValue = JSON.stringify(newValue);
+    if (s_newValue !== JSON.stringify(oldValue)) {
+      this._searchConfiguration = JSON.parse(s_newValue);
       this.searchConfigurationChange.emit(this._searchConfiguration);
     }
   }