@esri/solutions-components 1.2.0-next.95 → 1.2.0-next.97

package/dist/components/refine-selection/customElement.js

@@ -1,19 +1,20 @@
-import { c as I } from "../../chunks/runtime.js";
-import { b as o, f as L, d as f } from "../../chunks/interfaces.js";
-import { g as b, b as v, c as k } from "../../chunks/mapViewUtils.js";
-import { a as E } from "../../chunks/queryUtils.js";
-import { u as x } from "../../chunks/useT9n.js";
-import { createRef as _, ref as m } from "lit-html/directives/ref.js";
-import { LitElement as G, createEvent as w, noShadowRoot as $, safeClassMap as C } from "@arcgis/lumina";
-import { css as D, html as p } from "lit";
-import { useContextConsumer as A } from "@arcgis/lumina/context";
-import { p as O } from "../../chunks/publicNotificationContext.js";
-import R from "@arcgis/core/Graphic";
-import V from "@arcgis/core/layers/GraphicsLayer";
 /*! All material copyright Esri, All Rights Reserved, unless otherwise specified.
 See https://js.arcgis.com/1.2/esri/copyright.txt for details.
-v1.2.0-next.94 */
-const T = D`@layer{/** @license
+v1.2.0-next.96 */
+import { c as customElement } from "../../chunks/runtime.js";
+import { b as ESelectionMode, f as EDrawMode, d as EWorkflowType } from "../../chunks/interfaces.js";
+import { g as getFeatureLayerView, b as getIdSets, c as highlightAllFeatures } from "../../chunks/mapViewUtils.js";
+import { a as queryFeaturesByGeometry } from "../../chunks/queryUtils.js";
+import { u as useT9n } from "../../chunks/useT9n.js";
+import { createRef, ref } from "lit-html/directives/ref.js";
+import { LitElement, createEvent, noShadowRoot, safeClassMap } from "@arcgis/lumina";
+import { css, html } from "lit";
+import { useContextConsumer } from "@arcgis/lumina/context";
+import { p as pnContext } from "../../chunks/publicNotificationContext.js";
+import Graphic from "@arcgis/core/Graphic";
+import GraphicsLayer from "@arcgis/core/layers/GraphicsLayer";
+const styles = css`@layer{
+/** @license
  * Copyright 2025 Esri
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,240 +28,483 @@ const T = D`@layer{/** @license
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- */:host{display:block}.div-not-visible{display:none!important}.border{outline:1px solid var(--calcite-color-border-input)}.esri-sketch{display:flex;flex-flow:column wrap}.esri-widget{box-sizing:border-box;color:#323232;font-size:14px;font-family:Avenir Next,Helvetica Neue,Helvetica,Arial,sans-serif;line-height:1.3em;background-color:var(--calcite-color-foreground-1)}.esri-sketch__panel{align-items:center;display:flex;flex-flow:row nowrap;padding:0}.esri-sketch__tool-section{border-right:1px solid rgba(110,110,110,.3)}.esri-sketch__section{align-items:center;display:flex;flex-flow:row nowrap;padding:0 7px;margin:6px 0;border-right:1px solid rgba(110,110,110,.3)}.display-flex{display:flex}.font-bold{font-weight:700}.width-full{width:100%}.label-margin-0{--calcite-label-margin-bottom: 0}.padding-start-1-2{padding-inline-start:.5rem}.font-weight-500{font-weight:500}.word-wrap-anywhere{word-wrap:anywhere}.tooltip-message{padding:5px 8px;font-weight:var(--calcite-font-weight-normal);color:var(--calcite-color-text-2);max-width:400px}}`;
-class F extends G {
+ */
+
+:host {
+  display: block;
+}
+
+.div-not-visible {
+  display: none !important;
+}
+
+.border {
+  outline: 1px solid var(--calcite-color-border-input);
+}
+
+/* COPY FROM JS */
+.esri-sketch {
+  display: flex;
+  flex-flow: column wrap;
+}
+
+.esri-widget {
+  box-sizing: border-box;
+  color: #323232;
+  font-size: 14px;
+  font-family: 'Avenir Next', 'Helvetica Neue', Helvetica, Arial, sans-serif;
+  line-height: 1.3em;
+  background-color: var(--calcite-color-foreground-1);
+}
+
+/* DIV CHILD */
+.esri-sketch__panel {
+  align-items: center;
+  display: flex;
+  flex-flow: row nowrap;
+  padding: 0;
+}
+
+/* DIV CHILD CHILD */
+.esri-sketch__tool-section {
+  border-right: 1px solid rgba(110, 110, 110, 0.3);
+}
+
+.esri-sketch__section {
+  align-items: center;
+  display: flex;
+  flex-flow: row nowrap;
+  padding: 0 7px;
+  margin: 6px 0;
+  border-right: 1px solid rgba(110, 110, 110, 0.3);
+}
+
+.display-flex {
+  display: flex;
+}
+
+.font-bold {
+  font-weight: bold;
+}
+
+.width-full {
+  width: 100%;
+}
+
+.label-margin-0 {
+  --calcite-label-margin-bottom: 0;
+}
+
+.padding-start-1-2 {
+  padding-inline-start: 0.5rem;
+}
+
+.font-weight-500 {
+  font-weight: 500;
+}
+
+.word-wrap-anywhere {
+  word-wrap: anywhere;
+}
+
+.tooltip-message {
+  padding: 5px 8px;
+  font-weight: var(--calcite-font-weight-normal);
+  color: var(--calcite-color-text-2);
+  max-width: 400px;
+}
+}`;
+class RefineSelection extends LitElement {
   constructor() {
-    super(), this.enabledLayerIds = [], this.enableSearchDistance = !0, this.enableSearchDistanceOnLoad = !1, this.searchDistanceEnabled = !1, this.selectionSets = [], this.bufferColor = [227, 139, 79, 0.8], this.bufferOutlineColor = [255, 255, 255], this.geometries = [], this.drawnGraphicsArr = [], this._translations = x({ name: "refine-selection", blocking: !0 }), this._selectionMode = o.ADD, this._addEnabled = !0, this._drawTools = _(), this._enabledLayerIds = [], this._layerPicker = _(), this._featuresCollection = {}, this._pnContextConsumer = A({
-      context: O,
-      subscribe: !0
-    }), this._bufferTools = _(), this._undoGraphicsArr = [], this.selectionLoadingChange = w(), this.selectionSetsChanged = w(), this.listenOn(window, "distanceChanged", this.distanceChanged), this.listenOn(window, "unitChanged", this.unitChanged);
+    super();
+    this.enabledLayerIds = [];
+    this.enableSearchDistance = true;
+    this.enableSearchDistanceOnLoad = false;
+    this.searchDistanceEnabled = false;
+    this.selectionSets = [];
+    this.bufferColor = [227, 139, 79, 0.8];
+    this.bufferOutlineColor = [255, 255, 255];
+    this.geometries = [];
+    this.drawnGraphicsArr = [];
+    this._translations = useT9n({ name: "refine-selection", blocking: true });
+    this._selectionMode = ESelectionMode.ADD;
+    this._addEnabled = true;
+    this._drawTools = createRef();
+    this._enabledLayerIds = [];
+    this._layerPicker = createRef();
+    this._featuresCollection = {};
+    this._pnContextConsumer = useContextConsumer({
+      context: pnContext,
+      subscribe: true
+    });
+    this._bufferTools = createRef();
+    this._undoGraphicsArr = [];
+    this.selectionLoadingChange = createEvent();
+    this.selectionSetsChanged = createEvent();
+    this.listenOn(window, "distanceChanged", this.distanceChanged);
+    this.listenOn(window, "unitChanged", this.unitChanged);
   }
   static {
-    this.properties = { addresseeLayer: 0, enabledLayerIds: 0, enableSearchDistance: 5, enableSearchDistanceOnLoad: 5, mapView: 0, searchDistanceEnabled: 5, selectionSets: 0, sketchLineSymbol: 0, sketchPointSymbol: 0, sketchPolygonSymbol: 0, defaultBufferUnit: 1, bufferColor: 1, bufferOutlineColor: 1, defaultBufferDistance: 9, geometries: 0, drawnGraphicsArr: 0, _translations: 16, _selectionMode: 16, _refineLayer: 16 };
+    this.properties = { addresseeLayer: [0, {}, { attribute: false }], enabledLayerIds: [0, {}, { attribute: false }], enableSearchDistance: [5, {}, { type: Boolean }], enableSearchDistanceOnLoad: [5, {}, { type: Boolean }], mapView: [0, {}, { attribute: false }], searchDistanceEnabled: [5, {}, { type: Boolean }], selectionSets: [0, {}, { attribute: false }], sketchLineSymbol: [0, {}, { attribute: false }], sketchPointSymbol: [0, {}, { attribute: false }], sketchPolygonSymbol: [0, {}, { attribute: false }], defaultBufferUnit: 1, bufferColor: 1, bufferOutlineColor: 1, defaultBufferDistance: [9, {}, { type: Number }], geometries: [0, {}, { attribute: false }], drawnGraphicsArr: [0, {}, { attribute: false }], _translations: [16, {}, { state: true }], _selectionMode: [16, {}, { state: true }], _refineLayer: [16, {}, { state: true }] };
   }
   static {
-    this.styles = T;
+    this.styles = styles;
   }
   static {
-    this.shadowRootOptions = $;
+    this.shadowRootOptions = noShadowRoot;
   }
-  willUpdate(e) {
-    e.has("defaultBufferUnit") && this.hasUpdated && this._refineSelectionSet && (this._refineSelectionSet.unit = this.defaultBufferUnit), e.has("defaultBufferDistance") && this.hasUpdated && this._refineSelectionSet && (this._refineSelectionSet.distance = this.defaultBufferDistance);
+  willUpdate(changes) {
+    if (changes.has("defaultBufferUnit") && this.hasUpdated && this._refineSelectionSet) {
+      this._refineSelectionSet.unit = this.defaultBufferUnit;
+    }
+    if (changes.has("defaultBufferDistance") && this.hasUpdated && this._refineSelectionSet) {
+      this._refineSelectionSet.distance = this.defaultBufferDistance;
+    }
   }
-  async distanceChanged(e) {
-    e.detail.newValue !== e.detail.oldValue && this._refineSelectionSet && (this._refineSelectionSet.distance = e.detail.newValue);
+  async distanceChanged(event) {
+    if (event.detail.newValue !== event.detail.oldValue && this._refineSelectionSet) {
+      this._refineSelectionSet.distance = event.detail.newValue;
+    }
   }
-  async unitChanged(e) {
-    e.detail.newValue !== e.detail.oldValue && this._refineSelectionSet && (this._refineSelectionSet.unit = e.detail.newValue);
+  async unitChanged(event) {
+    if (event.detail.newValue !== event.detail.oldValue && this._refineSelectionSet) {
+      this._refineSelectionSet.unit = event.detail.newValue;
+    }
   }
   async load() {
-    this._enabledLayerIds = this._getEnabledLayerIds(), await this._setRefineSet(this._enabledLayerIds[0]), this._undoGraphicsArr = this._refineSelectionSet?.undoGraphicsArr;
+    this._enabledLayerIds = this._getEnabledLayerIds();
+    await this._setRefineSet(this._enabledLayerIds[0]);
+    this._undoGraphicsArr = this._refineSelectionSet?.undoGraphicsArr;
   }
   async loaded() {
     await this._init();
   }
   render() {
-    const e = this._enabledLayerIds.length > 1 ? "display-block" : "display-none";
-    return p`<div class=${`${e} padding-top-sides-1`}><div class="display-flex"><calcite-label class="font-bold width-full label-margin-0"><div class="display-flex">${this._translations.inputLayer}<calcite-icon class="padding-start-1-2 icon" .flipRtl=${this._translations._lang?.toLowerCase() !== "he"} icon=question id=refine-input-layer scale=s></calcite-icon></div><map-layer-picker .enabledLayerIds=${this._enabledLayerIds} .mapView=${this.mapView} @layerSelectionChange=${(t) => {
-      this._layerSelectionChange(t);
-    }} .selectedIds=${this._refineLayer ? [this._refineLayer.layer.id] : []} ${m(this._layerPicker)}></map-layer-picker></calcite-label><calcite-popover closable label overlay-positioning=fixed reference-element=refine-input-layer><span class="tooltip-message">${this._translations.inputLayerTip}</span></calcite-popover></div></div><div class="padding-1"><div class="padding-bottom-1"><calcite-segmented-control class="w-100" width=full><calcite-segmented-control-item .checked=${this._addEnabled} class="w-50 word-wrap-anywhere" @click=${() => this._setSelectionMode(o.ADD)} .value=${o.ADD}><span class="font-weight-500">${this._translations.add}</span></calcite-segmented-control-item><calcite-segmented-control-item .checked=${!this._addEnabled} class="w-50 word-wrap-anywhere" @click=${() => this._setSelectionMode(o.REMOVE)} .value=${o.REMOVE}><span class="font-weight-500">${this._translations.remove}</span></calcite-segmented-control-item></calcite-segmented-control></div><div><map-draw-tools active .drawMode=${L.REFINE} .mapView=${this.mapView} @drawRedo=${() => this._redo()} @drawUndo=${() => this._undo()} @sketchGraphicsChange=${this._sketchGraphicsChanged} .pointSymbol=${this.sketchPointSymbol} .polygonSymbol=${this.sketchPolygonSymbol} .polylineSymbol=${this.sketchLineSymbol} .redoEnabled=${this._refineSelectionSet?.redoStack && this._refineSelectionSet.redoStack.length > 0} .undoEnabled=${this._refineSelectionSet?.undoStack && this._refineSelectionSet.undoStack.length > 0} ${m(this._drawTools)}></map-draw-tools></div>${this.enableSearchDistance ? this._getBufferOptions() : void 0}<br>${p`<calcite-list class="list-border" label>${this._getRefineSelectionSetList()}</calcite-list>`}</div>`;
+    const layerPickerClass = this._enabledLayerIds.length > 1 ? "display-block" : "display-none";
+    return html`<div class=${`${layerPickerClass} padding-top-sides-1`}><div class="display-flex"><calcite-label class="font-bold width-full label-margin-0"><div class="display-flex">${this._translations.inputLayer}<calcite-icon class="padding-start-1-2 icon" .flipRtl=${!(this._translations._lang?.toLowerCase() === "he")} icon=question id=refine-input-layer scale=s></calcite-icon></div><map-layer-picker .enabledLayerIds=${this._enabledLayerIds} .mapView=${this.mapView} @layerSelectionChange=${(_evt) => {
+      void this._layerSelectionChange(_evt);
+    }} .selectedIds=${this._refineLayer ? [this._refineLayer.layer.id] : []} ${ref(this._layerPicker)}></map-layer-picker></calcite-label><calcite-popover closable label overlay-positioning=fixed reference-element=refine-input-layer><span class="tooltip-message">${this._translations.inputLayerTip}</span></calcite-popover></div></div><div class="padding-1"><div class="padding-bottom-1"><calcite-segmented-control class="w-100" width=full><calcite-segmented-control-item .checked=${this._addEnabled} class="w-50 word-wrap-anywhere" @click=${() => this._setSelectionMode(ESelectionMode.ADD)} .value=${ESelectionMode.ADD}><span class="font-weight-500">${this._translations.add}</span></calcite-segmented-control-item><calcite-segmented-control-item .checked=${!this._addEnabled} class="w-50 word-wrap-anywhere" @click=${() => this._setSelectionMode(ESelectionMode.REMOVE)} .value=${ESelectionMode.REMOVE}><span class="font-weight-500">${this._translations.remove}</span></calcite-segmented-control-item></calcite-segmented-control></div><div><map-draw-tools active .drawMode=${EDrawMode.REFINE} .mapView=${this.mapView} @drawRedo=${() => this._redo()} @drawUndo=${() => this._undo()} @sketchGraphicsChange=${this._sketchGraphicsChanged} .pointSymbol=${this.sketchPointSymbol} .polygonSymbol=${this.sketchPolygonSymbol} .polylineSymbol=${this.sketchLineSymbol} .redoEnabled=${this._refineSelectionSet?.redoStack && this._refineSelectionSet.redoStack.length > 0} .undoEnabled=${this._refineSelectionSet?.undoStack && this._refineSelectionSet.undoStack.length > 0} ${ref(this._drawTools)}></map-draw-tools></div>${this.enableSearchDistance ? this._getBufferOptions() : void 0}<br>${html`<calcite-list class="list-border" label>${this._getRefineSelectionSetList()}</calcite-list>`}</div>`;
   }
   async _init() {
     this._initGraphicsLayer();
   }
   _initGraphicsLayer() {
-    const e = this._translations.bufferLayer;
+    const title = this._translations.bufferLayer;
     if (this.mapView) {
-      const t = this.mapView.map.layers.findIndex((i) => i.title === e);
-      if (t > -1)
-        this._bufferGraphicsLayer = this.mapView.map.layers.getItemAt(t);
-      else if (this._bufferGraphicsLayer = new V({ title: e, listMode: "hide" }), this._bufferGraphicsLayer) {
-        const i = this.mapView.map.layers.findIndex((s) => s.title === this._translations.sketchLayer);
-        i > -1 ? this.mapView.map.layers.add(this._bufferGraphicsLayer, i) : this.mapView.map.layers.add(this._bufferGraphicsLayer);
+      const bufferIndex = this.mapView.map.layers.findIndex((l) => l.title === title);
+      if (bufferIndex > -1) {
+        this._bufferGraphicsLayer = this.mapView.map.layers.getItemAt(bufferIndex);
+      } else {
+        this._bufferGraphicsLayer = new GraphicsLayer({ title, listMode: "hide" });
+        if (this._bufferGraphicsLayer) {
+          const sketchIndex = this.mapView.map.layers.findIndex((l) => l.title === this._translations.sketchLayer);
+          if (sketchIndex > -1) {
+            this.mapView.map.layers.add(this._bufferGraphicsLayer, sketchIndex);
+          } else {
+            this.mapView.map.layers.add(this._bufferGraphicsLayer);
+          }
+        }
       }
     }
   }
-  _layerSelectionChange(e) {
-    const t = e.detail[0];
-    this._setRefineSet(t);
+  _layerSelectionChange(_evt) {
+    const id = _evt.detail[0];
+    void this._setRefineSet(id);
   }
-  _setSelectionMode(e) {
-    this._selectionMode = e;
+  _setSelectionMode(selectionMode) {
+    this._selectionMode = selectionMode;
   }
-  async _sketchGraphicsChanged(e) {
-    const t = e.detail?.graphics[0], i = t.geometry;
-    this.geometries = [i];
-    const s = await this._selectFeatures(i);
-    if (this._sketchGraphics = t, this._refineSelectionSet?.distance === 0 && s.length > 0) {
-      const a = { drawnGraphics: t, bufferGraphics: void 0 };
-      this.drawnGraphicsArr.push(a);
+  async _sketchGraphicsChanged(_evt) {
+    const graphics = _evt.detail?.graphics[0];
+    const geom = graphics.geometry;
+    this.geometries = [geom];
+    const oids = await this._selectFeatures(geom);
+    this._sketchGraphics = graphics;
+    if (this._refineSelectionSet?.distance === 0 && oids.length > 0) {
+      const obj = { drawnGraphics: graphics, bufferGraphics: void 0 };
+      this.drawnGraphicsArr.push(obj);
     }
   }
   _getEnabledLayerIds() {
-    return this.selectionSets.reduce((e, t) => {
-      const i = t?.layerView?.layer.id;
-      return i && e.indexOf(i) < 0 ? e.push(i) : t.workflowType === f.REFINE && Object.keys(t.refineInfos).forEach((s) => {
-        e.indexOf(s) < 0 && e.push(s);
-      }), e;
+    return this.selectionSets.reduce((prev, cur) => {
+      const id = cur?.layerView?.layer.id;
+      if (id && prev.indexOf(id) < 0) {
+        prev.push(id);
+      } else if (cur.workflowType === EWorkflowType.REFINE) {
+        Object.keys(cur.refineInfos).forEach((k) => {
+          if (prev.indexOf(k) < 0) {
+            prev.push(k);
+          }
+        });
+      }
+      return prev;
     }, []);
   }
-  async _setRefineSet(e) {
-    this.selectionSets.some((t) => t.workflowType === f.REFINE ? (this._refineSelectionSet = t, Object.keys(t.refineInfos).indexOf(e) > -1) : !1) || await this._initRefineSet(e, this._refineSelectionSet), this._refineSelectionSet && (this._refineLayer = this._refineSelectionSet.refineInfos[e].layerView);
+  async _setRefineSet(id) {
+    if (!this.selectionSets.some((ss) => {
+      if (ss.workflowType === EWorkflowType.REFINE) {
+        this._refineSelectionSet = ss;
+        return Object.keys(ss.refineInfos).indexOf(id) > -1;
+      } else {
+        return false;
+      }
+    })) {
+      await this._initRefineSet(id, this._refineSelectionSet);
+    }
+    if (this._refineSelectionSet) {
+      this._refineLayer = this._refineSelectionSet.refineInfos[id].layerView;
+    }
   }
-  async _initRefineSet(e, t) {
-    const i = {};
-    i[e] = {
+  async _initRefineSet(id, selectionSet) {
+    const refineInfo = {};
+    refineInfo[id] = {
       addIds: [],
       removeIds: [],
-      layerView: this.mapView && await b(this.mapView, e)
-    }, t ? t.refineInfos = { ...t.refineInfos, ...i } : (this._refineSelectionSet = {
-      id: Date.now(),
-      searchResult: void 0,
-      buffer: void 0,
-      distance: this.defaultBufferDistance || 0,
-      download: !0,
-      unit: this.defaultBufferUnit || "feet",
-      label: "Refine",
-      selectedIds: [],
-      layerView: this.mapView && await b(this.mapView, e),
-      geometries: [],
-      graphics: [],
-      selectLayers: [],
-      workflowType: f.REFINE,
-      searchDistanceEnabled: !1,
-      useLayerFeaturesEnabled: !1,
-      refineInfos: i,
-      redoStack: [],
-      undoStack: [],
-      sketchGraphic: void 0,
-      undoGraphicsArr: []
-    }, this.selectionSets.push(this._refineSelectionSet));
+      layerView: this.mapView && await getFeatureLayerView(this.mapView, id)
+    };
+    if (selectionSet) {
+      selectionSet.refineInfos = { ...selectionSet.refineInfos, ...refineInfo };
+    } else {
+      this._refineSelectionSet = {
+        id: Date.now(),
+        searchResult: void 0,
+        buffer: void 0,
+        distance: this.defaultBufferDistance || 0,
+        download: true,
+        unit: this.defaultBufferUnit || "feet",
+        label: "Refine",
+        selectedIds: [],
+        layerView: this.mapView && await getFeatureLayerView(this.mapView, id),
+        geometries: [],
+        graphics: [],
+        selectLayers: [],
+        workflowType: EWorkflowType.REFINE,
+        searchDistanceEnabled: false,
+        useLayerFeaturesEnabled: false,
+        refineInfos: refineInfo,
+        redoStack: [],
+        undoStack: [],
+        sketchGraphic: void 0,
+        undoGraphicsArr: []
+      };
+      this.selectionSets.push(this._refineSelectionSet);
+    }
   }
   _undo() {
     if (this._refineSelectionSet) {
-      const e = this._refineSelectionSet.undoStack && this._refineSelectionSet.undoStack.pop();
-      if (e) {
+      const undoOp = this._refineSelectionSet.undoStack && this._refineSelectionSet.undoStack.pop();
+      if (undoOp) {
         if (this.drawnGraphicsArr.length > 0) {
-          const t = this.drawnGraphicsArr.pop();
-          t && this._refineSelectionSet.undoGraphicsArr?.push(t), this._undoGraphicsArr.push(t);
+          const graphics = this.drawnGraphicsArr.pop();
+          if (graphics) {
+            this._refineSelectionSet.undoGraphicsArr?.push(graphics);
+          }
+          this._undoGraphicsArr.push(graphics);
         }
-        this._refineSelectionSet.redoStack && this._updateIds(e.ids, e.mode === o.ADD ? o.REMOVE : o.ADD, this._refineSelectionSet.redoStack, e.layerView);
+        this._refineSelectionSet.redoStack && void this._updateIds(undoOp.ids, undoOp.mode === ESelectionMode.ADD ? ESelectionMode.REMOVE : ESelectionMode.ADD, this._refineSelectionSet.redoStack, undoOp.layerView);
       }
     }
   }
   _redo() {
     if (this._refineSelectionSet) {
-      const e = this._refineSelectionSet.redoStack && this._refineSelectionSet.redoStack.pop();
-      if (e) {
+      const redoOp = this._refineSelectionSet.redoStack && this._refineSelectionSet.redoStack.pop();
+      if (redoOp) {
         if (this._undoGraphicsArr.length > 0) {
-          const t = this._undoGraphicsArr.pop();
-          this._refineSelectionSet.undoGraphicsArr?.pop(), t && this.drawnGraphicsArr.push(t);
+          const graphics = this._undoGraphicsArr.pop();
+          this._refineSelectionSet.undoGraphicsArr?.pop();
+          if (graphics) {
+            this.drawnGraphicsArr.push(graphics);
+          }
         }
-        this._refineSelectionSet.undoStack && this._updateIds(e.ids, e.mode === o.ADD ? o.REMOVE : o.ADD, this._refineSelectionSet.undoStack, e.layerView);
+        this._refineSelectionSet.undoStack && void this._updateIds(redoOp.ids, redoOp.mode === ESelectionMode.ADD ? ESelectionMode.REMOVE : ESelectionMode.ADD, this._refineSelectionSet.undoStack, redoOp.layerView);
       }
     }
   }
   _getBufferOptions() {
-    this.enableSearchDistanceOnLoad && this._refineSelectionSet && (this._refineSelectionSet.searchDistanceEnabled = !0, this.searchDistanceEnabled = !0, this.enableSearchDistanceOnLoad = !1);
-    const e = this._refineSelectionSet?.searchDistanceEnabled ? "search-distance" : "div-not-visible";
-    return p`<div><div class="padding-top-1 display-flex"><calcite-label class="label-margin-0 w-100" layout=inline-space-between><div class="tooltip-container">${this._translations.searchDistance}<calcite-icon class="padding-start-1-2 icon" .flipRtl=${this._translations._lang?.toLowerCase() !== "he"} icon=question id=search-distance-icon scale=s></calcite-icon></div></calcite-label><calcite-popover closable label overlay-positioning=fixed reference-element=search-distance-icon><span class="tooltip-message">${this._translations.useSearchDistanceTootip}</span></calcite-popover><calcite-switch .checked=${this._refineSelectionSet?.searchDistanceEnabled} @calciteSwitchChange=${() => {
-      this.searchDistanceEnabled = !this.searchDistanceEnabled, this._refineSelectionSet && (this._refineSelectionSet.searchDistanceEnabled = this.searchDistanceEnabled);
-    }}></calcite-switch></div><div class=${C(e)}><buffer-tools .disabled=${!this.searchDistanceEnabled} .distance=${this._refineSelectionSet?.distance} .geometries=${this.geometries} @bufferComplete=${(t) => {
-      this._bufferComplete(t);
-    }} .unit=${this._refineSelectionSet?.unit} ${m(this._bufferTools)}></buffer-tools></div></div>`;
+    if (this.enableSearchDistanceOnLoad && this._refineSelectionSet) {
+      this._refineSelectionSet.searchDistanceEnabled = true;
+      this.searchDistanceEnabled = true;
+      this.enableSearchDistanceOnLoad = false;
+    }
+    const showBufferToolsClass = this._refineSelectionSet?.searchDistanceEnabled ? "search-distance" : "div-not-visible";
+    return html`<div><div class="padding-top-1 display-flex"><calcite-label class="label-margin-0 w-100" layout=inline-space-between><div class="tooltip-container">${this._translations.searchDistance}<calcite-icon class="padding-start-1-2 icon" .flipRtl=${!(this._translations._lang?.toLowerCase() === "he")} icon=question id=search-distance-icon scale=s></calcite-icon></div></calcite-label><calcite-popover closable label overlay-positioning=fixed reference-element=search-distance-icon><span class="tooltip-message">${this._translations.useSearchDistanceTootip}</span></calcite-popover><calcite-switch .checked=${this._refineSelectionSet?.searchDistanceEnabled} @calciteSwitchChange=${() => {
+      this.searchDistanceEnabled = !this.searchDistanceEnabled;
+      if (this._refineSelectionSet) {
+        this._refineSelectionSet.searchDistanceEnabled = this.searchDistanceEnabled;
+      }
+    }}></calcite-switch></div><div class=${safeClassMap(showBufferToolsClass)}><buffer-tools .disabled=${!this.searchDistanceEnabled} .distance=${this._refineSelectionSet?.distance} .geometries=${this.geometries} @bufferComplete=${(_evt) => void this._bufferComplete(_evt)} .unit=${this._refineSelectionSet?.unit} ${ref(this._bufferTools)}></buffer-tools></div></div>`;
   }
-  async _bufferComplete(e) {
-    if (this._bufferGeometry = Array.isArray(e.detail) ? e.detail[0] : e.detail, this._bufferGeometry) {
-      const t = {
+  async _bufferComplete(_evt) {
+    this._bufferGeometry = Array.isArray(_evt.detail) ? _evt.detail[0] : _evt.detail;
+    if (this._bufferGeometry) {
+      const symbol = {
         type: "simple-fill",
         color: this.bufferColor,
         outline: {
           color: this.bufferOutlineColor,
           width: 1
         }
-      }, i = new R({
+      };
+      const polygonGraphic = new Graphic({
         geometry: this._bufferGeometry,
-        symbol: t
+        symbol
       });
-      if (this._bufferGraphicsLayer && i && this.mapView && (this._bufferGraphicsLayer.removeAll(), this._bufferGraphicsLayer.add(i), (await this._selectFeatures(this._bufferGeometry)).length > 0)) {
-        const a = { drawnGraphics: this._sketchGraphics, bufferGraphics: i };
-        this.drawnGraphicsArr.push(a);
+      if (this._bufferGraphicsLayer && polygonGraphic && this.mapView) {
+        this._bufferGraphicsLayer.removeAll();
+        this._bufferGraphicsLayer.add(polygonGraphic);
+        const oids = await this._selectFeatures(this._bufferGeometry);
+        if (oids.length > 0) {
+          const obj = { drawnGraphics: this._sketchGraphics, bufferGraphics: polygonGraphic };
+          this.drawnGraphicsArr.push(obj);
+        }
+      }
+    } else {
+      if (this._bufferGraphicsLayer) {
+        this._bufferGraphicsLayer.removeAll();
       }
-    } else
-      this._bufferGraphicsLayer && this._bufferGraphicsLayer.removeAll();
+    }
   }
   _getRefineSelectionSetList() {
-    const e = this._getTotal(this.selectionSets);
-    let t;
-    this.selectionSets.some((c) => c.workflowType === f.REFINE ? (t = c, !0) : !1);
-    let i = 0, s = 0;
-    t?.refineInfos && Object.keys(t.refineInfos).forEach((c) => {
-      i += t.refineInfos[c].addIds.length, s += t.refineInfos[c].removeIds.length;
+    const total = this._getTotal(this.selectionSets);
+    let refineSet;
+    this.selectionSets.some((ss) => {
+      if (ss.workflowType === EWorkflowType.REFINE) {
+        refineSet = ss;
+        return true;
+      } else {
+        return false;
+      }
+    });
+    let numAdded = 0;
+    let numRemoved = 0;
+    refineSet?.refineInfos && Object.keys(refineSet.refineInfos).forEach((k) => {
+      numAdded += refineSet.refineInfos[k].addIds.length;
+      numRemoved += refineSet.refineInfos[k].removeIds.length;
     });
-    const a = this._translations.featuresAdded, u = this._translations.featuresRemoved, d = this._translations.totalSelected;
+    const added = this._translations.featuresAdded;
+    const removed = this._translations.featuresRemoved;
+    const selected = this._translations.totalSelected;
     return [
-      p`<calcite-list-item .label=${a.replace("{{n}}", i.toString())}></calcite-list-item>`,
-      p`<calcite-list-item .label=${u.replace("{{n}}", s.toString())}></calcite-list-item>`,
-      p`<calcite-list-item .label=${d.replace("{{n}}", e.toString())}></calcite-list-item>`
+      html`<calcite-list-item .label=${added.replace("{{n}}", numAdded.toString())}></calcite-list-item>`,
+      html`<calcite-list-item .label=${removed.replace("{{n}}", numRemoved.toString())}></calcite-list-item>`,
+      html`<calcite-list-item .label=${selected.replace("{{n}}", total.toString())}></calcite-list-item>`
     ];
   }
-  _getTotal(e) {
-    const t = v(e);
-    return Object.keys(t).reduce((i, s) => {
-      const a = t[s];
-      return i += a.ids.length, i;
+  _getTotal(selectionSets) {
+    const idSets = getIdSets(selectionSets);
+    return Object.keys(idSets).reduce((prev, cur) => {
+      const idSet = idSets[cur];
+      prev += idSet.ids.length;
+      return prev;
     }, 0);
   }
-  async _selectFeatures(e) {
-    this.selectionLoadingChange.emit(!0);
-    let t = [];
+  async _selectFeatures(geom) {
+    this.selectionLoadingChange.emit(true);
+    let oids = [];
     if (this._refineLayer) {
       this._featuresCollection[this._refineLayer?.layer.id] = [];
-      const i = await E(0, this._refineLayer?.layer, e, this._featuresCollection);
-      this.selectionLoadingChange.emit(!1);
-      let s = [];
-      Object.keys(i).forEach((a) => {
-        a === this._refineLayer?.layer.id && (s = s.concat(i[a]));
-      }), t = Array.isArray(s) ? s.map((a) => a.attributes[a?.layer?.objectIdField]) : [], this._refineSelectionSet?.undoStack && await this._updateIds(t, this._selectionMode, this._refineSelectionSet.undoStack, this._refineLayer), this._bufferGraphicsLayer && this._refineSelectionSet && this._refineSelectionSet.distance > 0 && (await new Promise((a) => setTimeout(a, 1e3)), this._bufferGraphicsLayer.removeAll()), this.geometries = [], this._drawTools.value && this._drawTools.value.clear();
+      const response = await queryFeaturesByGeometry(0, this._refineLayer?.layer, geom, this._featuresCollection);
+      this.selectionLoadingChange.emit(false);
+      let graphics = [];
+      Object.keys(response).forEach((k) => {
+        if (k === this._refineLayer?.layer.id) {
+          graphics = graphics.concat(response[k]);
+        }
+      });
+      oids = Array.isArray(graphics) ? graphics.map((g) => g.attributes[g?.layer?.objectIdField]) : [];
+      this._refineSelectionSet?.undoStack && await this._updateIds(oids, this._selectionMode, this._refineSelectionSet.undoStack, this._refineLayer);
+      if (this._bufferGraphicsLayer && this._refineSelectionSet && this._refineSelectionSet.distance > 0) {
+        await new Promise((resolve) => setTimeout(resolve, 1e3));
+        this._bufferGraphicsLayer.removeAll();
+      }
+      this.geometries = [];
+      this._drawTools.value && void this._drawTools.value.clear();
     }
-    return t;
+    return oids;
   }
   async _highlightFeatures() {
-    const e = this._pnContextConsumer.value;
-    e.removeHandles(), e.highlightHandles = await k(this.selectionSets);
+    const _state = this._pnContextConsumer.value;
+    _state.removeHandles();
+    _state.highlightHandles = await highlightAllFeatures(this.selectionSets);
   }
-  async _updateIds(e, t, i, s) {
-    let a = !1;
-    const u = this._refineSelectionSet?.refineInfos, d = s.layer.id, c = {};
-    c[d] = {
+  async _updateIds(ids, mode, operationStack, layerView) {
+    let selectionSetsChanged = false;
+    const refineInfos = this._refineSelectionSet?.refineInfos;
+    const layerId = layerView.layer.id;
+    const newRefineInfo = {};
+    newRefineInfo[layerId] = {
       addIds: [],
       removeIds: [],
-      layerView: s
+      layerView
     };
-    const n = u && Object.keys(u).indexOf(d) > -1 ? u[d] : c[d];
-    if (t === o.ADD)
-      n.addIds = [.../* @__PURE__ */ new Set([...e, ...n.addIds])], n.addIds.length > 0 && i.push({
-        ids: e,
-        mode: t,
-        layerView: s
-      }), n.removeIds.length > 0 && (n.removeIds = n.removeIds.filter((S) => e.indexOf(S) < 0));
-    else {
-      const S = this.selectionSets.reduce((l, r) => (e.forEach((h) => {
-        r.workflowType !== f.REFINE ? r.selectedIds.indexOf(h) > -1 && l.push(h) : Object.keys(r.refineInfos).some((g) => {
-          const y = r.refineInfos[g];
-          return y.layerView.layer.id === s.layer.id && y.addIds.indexOf(h) > -1 ? (l.push(h), !0) : !1;
+    const idUpdates = refineInfos && Object.keys(refineInfos).indexOf(layerId) > -1 ? refineInfos[layerId] : newRefineInfo[layerId];
+    if (mode === ESelectionMode.ADD) {
+      idUpdates.addIds = [.../* @__PURE__ */ new Set([...ids, ...idUpdates.addIds])];
+      if (idUpdates.addIds.length > 0) {
+        operationStack.push({
+          ids,
+          mode,
+          layerView
+        });
+      }
+      if (idUpdates.removeIds.length > 0) {
+        idUpdates.removeIds = idUpdates.removeIds.filter((id) => ids.indexOf(id) < 0);
+      }
+    } else {
+      const validIds = this.selectionSets.reduce((prev, cur) => {
+        ids.forEach((id) => {
+          if (cur.workflowType !== EWorkflowType.REFINE) {
+            if (cur.selectedIds.indexOf(id) > -1) {
+              prev.push(id);
+            }
+          } else {
+            Object.keys(cur.refineInfos).some((k) => {
+              const refineInfo = cur.refineInfos[k];
+              if (refineInfo.layerView.layer.id === layerView.layer.id && refineInfo.addIds.indexOf(id) > -1) {
+                prev.push(id);
+                return true;
+              } else {
+                return false;
+              }
+            });
+          }
         });
-      }), l), []);
-      n.removeIds = [.../* @__PURE__ */ new Set([...S, ...n.removeIds])], n.addIds = n.addIds.filter((l) => S.indexOf(l) < 0), n.removeIds.length > 0 && i.push({
-        ids: S,
-        mode: t,
-        layerView: s
-      }), this.selectionSets = this.selectionSets.reduce((l, r) => (r.workflowType !== f.REFINE && r.layerView.layer.id === s.layer.id ? (r.selectedIds = r.selectedIds.filter((h) => n.removeIds.indexOf(h) < 0), r.selectedIds.length > 0 ? l.push(r) : a = !0) : l.push(r), l), []);
+        return prev;
+      }, []);
+      idUpdates.removeIds = [.../* @__PURE__ */ new Set([...validIds, ...idUpdates.removeIds])];
+      idUpdates.addIds = idUpdates.addIds.filter((id) => validIds.indexOf(id) < 0);
+      if (idUpdates.removeIds.length > 0) {
+        operationStack.push({
+          ids: validIds,
+          mode,
+          layerView
+        });
+      }
+      this.selectionSets = this.selectionSets.reduce((prev, cur) => {
+        if (cur.workflowType !== EWorkflowType.REFINE && cur.layerView.layer.id === layerView.layer.id) {
+          cur.selectedIds = cur.selectedIds.filter((id) => idUpdates.removeIds.indexOf(id) < 0);
+          if (cur.selectedIds.length > 0) {
+            prev.push(cur);
+          } else {
+            selectionSetsChanged = true;
+          }
+        } else {
+          prev.push(cur);
+        }
+        return prev;
+      }, []);
+    }
+    if (this._refineSelectionSet) {
+      this._refineSelectionSet.refineInfos[layerId] = idUpdates;
+    }
+    this.selectionSets = [...this.selectionSets];
+    if (selectionSetsChanged) {
+      this.selectionSetsChanged.emit(this.selectionSets);
     }
-    this._refineSelectionSet && (this._refineSelectionSet.refineInfos[d] = n), this.selectionSets = [...this.selectionSets], a && this.selectionSetsChanged.emit(this.selectionSets), await this._highlightFeatures();
+    await this._highlightFeatures();
   }
 }
-I("refine-selection", F);
+customElement("refine-selection", RefineSelection);
 export {
-  F as RefineSelection
+  RefineSelection
 };