@arcgis/common-components 5.2.0-next.11 → 5.2.0-next.111

package/dist/components/arcgis-field-info/index.js

@@ -1 +1,2 @@
+import "@esri/calcite-components/components/calcite-scrim";
 export * from "./customElement.js";

package/dist/components/arcgis-field-info/utils/basic.d.ts

@@ -17,10 +17,12 @@ import type VoxelLayer from "@arcgis/core/layers/VoxelLayer.js";
 import type WCSLayer from "@arcgis/core/layers/WCSLayer.js";
 import type WFSLayer from "@arcgis/core/layers/WFSLayer.js";
 import type CatalogLayer from "@arcgis/core/layers/CatalogLayer.js";
+import type DimensionFeatureLayer from "@arcgis/core/layers/DimensionFeatureLayer.js";
+import type AnnotationFeatureLayer from "@arcgis/core/layers/AnnotationFeatureLayer.js";
 
 /**
  * All supported layer types
  *
  * @internal
  */
-export type FieldInfoLayer = CatalogFootprintLayer | CatalogLayer | CSVLayer | FeatureLayer | GeoJSONLayer | ImageryLayer | ImageryTileLayer | KnowledgeGraphSublayer | OGCFeatureLayer | OrientedImageryLayer | ParquetLayer | SceneLayer | StreamLayer | Sublayer | SubtypeGroupLayer | SubtypeSublayer | VoxelLayer | WCSLayer | WFSLayer;
+export type FieldInfoLayer = AnnotationFeatureLayer | CatalogFootprintLayer | CatalogLayer | CSVLayer | DimensionFeatureLayer | FeatureLayer | GeoJSONLayer | ImageryLayer | ImageryTileLayer | KnowledgeGraphSublayer | OGCFeatureLayer | OrientedImageryLayer | ParquetLayer | SceneLayer | StreamLayer | Sublayer | SubtypeGroupLayer | SubtypeSublayer | VoxelLayer | WCSLayer | WFSLayer;

package/dist/components/arcgis-field-pick-list/customElement.d.ts

@@ -35,6 +35,7 @@ export abstract class ArcgisFieldPickList extends LitElement {
       sort: string;
       selectAll: string;
       deselectAll: string;
+      subFieldsSelected: string;
       noMatches: string;
   } & T9nMeta<{
       ok: string;
@@ -54,6 +55,7 @@ export abstract class ArcgisFieldPickList extends LitElement {
       sort: string;
       selectAll: string;
       deselectAll: string;
+      subFieldsSelected: string;
       noMatches: string;
   }>;
   /** Custom function to distinguish expressions from fields. */
@@ -73,7 +75,7 @@ export abstract class ArcgisFieldPickList extends LitElement {
   accessor filterPlaceholderText: string | undefined;
   /**
    * @deprecated
-   * Pass in grouped lists of fields instead.
+   * Pass in grouped lists of fields instead. Removal target v6.0.0.
    * If true, fields and expressions are placed in separate groups.
    * @default false
    */
@@ -87,7 +89,7 @@ export abstract class ArcgisFieldPickList extends LitElement {
    */
   accessor hideCancel: boolean;
   /**
-   * If true, hides the sort menu button.
+   * If true, hides the top-level sort menu button. Sorting applies directly to any sub-fields.
    *
    * @default false
    */
@@ -95,12 +97,12 @@ export abstract class ArcgisFieldPickList extends LitElement {
   /** Layer instance. */
   accessor layer: FieldPickListLayer | undefined;
   /**
-   * If true, renders without a popover.
+   * If true, renders without a popover (when true, groups of sub-fields are not supported).
    *
    * @default false
    */
   accessor listOnly: boolean;
-  /** @deprecated use view instead */
+  /** @deprecated use view instead. Removal target v6.0.0. */
   accessor mapView: View | undefined;
   /**
    * If true, allows for multiple selection. If false, the
@@ -116,7 +118,7 @@ export abstract class ArcgisFieldPickList extends LitElement {
   /** The initially selected fields. Will use selectedFields[0] when multiple is set to false. */
   accessor selectedFields: string[];
   /**
-   * @deprecated use hideCancel instead
+   * @deprecated use hideCancel instead. Removal target v6.0.0.
    * @default true
    */
   accessor showCancel: boolean;
@@ -145,24 +147,25 @@ export abstract class ArcgisFieldPickList extends LitElement {
    */
   accessor showFieldTypeIcon: boolean;
   /**
-   * If true, displays the filter option based on the number of fields.
+   * The number of selectable fields at which to display the top-level filter option. Sub-fields are included.
    *
    * @default 10
    */
   accessor showFilterLength: number;
   /**
-   * If true, displays a 'Select All' button on top of the list. Valid only if multiple is set to true.
+   * If true, displays a 'Select All' button at the top level of the list. Selection applies directly to any sub-fields.
+   * Valid only if multiple is set to true.
    *
    * @default false
    */
   accessor showSelectionAll: boolean;
   /**
-   * @deprecated use hideSort instead
+   * @deprecated use hideSort instead. Removal target v6.0.0.
    * @default true
    */
   accessor showSort: boolean;
   /**
-   * The initial sort order.
+   * The initial sort order. Sort order applies directly to any sub-fields.
    *
    * @default "default"
    */
@@ -187,11 +190,11 @@ export abstract class ArcgisFieldPickList extends LitElement {
   readonly arcgisDeleteField: import("@arcgis/lumina").TargetedEvent<this, { fieldName: string; }>;
   /** Emitted when the edit icon of a field has been clicked. The field must have PickListFieldInfo.showEditAction set to true. */
   readonly arcgisEditField: import("@arcgis/lumina").TargetedEvent<this, { fieldName: string; }>;
-  /** @deprecated use arcgisChange instead */
+  /** @deprecated use arcgisChange instead. Removal target v6.0.0. */
   readonly arcgisFieldPickListChange: import("@arcgis/lumina").TargetedEvent<this, { selectedFields: string[]; }>;
-  /** @deprecated use arcgisClose instead */
+  /** @deprecated use arcgisClose instead. Removal target v6.0.0. */
   readonly arcgisFieldPickListDismissed: import("@arcgis/lumina").TargetedEvent<this, { selectedFields: string[]; } | void>;
-  /** @deprecated use arcgisSortByChange instead */
+  /** @deprecated use arcgisSortByChange instead. Removal target v6.0.0. */
   readonly arcgisFieldPickListSortByChange: import("@arcgis/lumina").TargetedEvent<this, LastSortBy>;
   /** Emitted when the field pick list sort order has changed. */
   readonly arcgisSortByChange: import("@arcgis/lumina").TargetedEvent<this, LastSortBy>;

package/dist/components/arcgis-field-pick-list/customElement.js

@@ -1,65 +1,100 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.2/LICENSE.txt */
-import { c as F } from "../../chunks/runtime.js";
-import { keyed as y } from "lit/directives/keyed.js";
-import { LitElement as w, createEvent as r, renderElement as $, nothing as h, safeStyleMap as u, safeClassMap as v } from "@arcgis/lumina";
-import { createRef as a, ref as c } from "lit/directives/ref.js";
-import { html as l, css as C } from "lit";
-import { Task as k } from "@lit/task";
-import { log as f, composeMissingPropertyMessage as S } from "@arcgis/toolkit/log";
-import { F as g } from "../../chunks/internal-types.js";
-import { i as x } from "../../chunks/commonFunctions.js";
-import { u as b } from "../../chunks/useT9n.js";
-const n = /* @__PURE__ */ new Map();
-n.set("oid", "key");
-n.set("guid", "key");
-n.set("global-id", "key");
-n.set("blob", "binary");
-n.set("integer", "integer");
-n.set("small-integer", "integer");
-n.set("big-integer", "integer");
-n.set("single", "number");
-n.set("double", "number");
-n.set("long", "number");
-n.set("number", "number");
-n.set("date", "date-time");
-n.set("date-only", "calendar");
-n.set("time-only", "clock");
-n.set("timestamp-offset", "time-zone");
-n.set("string", "string");
-const B = ({ fieldType: m }) => l`<calcite-icon scale=s .icon=${n.get(m)}></calcite-icon>`, E = C`.panel{min-height:250px}.content{max-height:50vh}.field-icons{display:flex;align-items:center;padding:0 var(--calcite-space-sm)}.selection-button-div{padding:var(--calcite-space-2xs) var(--calcite-space-sm-plus)}.no-match-text{padding:var(--calcite-space-md)}.footer{width:100%}.add-cancel-buttons{display:flex;align-content:space-between}`;
-class L extends w {
+import { c as b } from "../../chunks/runtime.js";
+import { keyed as v } from "lit/directives/keyed.js";
+import { repeat as y } from "lit/directives/repeat.js";
+import { LitElement as I, createEvent as h, renderElement as S, nothing as m, safeStyleMap as $, safeClassMap as L } from "@arcgis/lumina";
+import { createRef as p, ref as d } from "lit/directives/ref.js";
+import { html as n, css as x } from "lit";
+import { Task as T } from "@lit/task";
+import { log as w, composeMissingPropertyMessage as k } from "@arcgis/toolkit/log";
+import { F as C } from "../../chunks/internal-types.js";
+import { i as B } from "../../chunks/general.js";
+import { u as E } from "../../chunks/useT9n.js";
+const r = /* @__PURE__ */ new Map();
+r.set("oid", "key");
+r.set("guid", "key");
+r.set("global-id", "key");
+r.set("blob", "binary");
+r.set("integer", "integer");
+r.set("small-integer", "integer");
+r.set("big-integer", "integer");
+r.set("single", "number");
+r.set("double", "number");
+r.set("long", "number");
+r.set("number", "number");
+r.set("date", "date-time");
+r.set("date-only", "calendar");
+r.set("time-only", "clock");
+r.set("timestamp-offset", "time-zone");
+r.set("string", "string");
+const N = ({ fieldType: o }) => n`<calcite-icon scale=s .icon=${r.get(o)}></calcite-icon>`;
+function P(o) {
+  return !!o.length && "fields" in o[0];
+}
+function u(o) {
+  return !!o.length && "subFieldInfos" in o[0];
+}
+function _(o) {
+  return o.filter((e) => u(e.fields));
+}
+function D(o) {
+  return o.flatMap((e) => e.fields);
+}
+function O(o) {
+  return o.flatMap((e) => u(e.fields) ? [] : e.fields);
+}
+function f(o) {
+  return o.flatMap(
+    (e) => u(e.fields) ? e.fields.flatMap((t) => t.subFieldInfos) : e.fields
+  );
+}
+function A(o, e) {
+  return o.flatMap((t) => u(t.fields) ? t.fields.flatMap(
+    (i) => i.subFieldInfos.filter((s) => g(s, e, !0))
+  ) : t.fields.filter((i) => F(i, e)));
+}
+function F(o, e) {
+  return e ? "subFieldInfos" in o ? g(o, e) || o.subFieldInfos.some((t) => g(t, e, !0)) : g(o, e) : !0;
+}
+function g(o, e, t = !1) {
+  return [t ? o.name.split("/").pop() : o.name, o.alias, o.description].some(
+    (s) => s?.toLocaleLowerCase().includes(e.toLocaleLowerCase())
+  );
+}
+const M = x`.panel{min-height:250px}.list-wrapper{max-height:50vh;overflow:auto}.list-controls{display:grid;grid-template-columns:1fr auto}.field-icons{display:flex;align-items:center;padding:0 var(--calcite-space-sm)}.selection-button-div{padding:var(--calcite-space-2xs) var(--calcite-space-sm-plus)}.no-match-text{padding:var(--calcite-space-md)}.footer{width:100%}.add-cancel-buttons{display:flex;align-content:space-between}`;
+class H extends I {
   constructor() {
-    super(...arguments), this._messages = b({ blocking: !0 }), this.popoverNode = a(), this.listNode = a(), this.flowElement = a(), this.panelElement = a(), this.dropdownNode = a(), this.fieldInfoFlowItemEl = a(), this.allLists = [], this.filterText = "", this.panelCutOffHeight = 0, this._propWatcherTask = new k(this, {
+    super(...arguments), this._messages = E({ blocking: !0 }), this.popoverNode = p(), this.listWrapper = p(), this.listNode = p(), this.flowElement = p(), this.panelElement = p(), this.dropdownNode = p(), this.fieldInfoFlowItemEl = p(), this.allLists = [], this.filterText = "", this.panelCutOffHeight = 0, this.initialized = !1, this._propWatcherTask = new T(this, {
       task: async ([e]) => {
-        if (!this.listOnly && !x(e?.refElement))
-          throw f("error", this, S("popoverProps")), new Error();
+        if (!this.listOnly && !B(e?.refElement))
+          throw w("error", this, k("popoverProps")), new Error();
         this._propWatcherTask.autoRun = !1;
       },
       args: () => [this.popoverProps]
-    }), this.fields = [], this.selectedFields = [], this.listOnly = !1, this.showFieldInfo = !1, this.showFieldTypeIcon = !1, this.showFieldName = !1, this.showDescription = !1, this.showSelectionAll = !1, this.showCancel = !0, this.hideCancel = !1, this.showSort = !0, this.hideSort = !1, this.showFilterLength = 10, this.multiple = !1, this.sortBy = "default", this.groupFieldsAndExpressions = !1, this.arcgisChange = r(), this.arcgisClose = r(), this.arcgisFieldPickListChange = r(), this.arcgisFieldPickListDismissed = r(), this.arcgisFieldPickListSortByChange = r(), this.arcgisSortByChange = r(), this.arcgisEditField = r(), this.arcgisDeleteField = r();
+    }), this.fields = [], this.selectedFields = [], this.listOnly = !1, this.showFieldInfo = !1, this.showFieldTypeIcon = !1, this.showFieldName = !1, this.showDescription = !1, this.showSelectionAll = !1, this.showCancel = !0, this.hideCancel = !1, this.showSort = !0, this.hideSort = !1, this.showFilterLength = 10, this.multiple = !1, this.sortBy = "default", this.groupFieldsAndExpressions = !1, this.arcgisChange = h(), this.arcgisClose = h(), this.arcgisDeleteField = h(), this.arcgisEditField = h(), this.arcgisFieldPickListChange = h(), this.arcgisFieldPickListDismissed = h(), this.arcgisFieldPickListSortByChange = h(), this.arcgisSortByChange = h();
   }
   static {
     this.properties = { lastSortBy: 16, filterFields: 16, mapView: 0, view: 0, layer: 0, fields: 0, selectedFields: 0, listOnly: 5, popoverProps: 0, showFieldInfo: 5, showFieldTypeIcon: 5, showFieldName: 5, showDescription: 5, showSelectionAll: 5, showCancel: 5, hideCancel: 5, showSort: 5, hideSort: 5, showFilterLength: 9, multiple: 5, heading: 1, okBtnText: 1, filterPlaceholderText: 1, filterNoResultsText: 1, sortBy: 1, groupFieldsAndExpressions: 5, fieldsGroupHeading: 1, expressionsGroupHeading: 1, customExpressionCheck: 0 };
   }
   static {
-    this.styles = E;
+    this.styles = M;
   }
   async reposition() {
     await this.popoverNode.value?.reposition();
   }
+  async setDisabled(e) {
+    this.panelElement.value && (this.panelElement.value.disabled = e);
+  }
   async setFocus() {
     setTimeout(() => requestAnimationFrame(() => {
       this.listOnly ? this.listNode.value?.setFocus() : this.panelElement.value?.setFocus();
     }), 1);
   }
-  async setDisabled(e) {
-    this.panelElement.value && (this.panelElement.value.disabled = e);
-  }
   load() {
-    !this.view && this.mapView && (this.view = this.mapView), !this.showCancel && !this.hideCancel && (this.hideCancel = !0), !this.showSort && !this.hideSort && (this.hideSort = !0), this.listOnly && this.showFieldInfo && (this.showFieldInfo = !1, f("info", this, "showFieldInfo is not supported if listOnly is true.")), !this.multiple && this.selectedFields.length > 1 && (this.selectedFields = [this.selectedFields[0]]), this.lastSortBy = this.sortBy ?? this.lastSortBy, this.updateGroupedLists();
+    !this.view && this.mapView && (this.view = this.mapView), !this.showCancel && !this.hideCancel && (this.hideCancel = !0), !this.showSort && !this.hideSort && (this.hideSort = !0), this.listOnly && this.showFieldInfo && (this.showFieldInfo = !1, w("info", this, "showFieldInfo is not supported if listOnly is true.")), !this.multiple && this.selectedFields.length > 1 && (this.selectedFields = [this.selectedFields[0]]), this.lastSortBy = this.sortBy ?? this.lastSortBy, this.updateGroupedLists(), this.initialized = !0;
   }
   willUpdate(e) {
-    (e.has("fields") || e.has("lastSortBy") || e.has("customExpressionCheck")) && this.updateGroupedLists();
+    this.initialized && (e.has("fields") || e.has("sortBy") || e.has("lastSortBy") || e.has("customExpressionCheck")) && (e.has("sortBy") && (this.lastSortBy = this.sortBy ?? this.lastSortBy), this.updateGroupedLists());
   }
   loaded() {
     this.setUpObserver(), this.listOnly ? this.listNode.value?.setFocus() : (this.flowElement.value?.setFocus(), this.checkMaxHeight());
@@ -81,21 +116,21 @@ class L extends w {
       const e = this.panelElement.value?.getBoundingClientRect();
       if (e && e.bottom > window.innerHeight) {
         this.panelCutOffHeight = e.height - (e.bottom - window.innerHeight) - 5;
-        const t = this.listNode.value?.getBoundingClientRect();
-        t && (this.listNode.value.style.maxHeight = `${t.height - (e.bottom - window.innerHeight) - 5}px`);
+        const t = this.listWrapper.value?.getBoundingClientRect();
+        t && (this.listWrapper.value.style.maxHeight = `${t.height - (e.bottom - window.innerHeight) - 5}px`);
       }
     }
   }
   getSortedList(e) {
     let t = [...e];
     const i = t.filter((s) => s.type === "none");
-    return t = t.filter((s) => s.type !== "none"), this.lastSortBy === "display" ? t.sort((s, o) => s.alias.localeCompare(o.alias)) : this.lastSortBy === "field" ? t.sort((s, o) => s.name.localeCompare(o.name)) : this.lastSortBy === "type" && t.sort((s, o) => s.type.localeCompare(o.type)), t = t.concat(i), t;
+    return t = t.filter((s) => s.type !== "none"), this.lastSortBy === "display" ? t.sort((s, l) => s.alias.localeCompare(l.alias)) : this.lastSortBy === "field" ? t.sort((s, l) => s.name.localeCompare(l.name)) : this.lastSortBy === "type" && t.sort((s, l) => s.type.localeCompare(l.type)), t = t.concat(i), t;
   }
   isExpression(e) {
-    return this.customExpressionCheck ? this.customExpressionCheck(e) : e.name.includes(g.expression);
+    return this.customExpressionCheck ? this.customExpressionCheck(e) : e.name.includes(C.expression);
   }
   canDeselectAll() {
-    const e = this.getAllFields();
+    const e = f(this.allLists);
     return this.filterFields?.length ? this.filterContainsAll() : this.selectedFields.length === e.length;
   }
   filterContainsAll() {
@@ -103,47 +138,79 @@ class L extends w {
   }
   showFieldInfoCheck(e) {
     const { layer: t } = this;
-    return this.showFieldInfo ? !(!t || this.isExpression(e) || e.name.includes(g.relationship) || e.type === "none") : !1;
+    return this.showFieldInfo ? !(!t || this.isExpression(e) || e.name.includes(C.relationship) || e.type === "none") : !1;
   }
   updateGroupedLists() {
-    if (!this.fields)
-      return;
-    if (this.allLists = [], this.usingCustomGroups())
-      for (const t of this.fields)
-        this.allLists.push({
-          title: t.title,
-          fields: [...this.getSortedList(t.fields)]
-        });
-    else
-      this.allLists = this.groupFieldsAndExpressions ? [
-        {
-          title: this.expressionsGroupHeading,
-          fields: [...this.getSortedList(this.fields)].filter((t) => this.isExpression(t))
-        },
-        {
-          title: this.fieldsGroupHeading,
-          fields: [...this.getSortedList(this.fields)].filter((t) => !this.isExpression(t))
+    if (this.fields)
+      if (this.allLists = [], P(this.fields))
+        for (const e of this.fields) {
+          if (this.listOnly && u(e.fields)) {
+            w("error", this, "subFieldInfos are not supported if listOnly is true.");
+            continue;
+          }
+          this.allLists.push({
+            title: e.title,
+            fields: this.getSortedGroupFields(e.fields)
+          });
         }
-      ] : [
-        {
-          title: void 0,
-          fields: [...this.getSortedList(this.fields)]
-        }
-      ];
+      else
+        this.allLists = this.groupFieldsAndExpressions ? [
+          {
+            title: this.expressionsGroupHeading,
+            fields: [...this.getSortedList(this.fields)].filter((e) => this.isExpression(e))
+          },
+          {
+            title: this.fieldsGroupHeading,
+            fields: [...this.getSortedList(this.fields)].filter((e) => !this.isExpression(e))
+          }
+        ] : [
+          {
+            title: void 0,
+            fields: this.getSortedList(this.fields)
+          }
+        ];
+  }
+  getSortedGroupFields(e) {
+    return u(e) ? this.getSortedList(e).map((t) => ({
+      ...t,
+      subFieldInfos: this.getSortedList(t.subFieldInfos).map((i) => ({
+        ...i,
+        // ensure uniqueness
+        name: `${t.name}/${i.name}`
+      }))
+    })) : this.getSortedList(e);
   }
   addFieldInfoFlowItem(e, t) {
-    const i = this.flowElement.value, s = $(l`<calcite-flow-item selected .heading=${e.alias ?? e.name} .description=${e.name} class="panel" style=${u(this.panelCutOffHeight > 0 ? `max-height: ${this.panelCutOffHeight}px` : "max-height: 50vh")} @calciteFlowItemBack=${(o) => {
-      o.currentTarget.remove(), this.fieldInfoFlowItemEl.value.selected = !1, this.panelElement.value.selected = !0, setTimeout(() => {
+    const i = this.flowElement.value, s = S(n`<calcite-flow-item selected .heading=${e.alias ?? e.name} .description=${e.name} class="panel" style=${$(this.panelCutOffHeight > 0 ? `max-height: ${this.panelCutOffHeight}px` : "max-height: 50vh")} @calciteFlowItemBack=${(l) => {
+      l.currentTarget.remove(), this.fieldInfoFlowItemEl.value.selected = !1, this.panelElement.value.selected = !0, setTimeout(() => {
+        t.setFocus();
+      }, 300);
+    }} ${d(this.fieldInfoFlowItemEl)}><arcgis-field-info lang=${this._messages._lang ?? m} .fieldName=${e.name} .layer=${this.layer} .view=${this.view} class="content"></arcgis-field-info></calcite-flow-item>`);
+    i.appendChild(s), this.panelElement.value.selected = !1, setTimeout(() => {
+      this.fieldInfoFlowItemEl?.value.setFocus();
+    }, 1);
+  }
+  addSubFieldInfoFlowItem(e, t) {
+    const i = this.flowElement.value, s = e.subFieldInfos.filter((a) => g(a, this.filterText, !0)), l = S(n`<calcite-flow-item selected .heading=${e.alias ?? e.name} .description=${e.description ?? void 0} class="panel" style=${$(this.panelCutOffHeight > 0 ? `max-height: ${this.panelCutOffHeight}px` : "max-height: 50vh")} @calciteFlowItemBack=${(a) => {
+      a.currentTarget.remove(), this.fieldInfoFlowItemEl.value.selected = !1, this.panelElement.value.selected = !0, setTimeout(() => {
         t.setFocus();
       }, 300);
-    }} ${c(this.fieldInfoFlowItemEl)}><arcgis-field-info lang=${this._messages._lang ?? h} .fieldName=${e.name} .layer=${this.layer} .view=${this.view} class="content"></arcgis-field-info></calcite-flow-item>`);
-    i.appendChild(s), this.panelElement.value.selected = !1, this.fieldInfoFlowItemEl?.value.setFocus();
+    }} ${d(this.fieldInfoFlowItemEl)}><calcite-list .label=${e.alias ?? e.name} .selectionMode=${this.multiple ? "multiple" : "single"} @calciteListChange=${(a) => {
+      this.updateSelectedFieldsForList(a.currentTarget, e.subFieldInfos), this.arcgisChange.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListChange.emit({ selectedFields: this.selectedFields }), this.multiple || (this.arcgisClose.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListDismissed.emit({ selectedFields: this.selectedFields }));
+    }}>${s.map((a) => this.renderCalciteListItem(a, !1))}</calcite-list>${this.filterText && !s.length && this.filterNoResultsText?.length !== 0 ? n`<div class="no-match-text">${this.filterNoResultsText ?? this._messages.noMatches}</div>` : null}</calcite-flow-item>`);
+    i.appendChild(l), this.panelElement.value.selected = !1, setTimeout(() => {
+      this.fieldInfoFlowItemEl.value?.setFocus();
+    }, 1);
   }
-  usingCustomGroups() {
-    return !!this.fields.length && "fields" in this.fields[0];
+  shouldRenderSelectionButton(e) {
+    return this.multiple && this.showSelectionAll && (!e || !this.filterText || !!this.filterFields?.length);
   }
-  getAllFields() {
-    return this.allLists.map((e) => e.fields).flat();
+  handleListSelectionChange(e) {
+    this.updateSelectedFieldsForList(this.listNode.value, e), this.arcgisChange.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListChange.emit({ selectedFields: this.selectedFields }), this.multiple || (this.arcgisClose.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListDismissed.emit({ selectedFields: this.selectedFields }));
+  }
+  updateSelectedFieldsForList(e, t) {
+    const i = new Set(t.map((c) => c.name)), s = e.selectedItems.map((c) => c.value), l = this.selectedFields.filter((c) => !i.has(c) || s.includes(c)), a = s.filter((c) => !this.selectedFields.includes(c));
+    this.selectedFields = this.multiple ? [.../* @__PURE__ */ new Set([...l, ...a])] : s, this.reorderSelectedFieldsByCurrentListOrder();
   }
   setSortBy(e) {
     this.lastSortBy = e, this.updateGroupedLists(), this.arcgisSortByChange.emit(this.lastSortBy), this.arcgisFieldPickListSortByChange.emit(this.lastSortBy), this.reorderSelectedFieldsByCurrentListOrder() && (this.arcgisChange.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListChange.emit({ selectedFields: this.selectedFields }));
@@ -151,10 +218,10 @@ class L extends w {
   reorderSelectedFieldsByCurrentListOrder() {
     if (!this.selectedFields.length)
       return !1;
-    const e = this.getAllFields().map((o) => o.name), t = new Set(this.selectedFields), i = e.filter((o) => t.has(o)), s = (
+    const e = f(this.allLists).map((l) => l.name), t = new Set(this.selectedFields), i = e.filter((l) => t.has(l)), s = (
       // adding/removing fields
       i.length !== this.selectedFields.length || // reordering fields
-      i.some((o, p) => o !== this.selectedFields[p])
+      i.some((l, a) => l !== this.selectedFields[a])
     );
     return s && (this.selectedFields = [...i]), s;
   }
@@ -164,64 +231,80 @@ class L extends w {
         if (this.listOnly)
           return this.renderList();
         const e = this.heading || (this.multiple ? this._messages.headerSelect : this._messages.header), t = this.popoverProps;
-        return this.el.classList.add("js-app-flyout"), l`<calcite-popover .placement=${t.placement ?? "leading-start"} open pointer-disabled .referenceElement=${t.refElement} .offsetDistance=${t.offsetDistance ?? -Math.round(t.refElement.getBoundingClientRect().width)} .offsetSkidding=${t.offsetSkidding ?? 0} .overlayPositioning=${t.overlayPositioning} trigger-disabled .autoClose=${t.autoClose} .label=${this.heading ?? (this.multiple ? this._messages.headerSelect : this._messages.header) ?? ""} @calcitePopoverClose=${() => {
+        return this.el.classList.add("js-app-flyout"), v(`${t.autoClose}`, n`<calcite-popover .placement=${t.placement ?? "leading-start"} open pointer-disabled .referenceElement=${t.refElement} .offsetDistance=${t.offsetDistance ?? -Math.round(t.refElement.getBoundingClientRect().width)} .offsetSkidding=${t.offsetSkidding ?? 0} .overlayPositioning=${t.overlayPositioning} trigger-disabled .autoClose=${t.autoClose} .label=${this.heading ?? (this.multiple ? this._messages.headerSelect : this._messages.header) ?? ""} @calcitePopoverClose=${() => {
           this.arcgisClose.emit(), this.arcgisFieldPickListDismissed.emit();
-        }} ${c(this.popoverNode)}><calcite-flow style=${u({
+        }} ${d(this.popoverNode)}><calcite-flow style=${$({
           width: `${t.popoverWidth ?? t.refElement.getBoundingClientRect().width}px`,
           ...t.maxHeight && { maxHeight: t.maxHeight }
-        })} ${c(this.flowElement)}><calcite-flow-item class="panel" .heading=${e} closable @calciteFlowItemClose=${() => {
+        })} ${d(this.flowElement)}><calcite-flow-item class="panel" .heading=${e} closable @calciteFlowItemClose=${() => {
           this.arcgisClose.emit(), this.arcgisFieldPickListDismissed.emit();
-        }} ${c(this.panelElement)}><slot slot=content-top name=content-top></slot>${this.renderList()}<slot slot=content-bottom name=content-bottom></slot>${(this.multiple || !this.hideCancel) && l`<div slot=footer class="footer"><slot name=content-footer></slot>${this.multiple && !this.hideCancel ? l`<div class="add-cancel-buttons">${this.renderAddButton()}${this.renderCancelButton()}</div>` : l`${this.renderAddButton()}${this.renderCancelButton()}`}</div>` || ""}</calcite-flow-item></calcite-flow></calcite-popover>`;
+        }} ${d(this.panelElement)}><slot slot=content-top name=content-top></slot>${this.renderList()}<slot slot=content-bottom name=content-bottom></slot>${(this.multiple || !this.hideCancel) && n`<div slot=footer class="footer"><slot name=content-footer></slot>${this.multiple && !this.hideCancel ? n`<div class="add-cancel-buttons">${this.renderAddButton()}${this.renderCancelButton()}</div>` : n`${this.renderAddButton()}${this.renderCancelButton()}`}</div>` || ""}</calcite-flow-item></calcite-flow></calcite-popover>`);
       },
       error: () => ""
     });
   }
   renderList() {
-    const e = this.heading || (this.multiple ? this._messages.headerSelect : this._messages.header), t = this.getAllFields(), i = t.length >= this.showFilterLength;
-    return l`${t.length ? l`<calcite-list .label=${e} .selectionMode=${this.multiple ? "multiple" : "single"} class=${v(this.listOnly ? "" : "content")} .filterEnabled=${i} .filterPlaceholder=${this.filterPlaceholderText ?? this._messages.filter} @calciteListChange=${() => {
-      const s = this.listNode.value.selectedItems.map((d) => d.value), o = this.selectedFields.filter((d) => s.includes(d)), p = s.filter((d) => !this.selectedFields.includes(d));
-      this.selectedFields = [.../* @__PURE__ */ new Set([...o, ...p])], this.reorderSelectedFieldsByCurrentListOrder(), this.arcgisChange.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListChange.emit({ selectedFields: this.selectedFields }), this.multiple || (this.arcgisClose.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListDismissed.emit({ selectedFields: this.selectedFields }));
-    }} @calciteListFilter=${(s) => {
-      s.stopPropagation(), this.filterFields = this.listNode.value.filteredItems?.map((o) => o.value), this.filterText = this.listNode.value.filterText;
-    }} ${c(this.listNode)}>${this.renderSortButton()}<slot name=content-center></slot>${this.multiple && this.showSelectionAll && (!i || !this.filterText || this.filterFields?.length) ? this.renderSelectionButton() : null}${this.renderListItems()}</calcite-list>` : l`<slot name=no-fields></slot>`}${this.filterFields && !this.filterFields.length && this.listNode.value && this.filterNoResultsText?.length !== 0 ? l`<div class="no-match-text">${this.filterNoResultsText ?? this._messages.noMatches}</div>` : null}`;
-  }
-  renderSortButton() {
-    const e = this.getAllFields();
-    if (!(e.length >= this.showFilterLength && !this.hideSort))
+    const e = this.heading || (this.multiple ? this._messages.headerSelect : this._messages.header), t = O(this.allLists), i = _(this.allLists), s = f(this.allLists).length >= this.showFilterLength;
+    return t.length || i.length ? i.length ? this.renderSplitLists(t, i, s) : this.renderTopLevelOnlyFieldList(e, t, s) : n`<slot name=no-fields></slot>`;
+  }
+  renderSplitLists(e, t, i) {
+    const s = f(this.allLists), l = D(this.allLists).some((a) => F(a, this.filterText));
+    return n`${i ? n`<div class="list-controls"><calcite-filter .items=${s} .filterProps=${["name", "alias", "description"]} .placeholder=${this.filterPlaceholderText ?? this._messages.filter} @calciteFilterChange=${(a) => {
+      this.filterText = a.currentTarget.value, this.filterFields = this.filterText ? A(this.allLists, this.filterText).map((c) => c.name) : void 0;
+    }}></calcite-filter>${this.renderSortButton()}</div>` : null}<div class=${L(this.listOnly ? "" : "list-wrapper")} ${d(this.listWrapper)}>${this.shouldRenderSelectionButton(i) ? this.renderSelectionButton() : null}${this.renderSplitSubFieldLists(t)}${e.length ? this.renderSplitTopLevelFieldList(e, !0) : null}</div>${this.filterText && !l && this.filterNoResultsText?.length !== 0 ? n`<div class="no-match-text">${this.filterNoResultsText ?? this._messages.noMatches}</div>` : null}`;
+  }
+  renderSplitSubFieldLists(e) {
+    const t = e.map((i) => ({
+      ...i,
+      fields: i.fields.filter((s) => F(s, this.filterText))
+    })).filter((i) => !!i.fields.length);
+    return y(t, (i) => i.title, (i) => n`<calcite-list selection-mode=none .label=${i.title ?? this.heading ?? ""}><calcite-list-item-group .heading=${i.title}>${y(i.fields, (s) => s.name, (s) => n`<calcite-list-item .label=${s.alias || s.name} .description=${this.multiple ? this._messages.subFieldsSelected.replace("${count}", `${s.subFieldInfos.filter((l) => this.selectedFields.includes(l.name)).length}`) : void 0} .value=${s.name} @click=${(l) => this.addSubFieldInfoFlowItem(s, l.currentTarget)} @keydown=${(l) => {
+      l.key === "Enter" && this.addSubFieldInfoFlowItem(s, l.currentTarget);
+    }}><calcite-icon slot=actions-end icon=chevron-right flip-rtl scale=s></calcite-icon></calcite-list-item>`)}</calcite-list-item-group></calcite-list>`);
+  }
+  renderSplitTopLevelFieldList(e, t) {
+    return n`<calcite-list .label=${this.heading || (this.multiple ? this._messages.headerSelect : this._messages.header)} .selectionMode=${this.multiple ? "multiple" : "single"} @calciteListChange=${() => this.handleListSelectionChange(e)} ${d(this.listNode)}><slot name=content-center></slot>${this.renderGroupedListItems(t)}</calcite-list>`;
+  }
+  renderTopLevelOnlyFieldList(e, t, i) {
+    return n`<div class=${L(this.listOnly ? "" : "list-wrapper")} ${d(this.listWrapper)}><calcite-list .label=${e} .selectionMode=${this.multiple ? "multiple" : "single"} .filterEnabled=${i} .filterPlaceholder=${this.filterPlaceholderText ?? this._messages.filter} @calciteListChange=${() => this.handleListSelectionChange(t)} @calciteListFilter=${(s) => {
+      s.stopPropagation(), this.filterFields = this.listNode.value.filteredItems?.map((l) => l.value), this.filterText = this.listNode.value.filterText;
+    }} ${d(this.listNode)}>${this.renderSortButton("filter-actions-end")}${this.shouldRenderSelectionButton(i) ? this.renderSelectionButton() : null}<slot name=content-center></slot>${this.renderGroupedListItems(!1)}</calcite-list></div>`;
+  }
+  renderSortButton(e) {
+    const t = f(this.allLists);
+    if (!(t.length >= this.showFilterLength && !this.hideSort))
       return "";
-    const i = e.every((s) => !!s.type);
-    return l`<calcite-dropdown slot=filter-actions-end placement=bottom-end overlay-positioning=fixed .disabled=${this.filterFields ? this.filterFields.length < 4 : !1} @calciteDropdownOpen=${() => {
+    const s = t.every((l) => !!l.type);
+    return n`<calcite-dropdown slot=${e ?? m} placement=bottom-end overlay-positioning=fixed @calciteDropdownOpen=${() => {
       this.observer?.disconnect(), this.popoverNode.value && this.observer?.observe(this.popoverNode.value, { attributes: !0 });
-    }} @calciteDropdownClose=${() => this.observer?.disconnect()} ${c(this.dropdownNode)}><calcite-action slot=trigger .text=${this._messages.sort ?? ""} title=${this._messages.sort ?? h}><calcite-icon scale=s icon=sortDescending flip-rtl></calcite-icon></calcite-action><calcite-dropdown-group><calcite-dropdown-item .selected=${this.lastSortBy === "default"} @click=${() => this.setSortBy("default")} @keydown=${(s) => {
-      s.stopPropagation(), (s.key === " " || s.key === "Enter") && this.setSortBy("default");
-    }}>${this._messages.default}</calcite-dropdown-item><calcite-dropdown-item .selected=${this.lastSortBy === "display"} @click=${() => this.setSortBy("display")} @keydown=${(s) => {
-      s.stopPropagation(), (s.key === " " || s.key === "Enter") && this.setSortBy("display");
-    }}>${this._messages.displayName}</calcite-dropdown-item>${i && l`<calcite-dropdown-item .selected=${this.lastSortBy === "type"} @click=${() => this.setSortBy("type")} @keydown=${(s) => {
-      s.stopPropagation(), (s.key === " " || s.key === "Enter") && this.setSortBy("type");
-    }}>${this._messages.type}</calcite-dropdown-item>` || ""}<calcite-dropdown-item .selected=${this.lastSortBy === "field"} @click=${() => this.setSortBy("field")} @keydown=${(s) => {
-      s.stopPropagation(), (s.key === " " || s.key === "Enter") && this.setSortBy("field");
-    }}>${this._messages.fieldName}</calcite-dropdown-item></calcite-dropdown-group></calcite-dropdown>`;
+    }} @calciteDropdownClose=${() => this.observer?.disconnect()} ${d(this.dropdownNode)}><calcite-action slot=trigger .text=${this._messages.sort ?? ""} title=${this._messages.sort ?? m}><calcite-icon scale=s icon=sortDescending flip-rtl></calcite-icon></calcite-action><calcite-dropdown-group><calcite-dropdown-item .selected=${this.lastSortBy === "default"} @calciteDropdownItemSelect=${() => this.setSortBy("default")}>${this._messages.default}</calcite-dropdown-item><calcite-dropdown-item .selected=${this.lastSortBy === "display"} @calciteDropdownItemSelect=${() => this.setSortBy("display")}>${this._messages.displayName}</calcite-dropdown-item>${s && n`<calcite-dropdown-item .selected=${this.lastSortBy === "type"} @calciteDropdownItemSelect=${() => this.setSortBy("type")}>${this._messages.type}</calcite-dropdown-item>` || ""}<calcite-dropdown-item .selected=${this.lastSortBy === "field"} @calciteDropdownItemSelect=${() => this.setSortBy("field")}>${this._messages.fieldName}</calcite-dropdown-item></calcite-dropdown-group></calcite-dropdown>`;
   }
   renderSelectionButton() {
-    return l`<div class="selection-button-div"><calcite-button appearance=transparent scale=s width=full @click=${() => {
+    return n`<div class="selection-button-div"><calcite-button appearance=transparent scale=s width=full @click=${() => {
       if (this.canDeselectAll())
         this.selectedFields = this.filterFields?.length ? this.selectedFields.filter((e) => !this.filterFields?.includes(e)) : [];
       else if (this.filterFields?.length)
         this.selectedFields = [.../* @__PURE__ */ new Set([...this.selectedFields, ...this.filterFields])];
       else {
-        const t = this.getAllFields();
+        const t = f(this.allLists);
         this.selectedFields = t.map((i) => i.name);
       }
       this.reorderSelectedFieldsByCurrentListOrder(), this.arcgisChange.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListChange.emit({ selectedFields: this.selectedFields });
     }}>${this.canDeselectAll() ? this._messages.deselectAll : this._messages.selectAll}</calcite-button></div>`;
   }
-  renderListItems() {
-    const e = this.allLists.filter((t) => !!t.fields.length);
-    return e.length === 1 && !e[0].title ? e[0].fields.map((t) => this.renderCalciteListItem(t)) : e.map((i) => l`<calcite-list-item-group .heading=${i.title}>${i.fields.map((s) => this.renderCalciteListItem(s))}</calcite-list-item-group>`);
+  renderGroupedListItems(e) {
+    const t = this.allLists.filter((i) => !!i.fields.length && !u(i.fields)).map((i) => ({
+      ...i,
+      fields: e ? i.fields.filter((s) => F(s, this.filterText)) : i.fields
+    })).filter((i) => !!i.fields.length);
+    return t.length === 1 && !t[0].title ? this.renderListItems(t[0].fields) : t.map((s) => n`<calcite-list-item-group .heading=${s.title}>${this.renderListItems(s.fields)}</calcite-list-item-group>`);
+  }
+  renderListItems(e) {
+    return e.map((t) => this.renderCalciteListItem(t));
   }
-  renderCalciteListItem(e) {
-    const t = this.showFieldInfoCheck(e), i = this.showFieldTypeIcon && !!e.type;
-    return y(e.name, l`<calcite-list-item .label=${e.alias || e.name} .description=${(() => {
+  renderCalciteListItem(e, t = !0) {
+    const i = t && this.showFieldInfoCheck(e), s = this.showFieldTypeIcon && !!e.type;
+    return v(e.name, n`<calcite-list-item .label=${e.alias || e.name} .description=${(() => {
       if (this.showFieldName && e.hideFieldName !== !0)
         return `{${e.name}}`;
       if (this.showDescription && e.hideDescription !== !0 && e.description)
@@ -229,40 +312,40 @@ class L extends w {
     })()} .value=${e.name} .selected=${!this.multiple && e.name === this.selectedFields[0] || this.multiple && this.selectedFields.includes(e.name)} .metadata=${{
       label: e.alias,
       fieldName: e.name
-    }}>${i && l`<div slot=actions-end class="field-icons">${B({ fieldType: e.type })}</div>` || ""}${this.renderInfoAction(e, t)}${this.renderEditAction(e)}${this.renderDeleteAction(e)}</calcite-list-item>`);
+    }}>${s && n`<div slot=actions-end class="field-icons">${N({ fieldType: e.type })}</div>` || ""}${this.renderInfoAction(e, i)}${this.renderEditAction(e)}${this.renderDeleteAction(e)}</calcite-list-item>`);
   }
   renderInfoAction(e, t) {
     const { _messages: i } = this;
-    return t ? l`<calcite-action slot=actions-end .text=${i.info} title=${i.info ?? h} scale=s icon=information @click=${(s) => {
+    return t ? n`<calcite-action slot=actions-end .text=${i.info} title=${i.info ?? m} scale=s icon=information @click=${(s) => {
       s.stopPropagation();
-      const o = s.currentTarget;
-      this.addFieldInfoFlowItem(e, o);
+      const l = s.currentTarget;
+      this.addFieldInfoFlowItem(e, l);
     }}></calcite-action>` : "";
   }
   renderEditAction(e) {
     const { _messages: t } = this;
-    return e.showEditAction ? l`<calcite-action slot=actions-end .text=${t.edit} title=${t.edit ?? h} scale=s icon=pencil @click=${(i) => {
+    return e.showEditAction ? n`<calcite-action slot=actions-end .text=${t.edit} title=${t.edit ?? m} scale=s icon=pencil @click=${(i) => {
       i.stopPropagation(), this.arcgisEditField.emit({ fieldName: e.name });
     }}></calcite-action>` : "";
   }
   renderDeleteAction(e) {
     const { _messages: t } = this;
-    return e.showDeleteAction ? l`<calcite-action slot=actions-end .text=${t.delete} title=${t.delete ?? h} scale=s icon=trash @click=${(i) => {
+    return e.showDeleteAction ? n`<calcite-action slot=actions-end .text=${t.delete} title=${t.delete ?? m} scale=s icon=trash @click=${(i) => {
       i.stopPropagation(), this.arcgisDeleteField.emit({ fieldName: e.name });
     }}></calcite-action>` : "";
   }
   renderAddButton() {
-    return this.multiple ? l`<calcite-button .appearance=${this.hideCancel ? "outline-fill" : "solid"} .width=${this.hideCancel ? "full" : "half"} @click=${() => {
+    return this.multiple ? n`<calcite-button .appearance=${this.hideCancel ? "outline-fill" : "solid"} .width=${this.hideCancel ? "full" : "half"} @click=${() => {
       this.arcgisClose.emit({ selectedFields: this.selectedFields }), this.arcgisFieldPickListDismissed.emit({ selectedFields: this.selectedFields });
     }}>${this.okBtnText || (this.multiple ? this._messages.done : this._messages.ok)}</calcite-button>` : "";
   }
   renderCancelButton() {
-    return this.hideCancel ? "" : l`<calcite-button appearance=outline-fill .width=${this.multiple ? "half" : "full"} @click=${() => {
+    return this.hideCancel ? "" : n`<calcite-button appearance=outline-fill .width=${this.multiple ? "half" : "full"} @click=${() => {
       this.arcgisClose.emit(), this.arcgisFieldPickListDismissed.emit();
     }}>${this._messages.cancel}</calcite-button>`;
   }
 }
-F("arcgis-field-pick-list", L);
+b("arcgis-field-pick-list", H);
 export {
-  L as ArcgisFieldPickList
+  H as ArcgisFieldPickList
 };

package/dist/components/arcgis-field-pick-list/index.js

@@ -1,14 +1,15 @@
 import "@esri/calcite-components/components/calcite-icon";
 import "@esri/calcite-components/components/calcite-flow-item";
 import "../arcgis-field-info/index.js";
+import "@esri/calcite-components/components/calcite-list";
 import "@esri/calcite-components/components/calcite-popover";
 import "@esri/calcite-components/components/calcite-flow";
-import "@esri/calcite-components/components/calcite-list";
+import "@esri/calcite-components/components/calcite-filter";
+import "@esri/calcite-components/components/calcite-list-item-group";
+import "@esri/calcite-components/components/calcite-list-item";
 import "@esri/calcite-components/components/calcite-dropdown";
 import "@esri/calcite-components/components/calcite-action";
 import "@esri/calcite-components/components/calcite-dropdown-group";
 import "@esri/calcite-components/components/calcite-dropdown-item";
 import "@esri/calcite-components/components/calcite-button";
-import "@esri/calcite-components/components/calcite-list-item-group";
-import "@esri/calcite-components/components/calcite-list-item";
 export * from "./customElement.js";