@arcgis/map-components 5.1.0-next.103 → 5.1.0-next.105

package/dist/components/arcgis-feature-utility-network-association-list/customElement.js

@@ -3,20 +3,20 @@ import { c as f } from "../../chunks/runtime.js";
 import { css as g, html as n } from "lit";
 import { keyed as d } from "lit/directives/keyed.js";
 import { ArcgisUtilityNetworkAssociationList as y } from "../arcgis-utility-network-association-list/customElement.js";
-import { stripHTML as u } from "@arcgis/core/applications/Components/stringUtils.js";
+import { stripHTML as p } from "@arcgis/core/applications/Components/stringUtils.js";
 import { formatNumber as w, substitute as $ } from "@arcgis/core/intl.js";
-import { renderElement as p, safeClassMap as b } from "@arcgis/lumina";
+import { renderElement as h, safeClassMap as b } from "@arcgis/lumina";
 import { i as m } from "../../chunks/layer-utils.js";
-const _ = g`:host{position:relative;flex:1 1 auto}.list-item--hidden{display:none}.feature-observer{bottom:var(--calcite-spacing-xxl);position:relative;text-align:center;z-index:2}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.notice-container{margin-bottom:var(--calcite-spacing-xs)}`, A = "nested";
-class F extends y {
+const F = g`:host{position:relative;flex:1 1 auto}.list-item--hidden{display:none}.feature-observer{bottom:var(--calcite-spacing-xxl);position:relative;text-align:center;z-index:2}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.notice-container{margin-bottom:var(--calcite-spacing-xs)}`, _ = "nested";
+class A extends y {
   constructor() {
-    super(...arguments), this.autoDestroyDisabled = !1, this.displayCount = 3, this.flowType = "feature-utility-network-association-type";
+    super(...arguments), this.autoDestroyDisabled = !1, this.displayCount = 3, this.useFeatureNextFlowItem = !1, this.flowType = "feature-utility-network-association-type";
   }
   static {
-    this.properties = { autoDestroyDisabled: 5, description: 1, displayCount: 9, endIndex: 32, flowItems: 0, flowType: 1, heading: 1, map: 0, referenceElement: 1, spatialReference: 0, timeZone: 1, view: 0 };
+    this.properties = { autoDestroyDisabled: 5, description: 1, displayCount: 9, endIndex: 32, flowItems: 0, useFeatureNextFlowItem: 5, flowType: 1, heading: 1, map: 0, referenceElement: 1, spatialReference: 0, timeZone: 1, view: 0 };
   }
   static {
-    this.styles = _;
+    this.styles = F;
   }
   get endIndex() {
     const { currentFeaturePage: e, featuresPerPage: t, maxFeatureCount: s } = this;
@@ -32,8 +32,8 @@ class F extends y {
     const l = o ? s?.getAttribute(o) : null, r = t.graphic, a = r?.layer;
     let c = null;
     m(a) && a.parent ? c = a.parent.globalIdField ?? null : a && "globalIdField" in a && (c = a.globalIdField);
-    const h = c ? r?.getAttribute(c) : null;
-    return !!(l && h && l === h);
+    const u = c ? r?.getAttribute(c) : null;
+    return !!(l && u && l === u);
   }
   _findFlowItem(e) {
     return this.flowItems?.findIndex((t) => {
@@ -79,7 +79,10 @@ class F extends y {
   }
   async _selectAssociation(e) {
     const { flowItems: t } = this;
-    t && t.push(p(d(this.parentFeatureViewModel, n`<arcgis-feature .autoDestroyDisabled=${this.autoDestroyDisabled} .flowItems=${t} .flowType=${"feature-association"} .graphic=${e.graphic} .map=${this.map} .referenceElement=${this.referenceElement} show-utility-network-content .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature>`)));
+    if (!t)
+      return;
+    const s = this.useFeatureNextFlowItem ? h(d(this.parentFeatureViewModel, n`<arcgis-feature-next .autoDestroyDisabled=${this.autoDestroyDisabled} .flowItems=${t} .flowType=${"feature-association"} .graphic=${e.graphic} .map=${this.map} .referenceElement=${this.referenceElement} show-utility-network-content .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature-next>`)) : h(d(this.parentFeatureViewModel, n`<arcgis-feature .autoDestroyDisabled=${this.autoDestroyDisabled} .flowItems=${t} .flowType=${"feature-association"} .graphic=${e.graphic} .map=${this.map} .referenceElement=${this.referenceElement} show-utility-network-content .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature>`));
+    t.push(s);
   }
   _showAllAssociations(e) {
     const { flowItems: t, description: s } = this;
@@ -87,15 +90,15 @@ class F extends y {
       return;
     this.showAllEnabled = !0;
     const i = e?.title ?? "";
-    t.push(p(n`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this.associationViewModels} .description=${s} .flowItems=${t} .flowType=${this.flowType} .heading=${i} .messages=${this.messages} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .selectedLayer=${e} .showAllEnabled=${this.showAllEnabled}></arcgis-feature-utility-network-association-list>`));
+    t.push(h(n`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this.associationViewModels} .description=${s} .flowItems=${t} .flowType=${this.flowType} .heading=${i} .messages=${this.messages} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .selectedLayer=${e} .showAllEnabled=${this.showAllEnabled} .useFeatureNextFlowItem=${this.useFeatureNextFlowItem}></arcgis-feature-utility-network-association-list>`));
   }
   render() {
     const { associationViewModels: e, state: t } = this, s = this.selectedLayer?.title ?? this.messages?.noTitle ?? "";
-    return n`<div class="root">${t === "loading" || t === "querying" ? this._renderLoading() : n`<calcite-list .displayMode=${A} .filterEnabled=${this.showAllEnabled && !!this.selectedLayer} .filterLabel=${this.messages?.associationFilterPlaceholder} .filterPlaceholder=${this.messages?.associationFilterPlaceholder} .label=${s}>${this.showAllEnabled && this.selectedLayer ? n`${this._renderFeatureCountWarning()}${this._renderAssociatedFeatureListPage()}${this._renderFeatureObserver()}` : Array.from(e.keys(), (i) => this._renderTypeList(i))}</calcite-list>`}</div>`;
+    return n`<div class="root">${t === "loading" || t === "querying" ? this._renderLoading() : n`<calcite-list .displayMode=${_} .filterEnabled=${this.showAllEnabled && !!this.selectedLayer} .filterLabel=${this.messages?.associationFilterPlaceholder} .filterPlaceholder=${this.messages?.associationFilterPlaceholder} .label=${s}>${this.showAllEnabled && this.selectedLayer ? n`${this._renderFeatureCountWarning()}${this._renderAssociatedFeatureListPage()}${this._renderFeatureObserver()}` : Array.from(e.keys(), (i) => this._renderTypeList(i))}</calcite-list>`}</div>`;
   }
   _renderAssociatedFeature(e) {
     const { featureViewModel: t, title: s } = e, i = this.state === "loading", o = this._findFlowItem(t), l = o < 0 && this._isParentFeature(t), r = l || o >= 0, a = `associated-feature-${e.association.globalId}`;
-    return n`<calcite-list-item class=${b(i ? "list-item--hidden" : "")} .description=${u(e.terminalName ?? "")} .label=${u(s)} @calciteListItemSelect=${async () => await this._handleFeatureClick(l, o, t)}>${this._isConnectivityAssociation(e.association) ? this._renderConnectivityIcon(e.association.associationType, a) : null}${this._isConnectivityMidspanAssociation(e.association) ? n`<calcite-chip .label=${this._formatPercentAlong(e.association)} scale=s slot=content-end>${this._formatPercentAlong(e.association)}</calcite-chip>` : null}${this._renderChevronIconNode(r)}</calcite-list-item>`;
+    return n`<calcite-list-item class=${b(i ? "list-item--hidden" : "")} .description=${p(e.terminalName ?? "")} .label=${p(s)} @calciteListItemSelect=${async () => await this._handleFeatureClick(l, o, t)}>${this._isConnectivityAssociation(e.association) ? this._renderConnectivityIcon(e.association.associationType, a) : null}${this._isConnectivityMidspanAssociation(e.association) ? n`<calcite-chip .label=${this._formatPercentAlong(e.association)} scale=s slot=content-end>${this._formatPercentAlong(e.association)}</calcite-chip>` : null}${this._renderChevronIconNode(r)}</calcite-list-item>`;
   }
   _renderAssociatedFeatureList(e) {
     return e.toArray().map((t) => this._renderAssociatedFeature(t));
@@ -119,7 +122,7 @@ class F extends y {
     return e.toArray().map((t) => this._renderItemTooltip(t));
   }
 }
-f("arcgis-feature-utility-network-association-list", F);
+f("arcgis-feature-utility-network-association-list", A);
 export {
-  F as ArcgisFeatureUtilityNetworkAssociationList
+  A as ArcgisFeatureUtilityNetworkAssociationList
 };

package/dist/components/arcgis-feature-utility-network-association-list/index.js

@@ -1,4 +1,5 @@
 import "../arcgis-utility-network-association-list/index.js";
+import "../arcgis-feature-next/index.js";
 import "../arcgis-feature/index.js";
 import ".//index.js";
 import "@esri/calcite-components/components/calcite-list";

package/dist/components/arcgis-feature-utility-network-associations/customElement.js

@@ -1,25 +1,25 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
 import { c as S } from "../../chunks/runtime.js";
-import { css as M, html as p } from "lit";
+import { css as M, html as m } from "lit";
 import { keyed as C } from "lit/directives/keyed.js";
-import { i as k, q as $ } from "../../chunks/layer-utils.js";
-import { createReactiveMap as I, findUtilityNetwork as j, getOrCreateMapValue as D } from "@arcgis/core/applications/Components/featureUtils.js";
+import { i as k, q as D } from "../../chunks/layer-utils.js";
+import { createReactiveMap as I, findUtilityNetwork as V, getOrCreateMapValue as j } from "@arcgis/core/applications/Components/featureUtils.js";
 import { stripHTML as v } from "@arcgis/core/applications/Components/stringUtils.js";
 import w from "@arcgis/core/core/Collection.js";
-import { ignoreAbortErrors as q } from "@arcgis/core/core/promiseUtils.js";
+import { ignoreAbortErrors as E } from "@arcgis/core/core/promiseUtils.js";
 import { watch as A } from "@arcgis/core/core/reactiveUtils.js";
-import * as U from "@arcgis/core/core/sql.js";
-import V from "@arcgis/core/rest/networks/support/NetworkElement.js";
-import x from "@arcgis/core/rest/networks/support/QueryAssociationsParameters.js";
-import P from "@arcgis/core/rest/support/Query.js";
-import { LitElement as Q, renderElement as B } from "@arcgis/lumina";
-import { debounce as E } from "@arcgis/toolkit/function";
+import * as x from "@arcgis/core/core/sql.js";
+import P from "@arcgis/core/rest/networks/support/NetworkElement.js";
+import U from "@arcgis/core/rest/networks/support/QueryAssociationsParameters.js";
+import Q from "@arcgis/core/rest/support/Query.js";
+import { LitElement as B, renderElement as q } from "@arcgis/lumina";
+import { debounce as T } from "@arcgis/toolkit/function";
 import G from "@arcgis/core/popup/Feature.js";
-const O = M`.list-container{min-height:var(--calcite-spacing-xxxl)}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.sticky-loading-container{display:flex;position:sticky;bottom:var(--calcite-spacing-sm);align-items:center;justify-content:center;z-index:2;margin:0;padding:0;height:var(--calcite-spacing-xxxl);pointer-events:none;height:500px}`, L = 100, T = {
+const R = M`.list-container{min-height:var(--calcite-spacing-xxxl)}.loading-container{display:flex;justify-content:center;padding:var(--calcite-spacing-md) 0;width:100%}.sticky-loading-container{display:flex;position:sticky;bottom:var(--calcite-spacing-sm);align-items:center;justify-content:center;z-index:2;margin:0;padding:0;height:var(--calcite-spacing-xxxl);pointer-events:none;height:500px}`, L = 100, $ = {
   assetGroup: "assetgroup",
   assetType: "assettype"
 }, N = "{00000000-0000-0000-0000-000000000000}";
-class R extends Q {
+class O extends B {
   constructor() {
     super(...arguments), this._addFlowItem = (t) => {
       t && this.flowItems?.push(t);
@@ -38,20 +38,20 @@ class R extends Q {
     }, this._queryController = async (t) => {
       this._cancelQuery();
       const e = new AbortController();
-      this._queryAbortController = e, await q(this._query(t)), this._queryAbortController === e && (this._queryAbortController = null);
+      this._queryAbortController = e, await E(this._query(t)), this._queryAbortController === e && (this._queryAbortController = null);
     }, this._queryFeatureCountController = async () => {
       this._loaded = !1, this._cancelQueryFeatureCount();
       const t = new AbortController();
-      this._queryFeatureCountAbortController = t, await q(this._queryFeatureCount()), this._queryFeatureCountAbortController === t && (this._queryFeatureCountAbortController = null), this._loaded = !0;
-    }, this._queryDebounced = E(this._queryController, L), this._queryFeatureCountDebounced = E(this._queryFeatureCountController, L), this._structureAssociations = new w(), this._structureFeatureCount = 0, this._queryAssociationType = async () => {
+      this._queryFeatureCountAbortController = t, await E(this._queryFeatureCount()), this._queryFeatureCountAbortController === t && (this._queryFeatureCountAbortController = null), this._loaded = !0;
+    }, this._queryDebounced = T(this._queryController, L), this._queryFeatureCountDebounced = T(this._queryFeatureCountController, L), this._structureAssociations = new w(), this._structureFeatureCount = 0, this._queryAssociationType = async () => {
       this._activeAssociationType && this._queryDebounced(this._activeAssociationType);
-    }, this._associationFeatures = I(), this._associationViewModels = I(), this._featureCount = 0, this._loaded = !1, this._queryAbortController = null, this._queryFeatureCountAbortController = null, this._queryPageAbortController = null, this.associationTypes = null, this.autoDestroyDisabled = !1, this.flowType = "feature-utility-network-associations", this.headingLevel = 2, this.source = "popup";
+    }, this._associationFeatures = I(), this._associationViewModels = I(), this._featureCount = 0, this._loaded = !1, this._queryAbortController = null, this._queryFeatureCountAbortController = null, this._queryPageAbortController = null, this.associationTypes = null, this.autoDestroyDisabled = !1, this.useFeatureNextFlowItem = !1, this.flowType = "feature-utility-network-associations", this.headingLevel = 2, this.source = "popup";
   }
   static {
-    this.properties = { _activeAssociationType: 16, _associationFeatures: 16, _associationViewModels: 16, _canLoad: 16, _canQuery: 16, _featureCount: 16, _loaded: 16, _queryAbortController: 16, _queryFeatureCountAbortController: 16, _queryPageAbortController: 16, _state: 16, associationTypes: 0, autoDestroyDisabled: 5, description: 1, flowItems: 0, flowType: 1, graphic: 0, heading: 1, headingLevel: 9, layer: 0, map: 0, messages: 0, parentFeatureViewModel: 0, referenceElement: 1, source: 1, spatialReference: 0, timeZone: 1, view: 0 };
+    this.properties = { _activeAssociationType: 16, _associationFeatures: 16, _associationViewModels: 16, _canLoad: 16, _canQuery: 16, _featureCount: 16, _loaded: 16, _queryAbortController: 16, _queryFeatureCountAbortController: 16, _queryPageAbortController: 16, _state: 16, associationTypes: 0, autoDestroyDisabled: 5, description: 1, flowItems: 0, useFeatureNextFlowItem: 5, flowType: 1, graphic: 0, heading: 1, headingLevel: 9, layer: 0, map: 0, messages: 0, parentFeatureViewModel: 0, referenceElement: 1, source: 1, spatialReference: 0, timeZone: 1, view: 0 };
   }
   static {
-    this.styles = O;
+    this.styles = R;
   }
   get _globalId() {
     return (this._globalIdField && this.graphic?.attributes?.[this._globalIdField]) ?? null;
@@ -73,7 +73,7 @@ class R extends Q {
     if (!t?.loaded || !e)
       return null;
     const s = k(t) ? t.parent : t;
-    return j(e, s);
+    return V(e, s);
   }
   get _canLoad() {
     return !!this.map;
@@ -118,7 +118,8 @@ class R extends Q {
     });
   }
   _addAssociationTypeFlowItem(t) {
-    this._addFlowItem(B(p`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this._associationViewModels} .description=${this.parentFeatureViewModel?.heading} .flowItems=${this.flowItems} .flowType=${this.flowType} .heading=${this._getAssociationTypeTitle(t)} .messages=${this.messages} .map=${this.map} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .state=${this._state} .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature-utility-network-association-list>`));
+    const e = this.useFeatureNextFlowItem ? q(m`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this._associationViewModels} .description=${this._getParentFeatureDescription()} .flowItems=${this.flowItems} .flowType=${this.flowType} .heading=${this._getAssociationTypeTitle(t)} .messages=${this.messages} .map=${this.map} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .state=${this._state} .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} use-feature-next-flow-item .view=${this.view}></arcgis-feature-utility-network-association-list>`) : q(m`<arcgis-feature-utility-network-association-list .autoDestroyDisabled=${this.autoDestroyDisabled} .associationViewModels=${this._associationViewModels} .description=${this._getParentFeatureDescription()} .flowItems=${this.flowItems} .flowType=${this.flowType} .heading=${this._getAssociationTypeTitle(t)} .messages=${this.messages} .map=${this.map} .parentFeatureViewModel=${this.parentFeatureViewModel} .referenceElement=${this.referenceElement} .state=${this._state} .spatialReference=${this.spatialReference} .timeZone=${this.timeZone} .view=${this.view}></arcgis-feature-utility-network-association-list>`);
+    this._addFlowItem(e);
   }
   _clearAssociations() {
     this._attachmentAssociations.removeAll(), this._connectivityAssociations.removeAll(), this._containerAssociations.removeAll(), this._contentAssociations.removeAll(), this._structureAssociations.removeAll();
@@ -159,8 +160,8 @@ class R extends Q {
       (await Promise.all(y)).forEach((r) => {
         r.forEach((h) => {
           if (this.source === "popup" ? h.sourceLayer && h.getEffectivePopupTemplate() : !!h.sourceLayer) {
-            const f = h.layer.globalIdField ?? "", g = h.getAttribute(f), b = a.get(g) ?? [];
-            b.push(h), a.set(g, b);
+            const f = h.layer.globalIdField ?? "", g = h.getAttribute(f), F = a.get(g) ?? [];
+            F.push(h), a.set(g, F);
           }
         });
       });
@@ -168,8 +169,8 @@ class R extends Q {
     await Promise.all(u);
     const n = [];
     return await Promise.all(t.toArray().map(async (c) => {
-      const { fromNetworkElement: d, toNetworkElement: l } = c, y = d.globalId === this._globalId ? l : d, m = a.get(y.globalId) ?? [];
-      await Promise.all(m.map(async (r) => {
+      const { fromNetworkElement: d, toNetworkElement: l } = c, y = d.globalId === this._globalId ? l : d, p = a.get(y.globalId) ?? [];
+      await Promise.all(p.map(async (r) => {
         const h = this._utilityNetwork?.getTerminalById(y?.terminalId ?? void 0)?.name, _ = await r.sourceLayer.getFeatureTitle(r) || this._getFeatureTitle(r);
         n.push({
           title: _,
@@ -245,7 +246,7 @@ class R extends Q {
     }
   }
   _getFeatureQueryWhereClause(t, e, s, o) {
-    const i = t.globalIdField, a = t.fieldsIndex.get(T.assetGroup), u = t.fieldsIndex.get(T.assetType), n = s != null, c = o != null, d = i ? U.sqlIn(i, e) : null, l = n ? `(${a?.name} = ${s})` : null, y = n && c ? `(${u?.name} = ${o})` : null;
+    const i = t.globalIdField, a = t.fieldsIndex.get($.assetGroup), u = t.fieldsIndex.get($.assetType), n = s != null, c = o != null, d = i ? x.sqlIn(i, e) : null, l = n ? `(${a?.name} = ${s})` : null, y = n && c ? `(${u?.name} = ${o})` : null;
     return [d, l, y].filter(Boolean).join(" AND ");
   }
   _getFeatureTitle(t) {
@@ -255,6 +256,15 @@ class R extends Q {
     const o = "displayField" in s ? s.displayField : null, i = o != null ? e[o.toString()] : null, a = i != null ? i.toString() : null, u = t.getObjectId()?.toString();
     return a || u || "";
   }
+  _getParentFeatureDescription() {
+    const { parentFeatureViewModel: t } = this;
+    if (t) {
+      if ("heading" in t)
+        return t.heading;
+      if ("title" in t)
+        return t.title;
+    }
+  }
   async _loadUtiltyNetworks() {
     const t = this.map;
     if (!t)
@@ -290,17 +300,17 @@ class R extends Q {
       } : {
         networkSourceId: h.networkSourceId,
         elementGlobalId: h.globalId
-      }, b = y.get(f) || [];
-      b.push(g), y.set(f, b);
+      }, F = y.get(f) || [];
+      F.push(g), y.set(f, F);
     });
-    const m = await this._createAssociationFeatureObjects(c, y, d, l, e);
-    this._parseFeatureObjects(m, n);
+    const p = await this._createAssociationFeatureObjects(c, y, d, l, e);
+    this._parseFeatureObjects(p, n);
   }
   async _queryAssociations(t) {
     const { layer: e, _globalId: s, associationTypes: o, _utilityNetwork: i, _canQuery: a } = this;
     if (await Promise.allSettled([e?.load(), i?.load()]), this._clearAssociations(), !a || !e || !o || !i || !s)
       return;
-    const u = k(e) ? e.parent : e, n = new V({
+    const u = k(e) ? e.parent : e, n = new P({
       globalId: s,
       networkSourceId: i.getSourceIdByLayerId(u.layerId)
     }), c = /* @__PURE__ */ new Set();
@@ -319,7 +329,7 @@ class R extends Q {
           break;
       }
     });
-    const d = await i?.queryAssociations(new x({
+    const d = await i?.queryAssociations(new U({
       elements: [n],
       types: Array.from(c)
     }), {
@@ -370,27 +380,27 @@ class R extends Q {
           break;
       }
     });
-    const m = o.map(async (r) => {
-      const { associatedNetworkSourceId: h, associatedAssetGroup: _, associatedAssetType: f } = r, g = l.get(r.type), F = _ != null ? await this._countAssociatedFeatures(h, g, _, f, t) : g.length;
+    const p = o.map(async (r) => {
+      const { associatedNetworkSourceId: h, associatedAssetGroup: _, associatedAssetType: f } = r, g = l.get(r.type), b = _ != null ? await this._countAssociatedFeatures(h, g, _, f, t) : g.length;
       switch (r.type) {
         case "attachment":
-          this._attachmentFeatureCount = F;
+          this._attachmentFeatureCount = b;
           break;
         case "connectivity":
-          this._connectivityFeatureCount = F;
+          this._connectivityFeatureCount = b;
           break;
         case "container":
-          this._containerFeatureCount = F;
+          this._containerFeatureCount = b;
           break;
         case "content":
-          this._contentFeatureCount = F;
+          this._contentFeatureCount = b;
           break;
         case "structure":
-          this._structureFeatureCount = F;
+          this._structureFeatureCount = b;
           break;
       }
     });
-    await Promise.allSettled(m);
+    await Promise.allSettled(p);
   }
   async _queryFeatureCount() {
     await this._loadUtiltyNetworks();
@@ -402,18 +412,18 @@ class R extends Q {
     await this._queryAssociations(t), this._featureCount = this._attachmentFeatureCount + this._connectivityFeatureCount + this._containerFeatureCount + this._contentFeatureCount + this._structureFeatureCount;
   }
   async _queryLayer(t, e, s, o, i) {
-    const a = this._getFeatureQueryWhereClause(t, e, s, o), u = new P({
+    const a = this._getFeatureQueryWhereClause(t, e, s, o), u = new Q({
       where: a,
       outFields: ["*"],
       cacheHint: this._supportsCacheHint
-    }), { features: n } = await $(t, u, i);
+    }), { features: n } = await D(t, u, i);
     return n;
   }
   _parseFeatureObjects(t, e) {
     const s = I();
     t.forEach((o) => {
       const a = (o?.feature).sourceLayer;
-      D(s, a, () => new w()).add(o);
+      j(s, a, () => new w()).add(o);
     });
     for (const [o, i] of s)
       this._sortFeatureObjectsByTitle(i), e.set(o, i);
@@ -434,7 +444,7 @@ class R extends Q {
       const u = this._associationViewModels.get(a) || new w();
       i?.filter(Boolean).forEach((n, c) => {
         if (!u.some((l) => this._matchesGlobalFeature(l, n))) {
-          const { association: l, feature: y, terminalName: m, title: r } = n;
+          const { association: l, feature: y, terminalName: p, title: r } = n;
           u.add({
             title: r,
             association: l,
@@ -446,7 +456,7 @@ class R extends Q {
               timeZone: o,
               graphic: y
             }),
-            terminalName: m
+            terminalName: p
           }, c);
         }
       }), this._associationViewModels.set(a, u);
@@ -463,33 +473,33 @@ class R extends Q {
   }
   render() {
     const { _state: t } = this;
-    return p`<div class="root"><arcgis-feature-element-info .heading=${this.heading} .headingLevel=${this.headingLevel} .description=${this.description}></arcgis-feature-element-info>${t === "loading" ? this._renderLoading() : t === "disabled" ? this._renderAssociationNotFound() : this._renderContent()}</div>`;
+    return m`<div class="root"><arcgis-feature-element-info .heading=${this.heading} .headingLevel=${this.headingLevel} .description=${this.description}></arcgis-feature-element-info>${t === "loading" ? this._renderLoading() : t === "disabled" ? this._renderAssociationNotFound() : this._renderContent()}</div>`;
   }
   _renderAssociationNotFound() {
-    return p`<calcite-notice icon=information kind=info open scale=s width=full><div slot=message>${this.messages?.noAssociations}</div></calcite-notice>`;
+    return m`<calcite-notice icon=information kind=info open scale=s width=full><div slot=message>${this.messages?.noAssociations}</div></calcite-notice>`;
   }
   _renderAssociationTypeList(t) {
     return this._getFeatureCountForAssociationType(t.type) > 0 ? this._renderAssociationTypeListItem(t) : null;
   }
   _renderAssociationTypeListItem(t) {
     const e = this._getAssociationTypeTitle(t);
-    return C(`association-type-${t.type}`, p`<calcite-list-item .description=${v(t.description)} .label=${v(e)} .value=${t.type} @calciteListItemSelect=${() => this._selectAssociationType(t)}><calcite-icon flip-rtl icon=chevron-right scale=s slot=content-end></calcite-icon></calcite-list-item>`);
+    return C(`association-type-${t.type}`, m`<calcite-list-item .description=${v(t.description)} .label=${v(e)} .value=${t.type} @calciteListItemSelect=${() => this._selectAssociationType(t)}><calcite-icon flip-rtl icon=chevron-right scale=s slot=content-end></calcite-icon></calcite-list-item>`);
   }
   _renderContent() {
     const { _state: t, associationTypes: e, messages: s } = this, o = s?.associationsList ?? s?.noTitle ?? "";
-    return C("list-container", p`<div class="list-container">${t === "ready" ? p`<div><calcite-list display-mode=flat .label=${o}>${e.map((i) => this._renderAssociationTypeList(i))}</calcite-list></div>` : null}${this._renderStickyLoading()}</div>`);
+    return C("list-container", m`<div class="list-container">${t === "ready" ? m`<div><calcite-list display-mode=flat .label=${o}>${e.map((i) => this._renderAssociationTypeList(i))}</calcite-list></div>` : null}${this._renderStickyLoading()}</div>`);
   }
   _renderLoading() {
-    return p`<div class="loading-container">${this._renderLoadingIcon()}${this._renderStickyLoading()}</div>`;
+    return m`<div class="loading-container">${this._renderLoadingIcon()}${this._renderStickyLoading()}</div>`;
   }
   _renderLoadingIcon() {
-    return p`<calcite-loader inline label></calcite-loader>`;
+    return m`<calcite-loader inline label></calcite-loader>`;
   }
   _renderStickyLoading() {
-    return this._state === "querying" ? p`<div class="sticky-loading-container">${this._renderLoadingIcon()}</div>` : null;
+    return this._state === "querying" ? m`<div class="sticky-loading-container">${this._renderLoadingIcon()}</div>` : null;
   }
 }
-S("arcgis-feature-utility-network-associations", R);
+S("arcgis-feature-utility-network-associations", O);
 export {
-  R as ArcgisFeatureUtilityNetworkAssociations
+  O as ArcgisFeatureUtilityNetworkAssociations
 };

package/dist/components/arcgis-features/customElement.d.ts

@@ -1,20 +1,19 @@
 /// <reference path="../../index.d.ts" />
-import type ActionButton from "@arcgis/core/support/actions/ActionButton.js";
+import type FeaturesViewModel from "@arcgis/core/widgets/Features/FeaturesViewModel.js";
 import type Collection from "@arcgis/core/core/Collection.js";
-import type Features from "@arcgis/core/popup/Features.js";
+import type ActionButton from "@arcgis/core/support/actions/ActionButton.js";
 import type ActionToggle from "@arcgis/core/support/actions/ActionToggle.js";
 import type Graphic from "@arcgis/core/Graphic.js";
-import type FeatureAbilities from "@arcgis/core/popup/support/FeatureAbilities.js";
-import type FeatureViewModel from "@arcgis/core/widgets/Feature/FeatureViewModel.js";
+import type Widget from "@arcgis/core/widgets/Widget.js";
 import type Map from "@arcgis/core/Map.js";
 import type SpatialReference from "@arcgis/core/geometry/SpatialReference.js";
-import type { ActionEvent, FetchFeaturesOptions } from "@arcgis/core/widgets/Popup/types.js";
-import type { ArcgisFeature } from "../arcgis-feature/customElement.js";
 import type { ArcgisReferenceElement, IconName, HeadingLevel } from "../types.js";
-import type { ScreenPoint } from "@arcgis/core/core/types.js";
 import type { PublicLitElement as LitElement } from "@arcgis/lumina";
+import type { ArcgisFeature } from "../arcgis-feature/customElement.js";
+import type { ActionEvent, FetchFeaturesOptions, PopupAction, InitialDisplayOptions, State } from "@arcgis/core/widgets/Popup/types.js";
+import type { ScreenPoint } from "@arcgis/core/core/types.js";
 import type { T9nMeta } from "@arcgis/lumina/controllers";
-import type { PopupAction, InitialDisplayOptions, State } from "@arcgis/core/popup/types.js";
+import type { Abilities } from "@arcgis/core/widgets/Feature/types.js";
 import type { GoToOverride } from "@arcgis/core/widgets/support/types.js";
 import type { MapViewOrSceneView } from "@arcgis/core/views/MapViewOrSceneView.js";
 
@@ -52,7 +51,7 @@ export abstract class ArcgisFeatures extends LitElement {
    */
   accessor actions: Collection<PopupAction>;
   /**
-   * Indicates if the component is active when it is visible and is not [waiting](https://developers.arcgis.com/javascript/latest/references/core/popup/Features/#waitingForResult) for results.
+   * Indicates if the component is active when it is visible and is not [waiting](https://developers.arcgis.com/javascript/latest/references/core/widgets/Features/FeaturesViewModel/#waitingForResult) for results.
    *
    * @default false
    */
@@ -73,7 +72,7 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default false
    * @since 5.0
    */
-  accessor chartAnimationDisabled: boolean | undefined;
+  accessor chartAnimationDisabled: boolean;
   /**
    * Indicates whether the component displays its content. If `true`, only the header displays.
    * This property is only honored if [showCollapseButton](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#showCollapseButton) is `true`.
@@ -91,7 +90,7 @@ export abstract class ArcgisFeatures extends LitElement {
    * component.content = "Click a feature on the map to view its attributes";
    * ```
    */
-  accessor content: string | HTMLElement | null | undefined;
+  accessor content: string | HTMLElement | Widget<any> | null | undefined;
   /**
    * Enables automatic creation of a popup template for layers that have popups enabled but no popupTemplate defined. Automatic popup templates are supported for layers that support the `createPopupTemplate` method.
    *
@@ -102,22 +101,12 @@ export abstract class ArcgisFeatures extends LitElement {
    * @since 4.34
    */
   accessor defaultPopupTemplateEnabled: boolean;
-  /**
-   * The heading currently displayed for the selected feature. This value resolves to the [selected feature item's heading](https://developers.arcgis.com/javascript/latest/references/core/popup/Features/#effectiveHeading) when available, otherwise it falls back to the component's [heading](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#heading).
-   *
-   * @since 5.1
-   * @see [heading](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#heading)
-   * @see [selectedFeature](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeature)
-   */
-  get effectiveHeading(): string | null | undefined;
   /**
    * The number of [features](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#features) available in the component.
    *
    * @since 4.34
    */
   accessor featureCount: number;
-  /** Defines the specific [abilities](https://developers.arcgis.com/javascript/latest/references/core/widgets/Feature/FeatureViewModel/#Abilities) that can be used when querying and displaying content. */
-  accessor featureItemAbilities: FeatureAbilities | null | undefined;
   /**
    * This property enables multiple features in the component to display in a list rather than displaying the first selected feature. Setting this to `true` allows the user to scroll through the list of features. This value will only be honored if [initialDisplayMode](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#initialDisplayMode) is set to "feature".
    *
@@ -130,7 +119,7 @@ export abstract class ArcgisFeatures extends LitElement {
    *
    * @since 4.34
    */
-  accessor featureMenuTitle: string | undefined;
+  accessor featureMenuTitle: string | null | undefined;
   /**
    * Indicates whether the feature navigation arrows are displayed at the top of the component.
    * By default, the navigation arrows are displayed at the bottom of the component.
@@ -169,12 +158,8 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default 20
    */
   accessor featuresPerPage: number;
-  /**
-   * Defines the specific [abilities](https://developers.arcgis.com/javascript/latest/references/core/widgets/Feature/FeatureViewModel/#Abilities) that can be used when querying and displaying content.
-   *
-   * @deprecated since 5.1. Use [featureItemAbilities](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#featureItemAbilities) instead to set abilities on a per feature basis.
-   */
-  accessor featureViewModelAbilities: FeatureViewModel["abilities"] | null | undefined;
+  /** Defines the specific [abilities](https://developers.arcgis.com/javascript/latest/references/core/widgets/Feature/FeatureViewModel/#Abilities) that can be used when querying and displaying content. */
+  accessor featureViewModelAbilities: Abilities | null | undefined;
   /**
    * This function provides the ability to override either the [arcgis-map.goTo()](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-map/#goTo) or [arcgis-scene.goTo()](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-scene/#goTo) methods.
    *
@@ -230,7 +215,7 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default false
    * @since 5.0
    */
-  accessor hideAttachmentsContent: boolean | undefined;
+  accessor hideAttachmentsContent: boolean;
   /**
    * Indicates whether to hide the close button in the component.
    *
@@ -250,7 +235,7 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default false
    * @since 5.0
    */
-  accessor hideCustomContent: boolean | undefined;
+  accessor hideCustomContent: boolean;
   /**
    * This property provides the ability to hide or show [expression content](https://developers.arcgis.com/javascript/latest/references/core/popup/content/ExpressionContent/) within the component.
    *
@@ -283,7 +268,7 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default false
    * @since 5.0
    */
-  accessor hideFieldsContent: boolean | undefined;
+  accessor hideFieldsContent: boolean;
   /**
    * Indicates whether to hide the heading in the component.
    *
@@ -303,14 +288,14 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default false
    * @since 5.0
    */
-  accessor hideMediaContent: boolean | undefined;
+  accessor hideMediaContent: boolean;
   /**
    * This property provides the ability to hide or show [relationship content](https://developers.arcgis.com/javascript/latest/references/core/popup/content/RelationshipContent/) within the component.
    *
    * @default false
    * @since 5.0
    */
-  accessor hideRelationshipContent: boolean | undefined;
+  accessor hideRelationshipContent: boolean;
   /**
    * Indicates whether to hide the *select feature* action when viewing associated and related features.
    *
@@ -330,14 +315,14 @@ export abstract class ArcgisFeatures extends LitElement {
    * @default false
    * @since 5.0
    */
-  accessor hideTextContent: boolean | undefined;
+  accessor hideTextContent: boolean;
   /**
    * This property provides the ability to hide or show [utility network content](https://developers.arcgis.com/javascript/latest/references/core/popup/content/UtilityNetworkAssociationsContent/) within the component.
    *
    * @default false
    * @since 5.0
    */
-  accessor hideUtilityNetworkContent: boolean | undefined;
+  accessor hideUtilityNetworkContent: boolean;
   /**
    * Indicates whether to highlight the [selectedFeature](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeature) in the associated
    * [arcgis-map](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-map/) or [arcgis-scene](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-scene/) component.
@@ -394,12 +379,9 @@ export abstract class ArcgisFeatures extends LitElement {
   accessor messageOverrides: {
       componentLabel?: string | undefined;
       zoom?: string | undefined;
-      browseAggregatedFeatures?: string | undefined;
-      aggregatedFeatures?: string | undefined;
-      aggregatedFeaturesPlaceholder?: string | undefined;
+      browseClusteredFeatures?: string | undefined;
       collapse?: string | undefined;
       expand?: string | undefined;
-      noAggregatedFeatures?: string | undefined;
       featuresList?: string | undefined;
       total?: string | undefined;
       pageText?: string | undefined;
@@ -421,12 +403,9 @@ export abstract class ArcgisFeatures extends LitElement {
   protected messages: Partial<{
       componentLabel: string;
       zoom: string;
-      browseAggregatedFeatures: string;
-      aggregatedFeatures: string;
-      aggregatedFeaturesPlaceholder: string;
+      browseClusteredFeatures: string;
       collapse: string;
       expand: string;
-      noAggregatedFeatures: string;
       featuresList: string;
       total: string;
       pageText: string;
@@ -446,12 +425,9 @@ export abstract class ArcgisFeatures extends LitElement {
   }> & T9nMeta<{
       componentLabel: string;
       zoom: string;
-      browseAggregatedFeatures: string;
-      aggregatedFeatures: string;
-      aggregatedFeaturesPlaceholder: string;
+      browseClusteredFeatures: string;
       collapse: string;
       expand: string;
-      noAggregatedFeatures: string;
       featuresList: string;
       total: string;
       pageText: string;
@@ -568,7 +544,7 @@ export abstract class ArcgisFeatures extends LitElement {
    */
   accessor timeZone: string;
   /**
-   * Indicates whether to update the feature location when the [selectedFeatureIndex](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeatureIndex) changes.
+   * Indicates whether to update the [location](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#location) when the [selectedFeatureIndex](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeatureIndex) changes.
    *
    * @default false
    * @since 5.0
@@ -588,7 +564,7 @@ export abstract class ArcgisFeatures extends LitElement {
    */
   accessor view: MapViewOrSceneView | null | undefined;
   /** @since 4.34 */
-  accessor viewModel: Features;
+  accessor viewModel: FeaturesViewModel;
   /**
    * Removes [promises](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#promises), [features](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#features), [content](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#content), and
    * [heading](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#heading) from the Features component.
@@ -627,13 +603,13 @@ export abstract class ArcgisFeatures extends LitElement {
    *
    * @see [selectedFeatureIndex](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeatureIndex)
    */
-  next(): Promise<Features>;
+  next(): Promise<FeaturesViewModel>;
   /**
    * Selects the feature at the previous index in relation to the [selectedFeature](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeature).
    *
    * @see [selectedFeatureIndex](https://developers.arcgis.com/javascript/latest/references/map-components/components/arcgis-features/#selectedFeatureIndex)
    */
-  previous(): Promise<Features>;
+  previous(): Promise<FeaturesViewModel>;
   /**
    * Use this method to give focus to the Component if the component is able to be focused.
    *
@@ -650,7 +626,7 @@ export abstract class ArcgisFeatures extends LitElement {
   /** Emitted when the component's close button is clicked. */
   readonly arcgisClose: import("@arcgis/lumina").TargetedEvent<this, void>;
   /** Emitted when the value of a property is changed. Use this to listen to changes to properties. */
-  readonly arcgisPropertyChange: import("@arcgis/lumina").TargetedEvent<this, { name: "active" | "collapsed" | "effectiveHeading" | "featureCount" | "featureMenuOpen" | "features" | "promises" | "selectedDrillInFeature" | "selectedFeature" | "selectedFeatureComponent" | "selectedFeatureIndex" | "state" | "open"; }>;
+  readonly arcgisPropertyChange: import("@arcgis/lumina").TargetedEvent<this, { name: "active" | "collapsed" | "featureCount" | "featureMenuOpen" | "features" | "promises" | "selectedDrillInFeature" | "selectedFeature" | "selectedFeatureComponent" | "selectedFeatureIndex" | "state" | "open"; }>;
   /** Emitted when the component associated with a map or scene view is ready to be interacted with. */
   readonly arcgisReady: import("@arcgis/lumina").TargetedEvent<this, void>;
   /**