@esri/solutions-components 0.6.15 → 0.6.16

package/dist/esm/calcite-meter.entry.js

@@ -0,0 +1,332 @@
+/*!
+ * Copyright 2022 Esri
+ * Licensed under the Apache License, Version 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+import { r as registerInstance, h, H as Host, g as getElement } from './index-c7de2486.js';
+import { s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-d0274dee.js';
+import { a as afterConnectDefaultValueSet, c as connectForm, d as disconnectForm } from './form-65431957.js';
+import { g as getSupportedLocale, n as numberStringFormatter, c as connectLocalized, d as disconnectLocalized } from './locale-56a910a3.js';
+import { r as intersects } from './dom-ae3d8818.js';
+import { c as createObserver } from './observers-a3cec8e4.js';
+import './key-554ad3f4.js';
+import './guid-d34fe102.js';
+import './resources-4d5cdf35.js';
+
+/*!
+ * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
+ * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
+ * v1.8.0
+ */
+const CSS = {
+  container: "container",
+  fill: "fill",
+  stepLine: "step-line",
+  label: "label",
+  labelHidden: "label-hidden",
+  labelRange: "label-range",
+  labelValue: "label-value",
+  unitLabel: "unit-label",
+  stepsVisible: "steps-visible",
+  valueVisible: "value-visible",
+  success: "fill-success",
+  warning: "fill-warning",
+  danger: "fill-danger",
+};
+
+const meterCss = ":host([disabled]){cursor:default;-webkit-user-select:none;-moz-user-select:none;user-select:none;opacity:var(--calcite-ui-opacity-disabled)}:host([disabled]) *,:host([disabled]) ::slotted(*){pointer-events:none}:host([hidden]){display:none}[hidden]{display:none}:host([disabled]) ::slotted([calcite-hydrated][disabled]),:host([disabled]) [calcite-hydrated][disabled]{opacity:1}:host{display:flex;--calcite-meter-space-internal:0.125rem;--calcite-meter-height-internal:1rem;--calcite-meter-font-size-internal:var(--calcite-font-size--1)}:host([scale=s]){--calcite-meter-height-internal:0.75rem;--calcite-meter-font-size-internal:var(--calcite-font-size--2)}:host([scale=l]){--calcite-meter-height-internal:1.5rem;--calcite-meter-font-size-internal:var(--calcite-font-size-0)}.container{position:relative;margin:0px;display:flex;inline-size:100%;align-items:center;block-size:var(--calcite-meter-height-internal);background-color:var(--calcite-ui-foreground-2);border:1px solid var(--calcite-ui-border-3);border-radius:var(--calcite-meter-height-internal)}.solid{border:1px solid var(--calcite-ui-foreground-3);background-color:var(--calcite-ui-foreground-3)}.outline{background-color:transparent}.value-visible{margin-block-start:1.5rem}.steps-visible{margin-block-end:1.5rem}.step-line{position:absolute;inset-block:0px;display:block;inline-size:var(--calcite-meter-space-internal);background-color:var(--calcite-ui-border-3)}.label{position:absolute;font-size:var(--calcite-meter-font-size-internal)}.label-hidden{visibility:hidden;opacity:0}.label-value{inset-block-end:calc(100% + 0.5em);font-weight:var(--calcite-font-weight-bold);color:var(--calcite-ui-text-1)}.label-range{color:var(--calcite-ui-text-3);inset-block-start:calc(100% + 0.5em)}.unit-label{font-weight:var(--calcite-font-weight-medium);color:var(--calcite-ui-text-3)}.label-value .unit-label{font-weight:var(--calcite-font-weight-bold);color:var(--calcite-ui-text-2)}.fill{position:absolute;z-index:var(--calcite-app-z-index);display:block;background-color:var(--calcite-ui-brand);transition-duration:150ms;transition-timing-function:cubic-bezier(0.4, 0, 0.2, 1);inset-inline-start:var(--calcite-meter-space-internal);inset-block:var(--calcite-meter-space-internal);border-radius:var(--calcite-meter-height-internal);max-inline-size:calc(100% - var(--calcite-meter-space-internal) * 2);min-inline-size:calc(var(--calcite-meter-height-internal) - var(--calcite-meter-space-internal) * 2);transition-property:inline-size, background-color, box-shadow}.fill-danger{background-color:var(--calcite-ui-danger)}.fill-success{background-color:var(--calcite-ui-success)}.fill-warning{background-color:var(--calcite-ui-warning)}.solid .fill{inset-block:0;inset-inline-start:0;max-inline-size:100%;min-inline-size:calc(var(--calcite-meter-height-internal));box-shadow:0 0 0 1px var(--calcite-ui-brand)}.solid .fill-danger{box-shadow:0 0 0 1px var(--calcite-ui-danger)}.solid .fill-success{box-shadow:0 0 0 1px var(--calcite-ui-success)}.solid .fill-warning{box-shadow:0 0 0 1px var(--calcite-ui-warning)}";
+
+const Meter = class {
+  constructor(hostRef) {
+    registerInstance(this, hostRef);
+    this.labelFlipMax = 0.8;
+    this.labelFlipProximity = 0.15;
+    this.maxPercent = 100;
+    this.minPercent = 0;
+    this.resizeObserver = createObserver("resize", () => this.resizeHandler());
+    this.formatLabel = (value, labelType) => {
+      if (labelType === "percent") {
+        if (!this.percentFormatting) {
+          const locale = getSupportedLocale(this.effectiveLocale);
+          const formatter = new Intl.NumberFormat(locale, {
+            useGrouping: this.groupSeparator,
+            style: "percent",
+          });
+          this.percentFormatting = { formatter, locale };
+        }
+        return this.percentFormatting.formatter.format(value);
+      }
+      else {
+        numberStringFormatter.numberFormatOptions = {
+          locale: this.effectiveLocale,
+          numberingSystem: this.numberingSystem,
+          useGrouping: this.groupSeparator,
+        };
+        return numberStringFormatter.localize(value.toString());
+      }
+    };
+    this.appearance = "outline-fill";
+    this.disabled = false;
+    this.fillType = "range";
+    this.form = undefined;
+    this.groupSeparator = false;
+    this.high = undefined;
+    this.label = undefined;
+    this.low = undefined;
+    this.max = 100;
+    this.min = 0;
+    this.name = undefined;
+    this.numberingSystem = undefined;
+    this.rangeLabels = false;
+    this.rangeLabelType = "percent";
+    this.scale = "m";
+    this.unitLabel = "";
+    this.value = undefined;
+    this.valueLabel = false;
+    this.valueLabelType = "percent";
+    this.currentPercent = undefined;
+    this.effectiveLocale = undefined;
+    this.highActive = undefined;
+    this.highPercent = undefined;
+    this.lowActive = undefined;
+    this.lowPercent = undefined;
+  }
+  handleRangeChange() {
+    this.calculateValues();
+    this.updateLabels();
+  }
+  handleLabelChange() {
+    this.updateLabels();
+  }
+  //--------------------------------------------------------------------------
+  //
+  //  Lifecycle
+  //
+  //--------------------------------------------------------------------------
+  async componentWillLoad() {
+    setUpLoadableComponent(this);
+    this.calculateValues();
+    afterConnectDefaultValueSet(this, this.value);
+  }
+  componentDidLoad() {
+    setComponentLoaded(this);
+    this.updateLabels();
+  }
+  connectedCallback() {
+    var _a;
+    connectLocalized(this);
+    connectForm(this);
+    (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.observe(this.el);
+  }
+  disconnectedCallback() {
+    var _a;
+    disconnectLocalized(this);
+    disconnectForm(this);
+    (_a = this.resizeObserver) === null || _a === void 0 ? void 0 : _a.disconnect();
+  }
+  //--------------------------------------------------------------------------
+  //
+  //  Private Methods
+  //
+  //--------------------------------------------------------------------------
+  resizeHandler() {
+    this.updateLabels();
+  }
+  updateLabels() {
+    if (this.valueLabelEl) {
+      this.determineValueLabelPosition();
+    }
+    if (this.rangeLabels) {
+      this.determineVisibleLabels();
+    }
+  }
+  calculateValues() {
+    const { min, max, low, high, value } = this;
+    const lowPercent = (100 * (low - min)) / (max - min);
+    const highPercent = (100 * (high - min)) / (max - min);
+    const currentPercent = (100 * (value - min)) / (max - min);
+    if (!low || low < min || low > high || low > max) {
+      this.low = min;
+    }
+    if (!high || high > max || high < low || high < min) {
+      this.high = max;
+    }
+    if (!value) {
+      this.value = min;
+    }
+    this.lowPercent = lowPercent;
+    this.highPercent = highPercent;
+    this.currentPercent = value ? currentPercent : 0;
+    this.lowActive = !!low && low > min && (!value || low > value) && (!high || low < high);
+    this.highActive =
+      !!high && min <= high && high < max && (!value || high > value) && (!low || high > low);
+  }
+  getMeterKindCssClass() {
+    const { low, high, min, max, value } = this;
+    const lowest = low ? low : min;
+    const highest = high ? high : max;
+    const aboveLowest = value >= lowest;
+    const belowLowest = value < lowest;
+    const aboveHighest = value >= highest;
+    const belowHighest = value < highest;
+    if (!value || (!low && belowHighest) || belowLowest) {
+      return CSS.success;
+    }
+    else if (aboveLowest && belowHighest) {
+      return CSS.warning;
+    }
+    else if (aboveHighest) {
+      return CSS.danger;
+    }
+    else {
+      return CSS.success;
+    }
+  }
+  intersects(el1, el2) {
+    return el1 && el2 && intersects(el1.getBoundingClientRect(), el2.getBoundingClientRect());
+  }
+  determineVisibleLabels() {
+    const { minLabelEl, lowLabelEl, highLabelEl, maxLabelEl } = this;
+    const highMaxOverlap = this.intersects(highLabelEl, maxLabelEl);
+    const lowHighOverlap = this.intersects(lowLabelEl, highLabelEl);
+    const lowMaxOverlap = this.intersects(lowLabelEl, maxLabelEl);
+    const minHighOverlap = this.intersects(minLabelEl, highLabelEl);
+    const minLowOverlap = this.intersects(minLabelEl, lowLabelEl);
+    const minMaxOverlap = this.intersects(minLabelEl, maxLabelEl);
+    const hiddenClass = CSS.labelHidden;
+    if (lowLabelEl) {
+      if (minLowOverlap || lowMaxOverlap || lowHighOverlap) {
+        lowLabelEl.classList.add(hiddenClass);
+      }
+      else {
+        lowLabelEl.classList.remove(hiddenClass);
+      }
+    }
+    if (highLabelEl) {
+      if (minHighOverlap || lowMaxOverlap || highMaxOverlap) {
+        highLabelEl.classList.add(hiddenClass);
+      }
+      else {
+        highLabelEl.classList.remove(hiddenClass);
+      }
+    }
+    if (minLabelEl && maxLabelEl) {
+      if (minMaxOverlap) {
+        maxLabelEl.classList.add(hiddenClass);
+      }
+      else {
+        maxLabelEl.classList.remove(hiddenClass);
+      }
+    }
+  }
+  determineValueLabelPosition() {
+    const { valueLabelEl, meterContainerEl, currentPercent } = this;
+    const valuePosition = currentPercent > 100 ? 100 : currentPercent > 0 ? currentPercent : 0;
+    const valueLabelWidth = valueLabelEl.getBoundingClientRect().width;
+    const containerWidth = meterContainerEl.getBoundingClientRect().width;
+    const labelWidthPercent = (100 * (valueLabelWidth - 0)) / (containerWidth - 0);
+    if (valuePosition + labelWidthPercent >= 100) {
+      valueLabelEl.style.insetInlineEnd = "0%";
+      valueLabelEl.style.removeProperty("inset-inline-start");
+    }
+    else {
+      valueLabelEl.style.insetInlineStart = `${valuePosition}% `;
+      valueLabelEl.style.removeProperty("inset-inline-end");
+    }
+  }
+  //--------------------------------------------------------------------------
+  //
+  //  Render Methods
+  //
+  //--------------------------------------------------------------------------
+  renderMeterFill() {
+    const { currentPercent, fillType } = this;
+    const kindClass = this.getMeterKindCssClass();
+    return (h("div", { class: { [CSS.fill]: true, [kindClass]: fillType !== "single" }, style: { width: `${currentPercent}%` } }));
+  }
+  renderRangeLine(position) {
+    const style = { insetInlineStart: `${position}%` };
+    return h("div", { class: CSS.stepLine, style: style });
+  }
+  renderValueLabel() {
+    const { currentPercent, valueLabelType, unitLabel, value } = this;
+    const label = this.formatLabel(valueLabelType === "percent" ? currentPercent / 100 : value || 0, valueLabelType);
+    return (h("div", { class: { [CSS.label]: true, [CSS.labelValue]: true }, key: "low-label-line",
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: (el) => (this.valueLabelEl = el) }, label, unitLabel && valueLabelType !== "percent" && (h("span", { class: CSS.unitLabel }, "\u00A0", unitLabel))));
+  }
+  renderMinLabel() {
+    const { rangeLabelType, min, minPercent, unitLabel } = this;
+    const style = { insetInlineStart: `${minPercent}%` };
+    const labelMin = this.formatLabel(rangeLabelType === "percent" ? minPercent : min, rangeLabelType);
+    return (h("div", { class: { [CSS.label]: true, [CSS.labelRange]: true }, key: "min-label-line", style: style,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: (el) => (this.minLabelEl = el) }, labelMin, unitLabel && rangeLabelType !== "percent" && (h("span", { class: CSS.unitLabel }, "\u00A0", unitLabel))));
+  }
+  renderLowLabel() {
+    const { rangeLabelType, low, lowPercent, highPercent, labelFlipProximity } = this;
+    const label = low
+      ? this.formatLabel(rangeLabelType === "percent" ? lowPercent / 100 : low, rangeLabelType)
+      : "";
+    const styleDefault = { insetInlineStart: `${lowPercent}%` };
+    const styleFlipped = { insetInlineEnd: `${100 - lowPercent}%` };
+    const style = (highPercent - lowPercent) / 100 < labelFlipProximity ? styleFlipped : styleDefault;
+    return (h("div", { class: { [CSS.label]: true, [CSS.labelRange]: true }, key: "low-label-line", style: style,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: (el) => (this.lowLabelEl = el) }, label));
+  }
+  renderHighLabel() {
+    const { rangeLabelType, high, highPercent, labelFlipMax } = this;
+    const label = high
+      ? this.formatLabel(rangeLabelType === "percent" ? highPercent / 100 : high, rangeLabelType)
+      : "";
+    const styleDefault = { insetInlineStart: `${highPercent}%` };
+    const styleFlipped = { insetInlineEnd: `${100 - highPercent}%` };
+    const style = highPercent / 100 >= labelFlipMax ? styleFlipped : styleDefault;
+    return (h("div", { class: { [CSS.label]: true, [CSS.labelRange]: true }, key: "high-label-line", style: style,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: (el) => (this.highLabelEl = el) }, label));
+  }
+  renderMaxLabel() {
+    const { rangeLabelType, max, maxPercent } = this;
+    const style = { insetInlineEnd: `${100 - maxPercent}%` };
+    const labelMax = this.formatLabel(rangeLabelType === "percent" ? maxPercent / 100 : max, rangeLabelType);
+    return (h("div", { class: { [CSS.label]: true, [CSS.labelRange]: true }, key: "max-label-line", style: style,
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: (el) => (this.maxLabelEl = el) }, labelMax));
+  }
+  render() {
+    const { appearance, currentPercent, highActive, highPercent, label, lowActive, lowPercent, max, maxPercent, min, minPercent, rangeLabels, rangeLabelType, unitLabel, value, valueLabel, valueLabelType, } = this;
+    const textPercentLabelWithPercent = this.formatLabel(currentPercent / 100, "percent");
+    const textUnitLabel = `${value} ${unitLabel}`;
+    const valueText = valueLabelType === "percent"
+      ? textPercentLabelWithPercent
+      : unitLabel
+        ? textUnitLabel
+        : undefined;
+    return (h(Host, null, h("div", { "aria-label": label, "aria-valuemax": rangeLabelType === "percent" ? maxPercent : max, "aria-valuemin": rangeLabelType === "percent" ? minPercent : min, "aria-valuenow": valueLabelType === "percent" ? currentPercent : value, "aria-valuetext": valueText, class: {
+        [CSS.container]: true,
+        [CSS.stepsVisible]: rangeLabels,
+        [CSS.valueVisible]: valueLabel,
+        [appearance]: appearance !== "outline-fill",
+      }, role: "meter",
+      // eslint-disable-next-line react/jsx-sort-props
+      ref: (el) => (this.meterContainerEl = el) }, this.renderMeterFill(), valueLabel && this.renderValueLabel(), lowActive && this.renderRangeLine(lowPercent), highActive && this.renderRangeLine(highPercent), rangeLabels && this.renderMinLabel(), rangeLabels && lowActive && this.renderLowLabel(), rangeLabels && highActive && this.renderHighLabel(), rangeLabels && this.renderMaxLabel())));
+  }
+  get el() { return getElement(this); }
+  static get watchers() { return {
+    "min": ["handleRangeChange"],
+    "max": ["handleRangeChange"],
+    "low": ["handleRangeChange"],
+    "high": ["handleRangeChange"],
+    "value": ["handleRangeChange"],
+    "rangeLabels": ["handleLabelChange"],
+    "rangeLabelType": ["handleLabelChange"],
+    "unitLabel": ["handleLabelChange"],
+    "valueLabel": ["handleLabelChange"],
+    "valueLabelType": ["handleLabelChange"]
+  }; }
+};
+Meter.style = meterCss;
+
+export { Meter as calcite_meter };

package/dist/esm/calcite-modal.entry.js

@@ -4,22 +4,22 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { r as registerInstance, c as createEvent, h, H as Host, g as getElement } from './index-c7de2486.js';
-import { c as connectConditionalSlotComponent, d as disconnectConditionalSlotComponent } from './conditionalSlot-dff8f839.js';
-import { g as getSlotted, r as slotChangeHasAssignedElement, f as focusFirstTabbable, x as ensureId } from './dom-2b326ec3.js';
-import { d as deactivateFocusTrap, a as activateFocusTrap, c as connectFocusTrap, u as updateFocusTrapElements } from './focusTrapComponent-ad2c3a31.js';
-import { s as setUpLoadableComponent, a as setComponentLoaded, c as componentFocusable } from './loadable-f848be11.js';
-import { c as createObserver } from './observers-95c50046.js';
-import { o as onToggleOpenCloseComponent } from './openCloseComponent-9fce341c.js';
-import { c as connectLocalized, d as disconnectLocalized } from './locale-00000ab4.js';
-import { s as setUpMessages, c as connectMessages, d as disconnectMessages, u as updateMessages } from './t9n-9791aa0c.js';
-import './guid-70cda807.js';
-import './resources-1e6d76df.js';
-import './key-02fa06ae.js';
+import { c as connectConditionalSlotComponent, d as disconnectConditionalSlotComponent } from './conditionalSlot-1fee63c6.js';
+import { g as getSlotted, u as slotChangeHasAssignedElement, f as focusFirstTabbable, v as ensureId } from './dom-ae3d8818.js';
+import { d as deactivateFocusTrap, a as activateFocusTrap, c as connectFocusTrap, u as updateFocusTrapElements } from './focusTrapComponent-b7f65d9e.js';
+import { s as setUpLoadableComponent, a as setComponentLoaded, c as componentFocusable } from './loadable-d0274dee.js';
+import { c as createObserver } from './observers-a3cec8e4.js';
+import { o as onToggleOpenCloseComponent } from './openCloseComponent-c3d01cbc.js';
+import { c as connectLocalized, d as disconnectLocalized } from './locale-56a910a3.js';
+import { s as setUpMessages, c as connectMessages, d as disconnectMessages, u as updateMessages } from './t9n-142cc7d6.js';
+import './guid-d34fe102.js';
+import './resources-4d5cdf35.js';
+import './key-554ad3f4.js';
 
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.6.1
+ * v1.8.0
  */
 const CSS = {
   modal: "modal",
@@ -58,7 +58,7 @@ const SLOTS = {
   primary: "primary",
 };
 
-const modalCss = ":host{position:absolute;inset:0px;z-index:var(--calcite-app-z-index-overlay);display:flex;opacity:0;visibility:hidden !important;transition:visibility 0ms linear var(--calcite-internal-animation-timing-slow), opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88);--calcite-modal-scrim-background-internal:rgba(0, 0, 0, 0.85)}.content-top[hidden],.content-bottom[hidden]{display:none}.container{position:fixed;inset:0px;z-index:var(--calcite-app-z-index-overlay);display:flex;align-items:center;justify-content:center;overflow-y:hidden;color:var(--calcite-ui-text-2);opacity:0;visibility:hidden !important;transition:visibility 0ms linear var(--calcite-internal-animation-timing-slow), opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88)}:host([scale=s]){--calcite-modal-padding-internal:0.75rem;--calcite-modal-padding-large-internal:1rem;--calcite-modal-title-text-internal:var(--calcite-font-size-1);--calcite-modal-content-text-internal:var(--calcite-font-size--1)}:host([scale=m]){--calcite-modal-padding-internal:1rem;--calcite-modal-padding-large-internal:1.25rem;--calcite-modal-title-text-internal:var(--calcite-font-size-2);--calcite-modal-content-text-internal:var(--calcite-font-size-0)}:host([scale=l]){--calcite-modal-padding-internal:1.25rem;--calcite-modal-padding-large-internal:1.5rem;--calcite-modal-title-text-internal:var(--calcite-font-size-3);--calcite-modal-content-text-internal:var(--calcite-font-size-1)}.scrim{--calcite-scrim-background:var(--calcite-modal-scrim-background, var(--calcite-modal-scrim-background-internal));position:fixed;inset:0px;display:flex;overflow-y:hidden}.modal{pointer-events:none;z-index:var(--calcite-app-z-index-modal);float:none;margin:1.5rem;box-sizing:border-box;display:flex;inline-size:100%;flex-direction:column;overflow:hidden;border-radius:0.25rem;background-color:var(--calcite-ui-foreground-1);opacity:0;--tw-shadow:0 2px 12px -4px rgba(0, 0, 0, 0.2), 0 2px 4px -2px rgba(0, 0, 0, 0.16);--tw-shadow-colored:0 2px 12px -4px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);-webkit-overflow-scrolling:touch;visibility:hidden;transition:transform var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), visibility 0ms linear var(--calcite-internal-animation-timing-slow), opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88);--calcite-modal-hidden-position:translate3d(0, 20px, 0);--calcite-modal-shown-position:translate3d(0, 0, 0)}.modal--opening-idle{transform:var(--calcite-modal-hidden-position)}.modal--opening-active{transform:var(--calcite-modal-shown-position)}.modal--closing-idle{transform:var(--calcite-modal-shown-position)}.modal--closing-active{transform:var(--calcite-modal-hidden-position)}:host([open]){opacity:1;visibility:visible !important;transition-delay:0ms}.container--open{opacity:1;visibility:visible !important;transition-delay:0ms}.container--open .modal{pointer-events:auto;visibility:visible;opacity:1;transition:transform var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), visibility 0ms linear, opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), max-inline-size var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), max-block-size var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88);transition-delay:0ms}.header{z-index:var(--calcite-app-z-index-header);display:flex;min-inline-size:0px;max-inline-size:100%;border-start-start-radius:0.25rem;border-start-end-radius:0.25rem;border-width:0px;border-block-end-width:1px;border-style:solid;border-color:var(--calcite-ui-border-3);background-color:var(--calcite-ui-foreground-1);flex:0 0 auto}.close{order:2;margin:0px;cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none;border-style:none;background-color:transparent;color:var(--calcite-ui-text-3);outline-color:transparent;transition:all var(--calcite-animation-timing) ease-in-out 0s, outline 0s, outline-offset 0s;padding-block:var(--calcite-modal-padding-internal);padding-inline:var(--calcite-modal-padding-internal);flex:0 0 auto}.close calcite-icon{pointer-events:none;vertical-align:-2px}.close:focus{outline:2px solid var(--calcite-ui-focus-color, var(--calcite-ui-brand));outline-offset:calc(\n            -2px *\n            calc(\n              1 -\n              2 * clamp(\n                0,\n                var(--calcite-ui-focus-offset-invert),\n                1\n              )\n            )\n          )}.close:hover,.close:focus,.close:active{background-color:var(--calcite-ui-foreground-2);color:var(--calcite-ui-text-1)}.title{order:1;display:flex;min-inline-size:0px;align-items:center;flex:1 1 auto;padding-block:var(--calcite-modal-padding-internal);padding-inline:var(--calcite-modal-padding-large-internal)}slot[name=header]::slotted(*),*::slotted([slot=header]){margin:0px;font-weight:var(--calcite-font-weight-normal);color:var(--calcite-ui-text-1);font-size:var(--calcite-modal-title-text-internal)}.content{position:relative;box-sizing:border-box;display:block;block-size:100%;overflow:auto;padding:0px;background-color:var(--calcite-modal-content-background, var(--calcite-ui-foreground-1));max-block-size:100%;padding:var(--calcite-modal-content-padding, var(--calcite-modal-padding-internal))}.content-top,.content-bottom{z-index:var(--calcite-app-z-index-header);display:flex;border-width:0px;border-style:solid;border-color:var(--calcite-ui-border-3);background-color:var(--calcite-ui-foreground-1);flex:0 0 auto;padding:var(--calcite-modal-padding-internal)}.content-top{min-inline-size:0px;max-inline-size:100%;border-block-end-width:1px}.content-bottom{margin-block-start:auto;box-sizing:border-box;inline-size:100%;justify-content:space-between;border-block-start-width:1px}.content-top:not(.header~.content-top){border-start-start-radius:0.25rem;border-start-end-radius:0.25rem}.content-bottom:not(.content-bottom~.footer),.content--no-footer{border-end-end-radius:0.25rem;border-end-start-radius:0.25rem}slot[name=content]::slotted(*),*::slotted([slot=content]){font-size:var(--calcite-modal-context-text-internal)}.footer{z-index:var(--calcite-app-z-index-header);margin-block-start:auto;box-sizing:border-box;display:flex;inline-size:100%;justify-content:space-between;border-end-end-radius:0.25rem;border-end-start-radius:0.25rem;border-width:0px;border-block-start-width:1px;border-style:solid;border-color:var(--calcite-ui-border-3);background-color:var(--calcite-ui-foreground-1);flex:0 0 auto;padding-block:var(--calcite-modal-padding-internal);padding-inline:var(--calcite-modal-padding-large-internal)}.footer--hide-back .back,.footer--hide-secondary .secondary{display:none}.back{display:block;margin-inline-end:auto}.secondary{margin-inline:0.25rem;display:block}slot[name=primary]{display:block}:host([width=small]) .modal{inline-size:auto}:host([width=s]) .modal{max-block-size:100%;max-inline-size:100%;inline-size:var(--calcite-modal-width, 32rem);block-size:var(--calcite-modal-height, auto)}@media screen and (max-width: 35rem){:host([width=s]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%}:host([width=s]) .content{flex:1 1 auto;max-block-size:unset}:host([width=s][docked]) .container{align-items:flex-end}}:host([width=m]) .modal{max-block-size:100%;max-inline-size:100%;inline-size:var(--calcite-modal-width, 48rem);block-size:var(--calcite-modal-height, auto)}@media screen and (max-width: 51rem){:host([width=m]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%}:host([width=m]) .content{flex:1 1 auto;max-block-size:unset}:host([width=m][docked]) .container{align-items:flex-end}}:host([width=l]) .modal{max-block-size:100%;max-inline-size:100%;inline-size:var(--calcite-modal-width, 94rem);block-size:var(--calcite-modal-height, auto)}@media screen and (max-width: 97rem){:host([width=l]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%}:host([width=l]) .content{flex:1 1 auto;max-block-size:unset}:host([width=l][docked]) .container{align-items:flex-end}}:host([fullscreen]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%;border-radius:0px;--calcite-modal-hidden-position:translate3D(0, 20px, 0) scale(0.95);--calcite-modal-shown-position:translate3D(0, 0, 0) scale(1)}:host([fullscreen]) .content{max-block-size:100%;flex:1 1 auto}:host([open][fullscreen]) .header,:host([open][fullscreen]) .footer,:host([open][fullscreen]) .content-top,:host([open][fullscreen]) .content-bottom{border-radius:0}:host([docked]) .modal{block-size:var(--calcite-modal-height, auto)}:host([docked]) .content{block-size:auto;flex:1 1 auto}:host([kind=brand]) .modal{border-color:var(--calcite-ui-brand)}:host([kind=danger]) .modal{border-color:var(--calcite-ui-danger)}:host([kind=info]) .modal{border-color:var(--calcite-ui-info)}:host([kind=success]) .modal{border-color:var(--calcite-ui-success)}:host([kind=warning]) .modal{border-color:var(--calcite-ui-warning)}:host([kind=brand]) .modal,:host([kind=danger]) .modal,:host([kind=info]) .modal,:host([kind=success]) .modal,:host([kind=warning]) .modal{border-width:0px;border-block-start-width:4px;border-style:solid}:host([kind=brand]) .header,:host([kind=brand]) .content-top,:host([kind=danger]) .header,:host([kind=danger]) .content-top,:host([kind=info]) .header,:host([kind=info]) .content-top,:host([kind=success]) .header,:host([kind=success]) .content-top,:host([kind=warning]) .header,:host([kind=warning]) .content-top{border-radius:0.25rem;border-end-end-radius:0px;border-end-start-radius:0px}@media screen and (max-width: 860px){* slot[name=header]::slotted(content-top),* content-top::slotted([slot=header]){font-size:var(--calcite-font-size-1)}.footer,.content-bottom{position:sticky;inset-block-end:0px}}@media screen and (max-width: 480px){.footer,.content-bottom{flex-direction:column}.back,.secondary{margin:0px;margin-block-end:0.25rem}}.container.slotted-in-shell{position:absolute;pointer-events:auto}.container.slotted-in-shell calcite-scrim{position:absolute}:host([hidden]){display:none}[hidden]{display:none}";
+const modalCss = ":host{position:absolute;inset:0px;z-index:var(--calcite-app-z-index-overlay);display:flex;opacity:0;visibility:hidden !important;transition:visibility 0ms linear var(--calcite-internal-animation-timing-slow), opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88);--calcite-modal-scrim-background-internal:rgba(0, 0, 0, 0.85)}.content-top[hidden],.content-bottom[hidden]{display:none}.container{position:fixed;inset:0px;z-index:var(--calcite-app-z-index-overlay);display:flex;align-items:center;justify-content:center;overflow-y:hidden;color:var(--calcite-ui-text-2);opacity:0;visibility:hidden !important;transition:visibility 0ms linear var(--calcite-internal-animation-timing-slow), opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88)}:host([scale=s]){--calcite-modal-padding-internal:0.75rem;--calcite-modal-padding-large-internal:1rem;--calcite-modal-title-text-internal:var(--calcite-font-size-1);--calcite-modal-content-text-internal:var(--calcite-font-size--1)}:host([scale=m]){--calcite-modal-padding-internal:1rem;--calcite-modal-padding-large-internal:1.25rem;--calcite-modal-title-text-internal:var(--calcite-font-size-2);--calcite-modal-content-text-internal:var(--calcite-font-size-0)}:host([scale=l]){--calcite-modal-padding-internal:1.25rem;--calcite-modal-padding-large-internal:1.5rem;--calcite-modal-title-text-internal:var(--calcite-font-size-3);--calcite-modal-content-text-internal:var(--calcite-font-size-1)}.scrim{--calcite-scrim-background:var(--calcite-modal-scrim-background, var(--calcite-modal-scrim-background-internal));position:fixed;inset:0px;display:flex;overflow-y:hidden}.modal{pointer-events:none;z-index:var(--calcite-app-z-index-modal);float:none;margin:1.5rem;box-sizing:border-box;display:flex;inline-size:100%;flex-direction:column;overflow:hidden;border-radius:0.25rem;background-color:var(--calcite-ui-foreground-1);opacity:0;--tw-shadow:0 2px 12px -4px rgba(0, 0, 0, 0.2), 0 2px 4px -2px rgba(0, 0, 0, 0.16);--tw-shadow-colored:0 2px 12px -4px var(--tw-shadow-color), 0 2px 4px -2px var(--tw-shadow-color);box-shadow:var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);-webkit-overflow-scrolling:touch;visibility:hidden;transition:transform var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), visibility 0ms linear var(--calcite-internal-animation-timing-slow), opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88);--calcite-modal-hidden-position:translate3d(0, 20px, 0);--calcite-modal-shown-position:translate3d(0, 0, 0)}.modal--opening-idle{transform:var(--calcite-modal-hidden-position)}.modal--opening-active{transform:var(--calcite-modal-shown-position)}.modal--closing-idle{transform:var(--calcite-modal-shown-position)}.modal--closing-active{transform:var(--calcite-modal-hidden-position)}:host([opened]){opacity:1;visibility:visible !important;transition-delay:0ms}.container--open{opacity:1;visibility:visible !important;transition-delay:0ms}.container--open .modal{pointer-events:auto;visibility:visible;opacity:1;transition:transform var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), visibility 0ms linear, opacity var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), max-inline-size var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88), max-block-size var(--calcite-internal-animation-timing-slow) cubic-bezier(0.215, 0.44, 0.42, 0.88);transition-delay:0ms}.header{z-index:var(--calcite-app-z-index-header);display:flex;min-inline-size:0px;max-inline-size:100%;border-start-start-radius:0.25rem;border-start-end-radius:0.25rem;border-width:0px;border-block-end-width:1px;border-style:solid;border-color:var(--calcite-ui-border-3);background-color:var(--calcite-ui-foreground-1);flex:0 0 auto}.close{order:2;margin:0px;cursor:pointer;-webkit-appearance:none;-moz-appearance:none;appearance:none;border-style:none;background-color:transparent;color:var(--calcite-ui-text-3);outline-color:transparent;transition:all var(--calcite-animation-timing) ease-in-out 0s, outline 0s, outline-offset 0s;padding-block:var(--calcite-modal-padding-internal);padding-inline:var(--calcite-modal-padding-internal);flex:0 0 auto}.close calcite-icon{pointer-events:none;vertical-align:-2px}.close:focus{outline:2px solid var(--calcite-ui-focus-color, var(--calcite-ui-brand));outline-offset:calc(\n            -2px *\n            calc(\n              1 -\n              2 * clamp(\n                0,\n                var(--calcite-ui-focus-offset-invert),\n                1\n              )\n            )\n          )}.close:hover,.close:focus,.close:active{background-color:var(--calcite-ui-foreground-2);color:var(--calcite-ui-text-1)}.title{order:1;display:flex;min-inline-size:0px;align-items:center;flex:1 1 auto;padding-block:var(--calcite-modal-padding-internal);padding-inline:var(--calcite-modal-padding-large-internal)}slot[name=header]::slotted(*),*::slotted([slot=header]){margin:0px;font-weight:var(--calcite-font-weight-normal);color:var(--calcite-ui-text-1);font-size:var(--calcite-modal-title-text-internal)}.content{position:relative;box-sizing:border-box;display:block;block-size:100%;overflow:auto;padding:0px;background-color:var(--calcite-modal-content-background, var(--calcite-ui-foreground-1));max-block-size:100%;padding:var(--calcite-modal-content-padding, var(--calcite-modal-padding-internal))}.content-top,.content-bottom{z-index:var(--calcite-app-z-index-header);display:flex;border-width:0px;border-style:solid;border-color:var(--calcite-ui-border-3);background-color:var(--calcite-ui-foreground-1);flex:0 0 auto;padding:var(--calcite-modal-padding-internal)}.content-top{min-inline-size:0px;max-inline-size:100%;border-block-end-width:1px}.content-bottom{margin-block-start:auto;box-sizing:border-box;inline-size:100%;justify-content:space-between;border-block-start-width:1px}.content-top:not(.header~.content-top){border-start-start-radius:0.25rem;border-start-end-radius:0.25rem}.content-bottom:not(.content-bottom~.footer),.content--no-footer{border-end-end-radius:0.25rem;border-end-start-radius:0.25rem}slot[name=content]::slotted(*),*::slotted([slot=content]){font-size:var(--calcite-modal-context-text-internal)}.footer{z-index:var(--calcite-app-z-index-header);margin-block-start:auto;box-sizing:border-box;display:flex;inline-size:100%;justify-content:space-between;border-end-end-radius:0.25rem;border-end-start-radius:0.25rem;border-width:0px;border-block-start-width:1px;border-style:solid;border-color:var(--calcite-ui-border-3);background-color:var(--calcite-ui-foreground-1);flex:0 0 auto;padding-block:var(--calcite-modal-padding-internal);padding-inline:var(--calcite-modal-padding-large-internal)}.footer--hide-back .back,.footer--hide-secondary .secondary{display:none}.back{display:block;margin-inline-end:auto}.secondary{margin-inline:0.25rem;display:block}slot[name=primary]{display:block}:host([width=small]) .modal{inline-size:auto}:host([width=s]) .modal{max-block-size:100%;max-inline-size:100%;inline-size:var(--calcite-modal-width, 32rem);block-size:var(--calcite-modal-height, auto)}@media screen and (max-width: 35rem){:host([width=s]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%}:host([width=s]) .content{flex:1 1 auto;max-block-size:unset}:host([width=s][docked]) .container{align-items:flex-end}}:host([width=m]) .modal{max-block-size:100%;max-inline-size:100%;inline-size:var(--calcite-modal-width, 48rem);block-size:var(--calcite-modal-height, auto)}@media screen and (max-width: 51rem){:host([width=m]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%}:host([width=m]) .content{flex:1 1 auto;max-block-size:unset}:host([width=m][docked]) .container{align-items:flex-end}}:host([width=l]) .modal{max-block-size:100%;max-inline-size:100%;inline-size:var(--calcite-modal-width, 94rem);block-size:var(--calcite-modal-height, auto)}@media screen and (max-width: 97rem){:host([width=l]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%}:host([width=l]) .content{flex:1 1 auto;max-block-size:unset}:host([width=l][docked]) .container{align-items:flex-end}}:host([fullscreen]) .modal{margin:0px;block-size:100%;max-block-size:100%;inline-size:100%;max-inline-size:100%;border-radius:0px;--calcite-modal-hidden-position:translate3D(0, 20px, 0) scale(0.95);--calcite-modal-shown-position:translate3D(0, 0, 0) scale(1)}:host([fullscreen]) .content{max-block-size:100%;flex:1 1 auto}:host([opened][fullscreen]) .header,:host([opened][fullscreen]) .footer,:host([opened][fullscreen]) .content-top,:host([opened][fullscreen]) .content-bottom{border-radius:0}:host([docked]) .modal{block-size:var(--calcite-modal-height, auto)}:host([docked]) .content{block-size:auto;flex:1 1 auto}:host([kind=brand]) .modal{border-color:var(--calcite-ui-brand)}:host([kind=danger]) .modal{border-color:var(--calcite-ui-danger)}:host([kind=info]) .modal{border-color:var(--calcite-ui-info)}:host([kind=success]) .modal{border-color:var(--calcite-ui-success)}:host([kind=warning]) .modal{border-color:var(--calcite-ui-warning)}:host([kind=brand]) .modal,:host([kind=danger]) .modal,:host([kind=info]) .modal,:host([kind=success]) .modal,:host([kind=warning]) .modal{border-width:0px;border-block-start-width:4px;border-style:solid}:host([kind=brand]) .header,:host([kind=brand]) .content-top,:host([kind=danger]) .header,:host([kind=danger]) .content-top,:host([kind=info]) .header,:host([kind=info]) .content-top,:host([kind=success]) .header,:host([kind=success]) .content-top,:host([kind=warning]) .header,:host([kind=warning]) .content-top{border-radius:0.25rem;border-end-end-radius:0px;border-end-start-radius:0px}@media screen and (max-width: 860px){* slot[name=header]::slotted(content-top),* content-top::slotted([slot=header]){font-size:var(--calcite-font-size-1)}.footer,.content-bottom{position:sticky;inset-block-end:0px}}@media screen and (max-width: 480px){.footer,.content-bottom{flex-direction:column}.back,.secondary{margin:0px;margin-block-end:0.25rem}}.container.slotted-in-shell{position:absolute;pointer-events:auto}.container.slotted-in-shell calcite-scrim{position:absolute}:host([hidden]){display:none}[hidden]{display:none}";
 
 const Modal = class {
   constructor(hostRef) {
@@ -67,6 +67,12 @@ const Modal = class {
     this.calciteModalClose = createEvent(this, "calciteModalClose", 6);
     this.calciteModalBeforeOpen = createEvent(this, "calciteModalBeforeOpen", 6);
     this.calciteModalOpen = createEvent(this, "calciteModalOpen", 6);
+    //--------------------------------------------------------------------------
+    //
+    //  Private Properties/ State
+    //
+    //--------------------------------------------------------------------------
+    this.ignoreOpenChange = false;
     this.mutationObserver = createObserver("mutation", () => this.handleMutationObserver());
     this.cssVarObserver = createObserver("mutation", () => {
       this.updateSizeCssVars();
@@ -84,19 +90,32 @@ const Modal = class {
       this.setFocus();
       this.el.removeEventListener("calciteModalOpen", this.openEnd);
     };
+    this.handleCloseClick = () => {
+      this.open = false;
+    };
     this.handleOutsideClose = () => {
       if (this.outsideCloseDisabled) {
         return;
       }
-      this.close();
+      this.open = false;
     };
-    /** Close the modal, first running the `beforeClose` method */
-    this.close = () => {
-      return this.beforeClose(this.el).then(() => {
-        this.open = false;
-        this.isOpen = false;
-        this.removeOverflowHiddenClass();
-      });
+    this.closeModal = async () => {
+      if (this.beforeClose) {
+        try {
+          await this.beforeClose(this.el);
+        }
+        catch (_error) {
+          // close prevented
+          requestAnimationFrame(() => {
+            this.ignoreOpenChange = true;
+            this.open = true;
+            this.ignoreOpenChange = false;
+          });
+          return;
+        }
+      }
+      this.opened = false;
+      this.removeOverflowHiddenClass();
     };
     this.handleMutationObserver = () => {
       this.updateFooterVisibility();
@@ -116,7 +135,8 @@ const Modal = class {
       this.hasContentBottom = slotChangeHasAssignedElement(event);
     };
     this.open = false;
-    this.beforeClose = () => Promise.resolve();
+    this.opened = false;
+    this.beforeClose = undefined;
     this.closeButtonDisabled = false;
     this.focusTrapDisabled = false;
     this.outsideCloseDisabled = false;
@@ -134,7 +154,6 @@ const Modal = class {
     this.hasFooter = true;
     this.hasContentTop = false;
     this.hasContentBottom = false;
-    this.isOpen = false;
     this.effectiveLocale = undefined;
     this.defaultMessages = undefined;
   }
@@ -157,7 +176,6 @@ const Modal = class {
     setUpLoadableComponent(this);
     // when modal initially renders, if active was set we need to open as watcher doesn't fire
     if (this.open) {
-      onToggleOpenCloseComponent(this);
       requestAnimationFrame(() => this.openModal());
     }
   }
@@ -189,17 +207,17 @@ const Modal = class {
   render() {
     return (h(Host, { "aria-describedby": this.contentId, "aria-labelledby": this.titleId, "aria-modal": "true", role: "dialog" }, h("div", { class: {
         [CSS.container]: true,
-        [CSS.containerOpen]: this.isOpen,
+        [CSS.containerOpen]: this.opened,
         [CSS.slottedInShell]: this.slottedInShell,
       } }, h("calcite-scrim", { class: CSS.scrim, onClick: this.handleOutsideClose }), this.renderStyle(), h("div", { class: {
         [CSS.modal]: true,
       },
-      // eslint-disable-next-line react/jsx-sort-props
+      // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
       ref: this.setTransitionEl }, h("div", { class: CSS.header }, this.renderCloseButton(), h("header", { class: CSS.title }, h("slot", { name: CSS.header }))), this.renderContentTop(), h("div", { class: {
         [CSS.content]: true,
         [CSS.contentNoFooter]: !this.hasFooter,
       },
-      // eslint-disable-next-line react/jsx-sort-props
+      // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
       ref: (el) => (this.modalContent = el) }, h("slot", { name: SLOTS.content })), this.renderContentBottom(), this.renderFooter()))));
   }
   renderFooter() {
@@ -212,8 +230,8 @@ const Modal = class {
     return (h("div", { class: CSS.contentBottom, hidden: !this.hasContentBottom }, h("slot", { name: SLOTS.contentBottom, onSlotchange: this.contentBottomSlotChangeHandler })));
   }
   renderCloseButton() {
-    return !this.closeButtonDisabled ? (h("button", { "aria-label": this.messages.close, class: CSS.close, key: "button", onClick: this.close, title: this.messages.close,
-      // eslint-disable-next-line react/jsx-sort-props
+    return !this.closeButtonDisabled ? (h("button", { "aria-label": this.messages.close, class: CSS.close, key: "button", onClick: this.handleCloseClick, title: this.messages.close,
+      // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
       ref: (el) => (this.closeButtonEl = el) }, h("calcite-icon", { icon: ICONS.close, scale: this.scale === "s" ? "s" : this.scale === "m" ? "m" : this.scale === "l" ? "l" : null }))) : null;
   }
   renderStyle() {
@@ -257,7 +275,7 @@ const Modal = class {
   //--------------------------------------------------------------------------
   handleEscape(event) {
     if (this.open && !this.escapeDisabled && event.key === "Escape" && !event.defaultPrevented) {
-      this.close();
+      this.open = false;
       event.preventDefault();
     }
   }
@@ -315,23 +333,30 @@ const Modal = class {
     this.calciteModalClose.emit();
     deactivateFocusTrap(this);
   }
-  async toggleModal(value) {
+  toggleModal(value) {
+    if (this.ignoreOpenChange) {
+      return;
+    }
+    if (value) {
+      this.openModal();
+    }
+    else {
+      this.closeModal();
+    }
+  }
+  handleOpenedChange(value) {
     var _a, _b;
     onToggleOpenCloseComponent(this);
     if (value) {
       (_a = this.transitionEl) === null || _a === void 0 ? void 0 : _a.classList.add(CSS.openingIdle);
-      this.openModal();
     }
     else {
       (_b = this.transitionEl) === null || _b === void 0 ? void 0 : _b.classList.add(CSS.closingIdle);
-      this.close();
     }
   }
-  /** Open the modal */
   openModal() {
     this.el.addEventListener("calciteModalOpen", this.openEnd);
-    this.open = true;
-    this.isOpen = true;
+    this.opened = true;
     const titleEl = getSlotted(this.el, SLOTS.header);
     const contentEl = getSlotted(this.el, SLOTS.content);
     this.titleId = ensureId(titleEl);
@@ -351,7 +376,8 @@ const Modal = class {
     "focusTrapDisabled": ["handleFocusTrapDisabled"],
     "messageOverrides": ["onMessagesChange"],
     "effectiveLocale": ["effectiveLocaleChange"],
-    "open": ["toggleModal"]
+    "open": ["toggleModal"],
+    "opened": ["handleOpenedChange"]
   }; }
 };
 Modal.style = modalCss;

package/dist/esm/calcite-navigation-logo.entry.js

@@ -4,12 +4,12 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { r as registerInstance, h, H as Host, g as getElement } from './index-c7de2486.js';
-import { c as componentFocusable, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-f848be11.js';
+import { c as componentFocusable, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-d0274dee.js';
 
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.6.1
+ * v1.8.0
  */
 const CSS = {
   container: "container",

package/dist/esm/calcite-navigation-user.entry.js

@@ -4,12 +4,12 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { r as registerInstance, h, H as Host, g as getElement } from './index-c7de2486.js';
-import { c as componentFocusable, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-f848be11.js';
+import { c as componentFocusable, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-d0274dee.js';
 
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.6.1
+ * v1.8.0
  */
 const CSS = {
   textContainer: "text-container",

package/dist/esm/calcite-navigation.entry.js

@@ -4,15 +4,15 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  */
 import { r as registerInstance, c as createEvent, h, F as Fragment, H as Host, g as getElement } from './index-c7de2486.js';
-import { r as slotChangeHasAssignedElement } from './dom-2b326ec3.js';
-import { c as componentFocusable, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-f848be11.js';
-import './guid-70cda807.js';
-import './resources-1e6d76df.js';
+import { u as slotChangeHasAssignedElement } from './dom-ae3d8818.js';
+import { c as componentFocusable, s as setUpLoadableComponent, a as setComponentLoaded } from './loadable-d0274dee.js';
+import './guid-d34fe102.js';
+import './resources-4d5cdf35.js';
 
 /*!
  * All material copyright ESRI, All Rights Reserved, unless otherwise specified.
  * See https://github.com/Esri/calcite-design-system/blob/main/LICENSE.md for details.
- * v1.6.1
+ * v1.8.0
  */
 const CSS = {
   container: "container",
@@ -140,7 +140,7 @@ const CalciteNavigation = class {
   //--------------------------------------------------------------------------
   renderMenuAction() {
     return (h("slot", { name: SLOTS.navigationAction, onSlotchange: this.handleMenuActionSlotChange }, this.navigationAction && (h("calcite-action", { icon: ICONS.hamburger, onClick: this.actionClickHandler, text: this.label,
-      // eslint-disable-next-line react/jsx-sort-props
+      // eslint-disable-next-line react/jsx-sort-props -- ref should be last so node attrs/props are in sync (see https://github.com/Esri/calcite-design-system/pull/6530)
       ref: (el) => (this.navigationActionEl = el) }))));
   }
   render() {