@ionic/core 9.0.7-dev.11790870774.174de601 → 9.0.7-dev.11790887756.13f9320e

package/dist/collection/utils/hardware-back-button.js

@@ -30,6 +30,23 @@ export const shouldUseCloseWatcher = () => config.get('experimentalCloseWatcher'
 export const blockHardwareBackButton = () => {
     document.addEventListener('backbutton', () => { });
 };
+const closeWatcherConditions = [];
+let syncCloseWatcher;
+/**
+ * Registers a check for whether the back button
+ * has something to close. The CloseWatcher is only
+ * active while one of these checks passes.
+ */
+export const addCloseWatcherCondition = (condition) => {
+    closeWatcherConditions.push(condition);
+};
+/**
+ * Call this whenever something the back button
+ * can close opens or closes.
+ */
+export const updateCloseWatcher = () => {
+    syncCloseWatcher?.();
+};
 export const startHardwareBackButton = () => {
     const doc = document;
     let busy = false;
@@ -81,32 +98,44 @@ export const startHardwareBackButton = () => {
         processHandlers();
     };
     /**
-     * If the CloseWatcher is defined then
-     * we don't want to also listen for the native
-     * backbutton event otherwise we may get duplicate
-     * events firing.
+     * Android WebView never sends the hardware back
+     * button to a CloseWatcher, so hybrid apps still
+     * need this. Browsers never fire backbutton.
      */
+    doc.addEventListener('backbutton', backButtonCallback);
     if (shouldUseCloseWatcher()) {
         let watcher;
-        const configureWatcher = () => {
-            watcher?.destroy();
+        /**
+         * An active CloseWatcher stops the back button from
+         * navigating, so only keep one while there's something to close.
+         */
+        syncCloseWatcher = () => {
+            const canClose = closeWatcherConditions.some((condition) => condition());
+            if (!canClose) {
+                watcher?.destroy();
+                watcher = undefined;
+                return;
+            }
+            if (watcher !== undefined) {
+                return;
+            }
             watcher = new win.CloseWatcher();
             /**
              * Once a close request happens
              * the watcher gets destroyed.
              * As a result, we need to re-configure
              * the watcher so we can respond to other
-             * close requests.
+             * close requests, including after one that
+             * closed nothing, like a modal whose canDismiss
+             * returned false.
              */
             watcher.onclose = () => {
+                watcher = undefined;
                 backButtonCallback();
-                configureWatcher();
+                syncCloseWatcher?.();
             };
         };
-        configureWatcher();
-    }
-    else {
-        doc.addEventListener('backbutton', backButtonCallback);
+        syncCloseWatcher();
     }
 };
 export const OVERLAY_BACK_BUTTON_PRIORITY = 100;

package/dist/collection/utils/menu-controller/index.js

@@ -2,7 +2,7 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { doc } from "../browser/index";
-import { MENU_BACK_BUTTON_PRIORITY } from "../hardware-back-button";
+import { MENU_BACK_BUTTON_PRIORITY, addCloseWatcherCondition } from "../hardware-back-button";
 import { printIonWarning } from "../logging/index";
 import { componentOnReady } from "../helpers";
 import { menuOverlayAnimation } from "./animations/overlay";
@@ -184,6 +184,7 @@ const createMenuController = () => {
     registerAnimation('reveal', menuRevealAnimation);
     registerAnimation('push', menuPushAnimation);
     registerAnimation('overlay', menuOverlayAnimation);
+    addCloseWatcherCondition(() => _getOpenSync() !== undefined);
     doc?.addEventListener('ionBackButton', (ev) => {
         const openMenu = _getOpenSync();
         if (openMenu) {

package/dist/collection/utils/overlays.js

@@ -3,7 +3,7 @@
  */
 import { doc } from "./browser/index";
 import { focusFirstDescendant, focusLastDescendant, focusableQueryString } from "./focus-trap";
-import { shouldUseCloseWatcher } from "./hardware-back-button";
+import { addCloseWatcherCondition, shouldUseCloseWatcher, updateCloseWatcher } from "./hardware-back-button";
 import { printIonError, printIonWarning } from "./logging/index";
 import { config } from "../global/config";
 import { getIonMode } from "../global/ionic-global";
@@ -13,6 +13,11 @@ import { OVERLAY_BACK_BUTTON_PRIORITY } from "./hardware-back-button";
 import { addEventListener, componentOnReady, focusVisibleElement, getElementRoot, removeEventListener, } from "./helpers";
 let lastOverlayIndex = 0;
 let lastId = 0;
+/**
+ * Every overlay except toast, which doesn't trap
+ * focus or close on back.
+ */
+const NON_TOAST_OVERLAYS = 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-popover';
 export const activeAnimations = new WeakMap();
 /**
  * Determines if the overlay's backdrop is always blocking (no background interaction).
@@ -139,7 +144,7 @@ const focusElementInOverlay = (hostToFocus, overlay) => {
  * Should NOT include: Toast
  */
 const trapKeyboardFocus = (ev, doc) => {
-    const lastOverlay = getPresentedOverlay(doc, 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-popover');
+    const lastOverlay = getPresentedOverlay(doc, NON_TOAST_OVERLAYS);
     const target = ev.target;
     /**
      * If no active overlay, ignore this event.
@@ -322,6 +327,11 @@ const connectListeners = (doc) => {
         doc.addEventListener('focus', (ev) => {
             trapKeyboardFocus(ev, doc);
         }, true);
+        /**
+         * Whether the overlay actually dismisses is checked at press time,
+         * since `backdropDismiss` can change while it's open.
+         */
+        addCloseWatcherCondition(() => getPresentedOverlay(doc, NON_TOAST_OVERLAYS) !== undefined);
         // handle back-button click
         doc.addEventListener('ionBackButton', (ev) => {
             const lastOverlay = getPresentedOverlay(doc);
@@ -445,7 +455,8 @@ export const setRootAriaHidden = (hidden = false) => {
  * Cleans up root `aria-hidden` and `backdrop-no-scroll` when
  * an overlay is removed from the DOM without going through
  * the `dismiss()` flow (e.g., when a framework unmounts the
- * overlay during a route change).
+ * overlay during a route change). Also releases the
+ * CloseWatcher if nothing is left to close.
  *
  * Should be called from an overlay's `disconnectedCallback`
  * when the overlay was still presented at the time of removal.
@@ -454,6 +465,7 @@ export const cleanupRootFocusTrapAccessibility = () => {
     if (typeof document === 'undefined') {
         return;
     }
+    updateCloseWatcher();
     const remainingOverlays = getPresentedOverlays(document);
     const hasRemainingLocking = remainingOverlays.some((o) => locksAppRoot(o));
     if (!hasRemainingLocking) {
@@ -475,7 +487,9 @@ const applyRootLock = (el) => {
 };
 /**
  * Re-applies the root lock that `cleanupRootFocusTrapAccessibility()` released.
- * Call from `connectedCallback` when the overlay is still presented.
+ * Call from `connectedCallback` when the overlay is still presented. Also
+ * re-arms the CloseWatcher, which every overlay needs, so that happens
+ * before the `locksAppRoot` check.
  *
  * A synchronous move keeps the overlay connected, so the lock survives. A
  * detach with a re-insert in a later task releases it, which is the shape a
@@ -485,6 +499,7 @@ export const restoreRootFocusTrapAccessibility = (overlayEl) => {
     if (typeof document === 'undefined') {
         return;
     }
+    updateCloseWatcher();
     const el = overlayEl;
     if (!locksAppRoot(el)) {
         return;
@@ -698,6 +713,11 @@ export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLe
         printIonError(`[${overlay.el.tagName.toLowerCase()}] - `, err);
     }
     overlay.el.remove();
+    /**
+     * Release the back button if nothing
+     * else is left to close.
+     */
+    updateCloseWatcher();
     return true;
 };
 const getAppRoot = (doc) => {
@@ -706,6 +726,12 @@ const getAppRoot = (doc) => {
 const overlayAnimation = async (overlay, animationBuilder, baseEl, opts) => {
     // Make overlay visible in case it's hidden
     baseEl.classList.remove('overlay-hidden');
+    /**
+     * Removing `overlay-hidden` makes the overlay count
+     * as presented, so back can dismiss it while it
+     * animates in.
+     */
+    updateCloseWatcher();
     const aniRoot = overlay.el;
     const animation = animationBuilder(aniRoot, opts);
     if (!overlay.animated || !config.getBoolean('animated', true)) {

package/dist/docs.json

@@ -1,5 +1,5 @@
 {
-  "timestamp": "2026-10-01T16:08:05",
+  "timestamp": "2026-10-01T20:51:08",
   "compiler": {
     "name": "@stencil/core",
     "version": "4.45.1",

package/dist/esm/{index-B9jhwvmO.js → index-CzPyKjAQ.js}

@@ -2,7 +2,7 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { n as doc, c as componentOnReady } from './helpers-B54ynME_.js';
-import { M as MENU_BACK_BUTTON_PRIORITY } from './overlays-BQnV0HAU.js';
+import { M as MENU_BACK_BUTTON_PRIORITY, q as addCloseWatcherCondition } from './overlays-D5W_ly69.js';
 import { a as printIonWarning } from './index-D9OR05yj.js';
 import { b as getIonMode } from './ionic-global-B-G43ddm.js';
 import { c as createAnimation } from './animation-CFd8Olt3.js';
@@ -271,6 +271,7 @@ const createMenuController = () => {
     registerAnimation('reveal', menuRevealAnimation);
     registerAnimation('push', menuPushAnimation);
     registerAnimation('overlay', menuOverlayAnimation);
+    addCloseWatcherCondition(() => _getOpenSync() !== undefined);
     doc?.addEventListener('ionBackButton', (ev) => {
         const openMenu = _getOpenSync();
         if (openMenu) {

package/dist/esm/index.js

@@ -13,8 +13,8 @@ export { L as LogLevel, c as printIonError, a as printIonWarning } from './index
 export { I as IonicSafeString } from './index-D4ZMZz_3.js';
 export { g as getMode, s as setupConfig } from './config-DWCzVL3Y.js';
 export { o as openURL } from './theme-byZM6qHV.js';
-export { m as menuController } from './index-B9jhwvmO.js';
-export { b as actionSheetController, a as alertController, l as loadingController, m as modalController, p as popoverController, t as toastController } from './overlays-BQnV0HAU.js';
+export { m as menuController } from './index-CzPyKjAQ.js';
+export { b as actionSheetController, a as alertController, l as loadingController, m as modalController, p as popoverController, t as toastController } from './overlays-D5W_ly69.js';
 import './gesture-controller-B_gJaBk0.js';
 import './dir-Dojwmvde.js';
 import './framework-delegate-DeT5pmPB.js';

package/dist/esm/ion-action-sheet.entry.js

@@ -5,7 +5,7 @@ import { r as registerInstance, d as createEvent, e as readTask, h, f as Host, g
 import { c as createButtonActiveGesture } from './button-active-DMuYeDQN.js';
 import { r as raf } from './helpers-B54ynME_.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';
-import { c as createDelegateController, d as createTriggerController, B as BACKDROP, i as isCancel, e as present, f as dismiss, g as eventMethod, s as safeCall, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId } from './overlays-BQnV0HAU.js';
+import { c as createDelegateController, d as createTriggerController, B as BACKDROP, i as isCancel, e as present, f as dismiss, g as eventMethod, s as safeCall, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId } from './overlays-D5W_ly69.js';
 import { r as renderOptionLabel } from './select-option-render-CGxPejmz.js';
 import { g as getClassMap } from './theme-byZM6qHV.js';
 import { b as getIonMode } from './ionic-global-B-G43ddm.js';

package/dist/esm/ion-alert.entry.js

@@ -7,7 +7,7 @@ import { c as createButtonActiveGesture } from './button-active-DMuYeDQN.js';
 import { r as raf } from './helpers-B54ynME_.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';
 import { g as getOverlayLabelJustify, a as getOverlayLabelPlacement } from './overlay-control-label-BSQPZ79H.js';
-import { c as createDelegateController, d as createTriggerController, B as BACKDROP, i as isCancel, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, k as setOverlayId, j as cleanupRootFocusTrapAccessibility, e as present, f as dismiss, g as eventMethod, s as safeCall } from './overlays-BQnV0HAU.js';
+import { c as createDelegateController, d as createTriggerController, B as BACKDROP, i as isCancel, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, k as setOverlayId, j as cleanupRootFocusTrapAccessibility, e as present, f as dismiss, g as eventMethod, s as safeCall } from './overlays-D5W_ly69.js';
 import { s as sanitizeDOMString } from './index-D4ZMZz_3.js';
 import { r as renderOptionLabel } from './select-option-render-CGxPejmz.js';
 import { g as getClassMap } from './theme-byZM6qHV.js';

package/dist/esm/ion-app_8.entry.js

@@ -2,7 +2,7 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { r as registerInstance, i as config, a as printIonWarning, h, f as Host, g as getElement, d as createEvent, e as readTask, j as forceUpdate, w as writeTask, c as printIonError } from './index-D9OR05yj.js';
-import { v as shouldUseCloseWatcher, n as getOverlaySizeType } from './overlays-BQnV0HAU.js';
+import { w as shouldUseCloseWatcher, n as getOverlaySizeType } from './overlays-D5W_ly69.js';
 import { a as isPlatform, b as getIonMode } from './ionic-global-B-G43ddm.js';
 import { i as inheritAriaAttributes, h as hasLazyBuild, c as componentOnReady, e as clamp, v as shallowEqualStringMap } from './helpers-B54ynME_.js';
 import { i as isRTL } from './dir-Dojwmvde.js';
@@ -41,7 +41,7 @@ const App = class {
                     const platform = isPlatform(window, 'ios') ? 'ios' : 'android';
                     import('./input-shims-MCrhq67U.js').then((module) => module.startInputShims(config, platform));
                 }
-                const hardwareBackButtonModule = await import('./overlays-BQnV0HAU.js').then(function (n) { return n.w; });
+                const hardwareBackButtonModule = await import('./overlays-D5W_ly69.js').then(function (n) { return n.y; });
                 const supportsHardwareBackButtonEvents = isHybrid || shouldUseCloseWatcher();
                 if (config.getBoolean('hardwareBackButton', supportsHardwareBackButtonEvents)) {
                     hardwareBackButtonModule.startHardwareBackButton();

package/dist/esm/ion-datetime.entry.js

@@ -4,7 +4,7 @@
 import { c as printIonError, a as printIonWarning, r as registerInstance, d as createEvent, w as writeTask, i as config, h, f as Host, g as getElement } from './index-D9OR05yj.js';
 import { startFocusVisible } from './focus-visible-BmVRXR1y.js';
 import { r as raf, g as getElementRoot, a as renderHiddenInput } from './helpers-B54ynME_.js';
-import { F as FOCUS_TRAP_DISABLE_CLASS } from './overlays-BQnV0HAU.js';
+import { F as FOCUS_TRAP_DISABLE_CLASS } from './overlays-D5W_ly69.js';
 import { i as isRTL } from './dir-Dojwmvde.js';
 import { c as createColorClasses } from './theme-byZM6qHV.js';
 import { b as chevronDown, d as caretUpSharp, e as chevronForward, f as caretDownSharp, c as chevronBack } from './index-BvabGprD.js';

package/dist/esm/ion-loading.entry.js

@@ -5,7 +5,7 @@ import { r as registerInstance, d as createEvent, i as config, h, f as Host, g a
 import { E as ENABLE_HTML_CONTENT_DEFAULT } from './config-DWCzVL3Y.js';
 import { r as raf } from './helpers-B54ynME_.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';
-import { c as createDelegateController, d as createTriggerController, B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, k as setOverlayId, j as cleanupRootFocusTrapAccessibility, e as present, f as dismiss, g as eventMethod } from './overlays-BQnV0HAU.js';
+import { c as createDelegateController, d as createTriggerController, B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, k as setOverlayId, j as cleanupRootFocusTrapAccessibility, e as present, f as dismiss, g as eventMethod } from './overlays-D5W_ly69.js';
 import { s as sanitizeDOMString } from './index-D4ZMZz_3.js';
 import { g as getClassMap } from './theme-byZM6qHV.js';
 import { b as getIonMode } from './ionic-global-B-G43ddm.js';

package/dist/esm/ion-menu_3.entry.js

@@ -3,10 +3,10 @@
  */
 import { r as registerInstance, d as createEvent, i as config, c as printIonError, h, f as Host, g as getElement } from './index-D9OR05yj.js';
 import { g as getTimeGivenProgression } from './cubic-bezier-hHmYLOfE.js';
-import { q as getPresentedOverlay, B as BACKDROP, o as focusFirstDescendant, u as focusLastDescendant, G as GESTURE, v as shouldUseCloseWatcher } from './overlays-BQnV0HAU.js';
+import { u as getPresentedOverlay, B as BACKDROP, o as focusFirstDescendant, v as focusLastDescendant, G as GESTURE, w as shouldUseCloseWatcher, x as updateCloseWatcher } from './overlays-D5W_ly69.js';
 import { G as GESTURE_CONTROLLER } from './gesture-controller-B_gJaBk0.js';
 import { s as isEndSide, i as inheritAriaAttributes, l as assert, e as clamp } from './helpers-B54ynME_.js';
-import { m as menuController } from './index-B9jhwvmO.js';
+import { m as menuController } from './index-CzPyKjAQ.js';
 import { b as getIonMode, a as isPlatform } from './ionic-global-B-G43ddm.js';
 import { h as hostContext, c as createColorClasses } from './theme-byZM6qHV.js';
 import { u as menuOutline, v as menuSharp } from './index-BvabGprD.js';
@@ -563,6 +563,7 @@ const Menu = class {
         // emit opened/closed events
         this._isOpen = isOpen;
         this.isAnimating = false;
+        updateCloseWatcher();
         if (!this._isOpen) {
             this.blocker.unblock();
         }
@@ -659,14 +660,14 @@ const Menu = class {
          * the ionBackButton listener in the menu controller
          * will handle closing the menu when Escape is pressed.
          */
-        return (h(Host, { key: '1208ba437fa58680325408d3d4c8580950da1d68', onKeyDown: shouldUseCloseWatcher() ? null : this.onKeydown, role: "navigation", "aria-label": inheritedAttributes['aria-label'] || 'menu', class: {
+        return (h(Host, { key: '5cf26df26d4e539860cbeaea98ec621b98c3fcfc', onKeyDown: shouldUseCloseWatcher() ? null : this.onKeydown, role: "navigation", "aria-label": inheritedAttributes['aria-label'] || 'menu', class: {
                 [mode]: true,
                 [`menu-type-${type}`]: true,
                 'menu-enabled': !disabled,
                 [`menu-side-${side}`]: true,
                 'menu-pane-visible': isPaneVisible,
                 'split-pane-side': hostContext('ion-split-pane', el),
-            } }, h("div", { key: 'c0ddc957b7a7956b41901d77ae02d91e73071c55', class: "menu-inner", part: "container", ref: (el) => (this.menuInnerEl = el) }, h("slot", { key: '6e44c56116431a024f114ab85ded1b822c942fac' })), h("ion-backdrop", { key: '5f4bbcf84444d96ec6b02bf567e1aaf95f59078d', ref: (el) => (this.backdropEl = el), class: "menu-backdrop", tappable: false, stopPropagation: false, part: "backdrop" })));
+            } }, h("div", { key: 'f337016e293bb8665c99762e0c389dd6c372bb33', class: "menu-inner", part: "container", ref: (el) => (this.menuInnerEl = el) }, h("slot", { key: '4c3fe331aa42cd57d7ad9bd1f5910f8eeb62d7da' })), h("ion-backdrop", { key: '61af7ea876d81574841e1dd3e81e2352e555d096', ref: (el) => (this.backdropEl = el), class: "menu-backdrop", tappable: false, stopPropagation: false, part: "backdrop" })));
     }
     get el() { return getElement(this); }
     static get watchers() { return {

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

@@ -7,7 +7,7 @@ import { C as CoreDelegate, a as attachComponent, d as detachComponent } from '.
 import { w as win, o as onCustomPropertyChange, g as getElementRoot, e as clamp, r as raf, b as inheritAttributes, h as hasLazyBuild } from './helpers-B54ynME_.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';
 import { g as getCapacitor } from './capacitor-CoEgIpR9.js';
-import { G as GESTURE, O as OVERLAY_GESTURE_PRIORITY, F as FOCUS_TRAP_DISABLE_CLASS, n as getOverlaySizeType, d as createTriggerController, B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId, e as present, f as dismiss, g as eventMethod } from './overlays-BQnV0HAU.js';
+import { G as GESTURE, O as OVERLAY_GESTURE_PRIORITY, F as FOCUS_TRAP_DISABLE_CLASS, n as getOverlaySizeType, d as createTriggerController, B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId, e as present, f as dismiss, g as eventMethod } from './overlays-D5W_ly69.js';
 import { g as getClassMap } from './theme-byZM6qHV.js';
 import { e as deepReady, w as waitForMount } from './index-B8iieOdw.js';
 import { b as getIonMode } from './ionic-global-B-G43ddm.js';

package/dist/esm/ion-popover.entry.js

@@ -2,7 +2,7 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { r as registerInstance, d as createEvent, a as printIonWarning, h, f as Host, g as getElement } from './index-D9OR05yj.js';
-import { B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId, e as present, o as focusFirstDescendant, f as dismiss, g as eventMethod, F as FOCUS_TRAP_DISABLE_CLASS } from './overlays-BQnV0HAU.js';
+import { B as BACKDROP, h as prepareOverlay, r as restoreRootFocusTrapAccessibility, j as cleanupRootFocusTrapAccessibility, k as setOverlayId, e as present, o as focusFirstDescendant, f as dismiss, g as eventMethod, F as FOCUS_TRAP_DISABLE_CLASS } from './overlays-D5W_ly69.js';
 import { C as CoreDelegate, a as attachComponent, d as detachComponent } from './framework-delegate-DeT5pmPB.js';
 import { g as getElementRoot, r as raf, f as addEventListener, h as hasLazyBuild } from './helpers-B54ynME_.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';

package/dist/esm/ion-select-modal.entry.js

@@ -4,7 +4,7 @@
 import { r as registerInstance, h, j as forceUpdate, f as Host, g as getElement } from './index-D9OR05yj.js';
 import { b as getIonMode } from './ionic-global-B-G43ddm.js';
 import { a as getOverlayLabelPlacement, g as getOverlayLabelJustify } from './overlay-control-label-BSQPZ79H.js';
-import { s as safeCall } from './overlays-BQnV0HAU.js';
+import { s as safeCall } from './overlays-D5W_ly69.js';
 import { r as renderOptionLabel } from './select-option-render-CGxPejmz.js';
 import { g as getClassMap } from './theme-byZM6qHV.js';
 import './helpers-B54ynME_.js';

package/dist/esm/ion-select_3.entry.js

@@ -7,7 +7,7 @@ import { g as getSlottedClickContent, c as createSlotMutationController, a as cr
 import { c as compareOptions, i as isOptionSelected } from './compare-with-utils-sObYyvOy.js';
 import { c as checkInvalidState } from './validity-DJztqcrH.js';
 import { b as inheritAttributes, a as renderHiddenInput, p as focusVisibleElement } from './helpers-B54ynME_.js';
-import { p as popoverController, b as actionSheetController, a as alertController, m as modalController, s as safeCall } from './overlays-BQnV0HAU.js';
+import { p as popoverController, b as actionSheetController, a as alertController, m as modalController, s as safeCall } from './overlays-D5W_ly69.js';
 import { i as isRTL } from './dir-Dojwmvde.js';
 import { r as reflectPropertiesToAttributes, a as sanitizeDOMTree, b as blockedTags } from './index-D4ZMZz_3.js';
 import { h as hostContext, c as createColorClasses, g as getClassMap } from './theme-byZM6qHV.js';

package/dist/esm/ion-toast.entry.js

@@ -5,7 +5,7 @@ import { a as printIonWarning, r as registerInstance, d as createEvent, i as con
 import { E as ENABLE_HTML_CONTENT_DEFAULT } from './config-DWCzVL3Y.js';
 import { w as win, g as getElementRoot, r as raf } from './helpers-B54ynME_.js';
 import { c as createLockController } from './lock-controller-B-hirT0v.js';
-import { O as OVERLAY_GESTURE_PRIORITY, c as createDelegateController, d as createTriggerController, i as isCancel, h as prepareOverlay, k as setOverlayId, e as present, f as dismiss, g as eventMethod, s as safeCall, G as GESTURE } from './overlays-BQnV0HAU.js';
+import { O as OVERLAY_GESTURE_PRIORITY, c as createDelegateController, d as createTriggerController, i as isCancel, h as prepareOverlay, k as setOverlayId, e as present, f as dismiss, g as eventMethod, s as safeCall, G as GESTURE } from './overlays-D5W_ly69.js';
 import { s as sanitizeDOMString } from './index-D4ZMZz_3.js';
 import { c as createColorClasses, g as getClassMap } from './theme-byZM6qHV.js';
 import { b as getIonMode } from './ionic-global-B-G43ddm.js';

package/dist/esm/{overlays-BQnV0HAU.js → overlays-D5W_ly69.js}

@@ -33,6 +33,23 @@ const shouldUseCloseWatcher = () => config.get('experimentalCloseWatcher', false
 const blockHardwareBackButton = () => {
     document.addEventListener('backbutton', () => { });
 };
+const closeWatcherConditions = [];
+let syncCloseWatcher;
+/**
+ * Registers a check for whether the back button
+ * has something to close. The CloseWatcher is only
+ * active while one of these checks passes.
+ */
+const addCloseWatcherCondition = (condition) => {
+    closeWatcherConditions.push(condition);
+};
+/**
+ * Call this whenever something the back button
+ * can close opens or closes.
+ */
+const updateCloseWatcher = () => {
+    syncCloseWatcher?.();
+};
 const startHardwareBackButton = () => {
     const doc = document;
     let busy = false;
@@ -84,32 +101,44 @@ const startHardwareBackButton = () => {
         processHandlers();
     };
     /**
-     * If the CloseWatcher is defined then
-     * we don't want to also listen for the native
-     * backbutton event otherwise we may get duplicate
-     * events firing.
+     * Android WebView never sends the hardware back
+     * button to a CloseWatcher, so hybrid apps still
+     * need this. Browsers never fire backbutton.
      */
+    doc.addEventListener('backbutton', backButtonCallback);
     if (shouldUseCloseWatcher()) {
         let watcher;
-        const configureWatcher = () => {
-            watcher?.destroy();
+        /**
+         * An active CloseWatcher stops the back button from
+         * navigating, so only keep one while there's something to close.
+         */
+        syncCloseWatcher = () => {
+            const canClose = closeWatcherConditions.some((condition) => condition());
+            if (!canClose) {
+                watcher?.destroy();
+                watcher = undefined;
+                return;
+            }
+            if (watcher !== undefined) {
+                return;
+            }
             watcher = new win.CloseWatcher();
             /**
              * Once a close request happens
              * the watcher gets destroyed.
              * As a result, we need to re-configure
              * the watcher so we can respond to other
-             * close requests.
+             * close requests, including after one that
+             * closed nothing, like a modal whose canDismiss
+             * returned false.
              */
             watcher.onclose = () => {
+                watcher = undefined;
                 backButtonCallback();
-                configureWatcher();
+                syncCloseWatcher?.();
             };
         };
-        configureWatcher();
-    }
-    else {
-        doc.addEventListener('backbutton', backButtonCallback);
+        syncCloseWatcher();
     }
 };
 const OVERLAY_BACK_BUTTON_PRIORITY = 100;
@@ -119,9 +148,11 @@ var hardwareBackButton = /*#__PURE__*/Object.freeze({
     __proto__: null,
     MENU_BACK_BUTTON_PRIORITY: MENU_BACK_BUTTON_PRIORITY,
     OVERLAY_BACK_BUTTON_PRIORITY: OVERLAY_BACK_BUTTON_PRIORITY,
+    addCloseWatcherCondition: addCloseWatcherCondition,
     blockHardwareBackButton: blockHardwareBackButton,
     shouldUseCloseWatcher: shouldUseCloseWatcher,
-    startHardwareBackButton: startHardwareBackButton
+    startHardwareBackButton: startHardwareBackButton,
+    updateCloseWatcher: updateCloseWatcher
 });
 
 /**
@@ -207,6 +238,11 @@ const focusElementInContext = (hostToFocus, fallbackElement) => {
 
 let lastOverlayIndex = 0;
 let lastId = 0;
+/**
+ * Every overlay except toast, which doesn't trap
+ * focus or close on back.
+ */
+const NON_TOAST_OVERLAYS = 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-popover';
 const activeAnimations = new WeakMap();
 /**
  * Determines if the overlay's backdrop is always blocking (no background interaction).
@@ -333,7 +369,7 @@ const focusElementInOverlay = (hostToFocus, overlay) => {
  * Should NOT include: Toast
  */
 const trapKeyboardFocus = (ev, doc) => {
-    const lastOverlay = getPresentedOverlay(doc, 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-popover');
+    const lastOverlay = getPresentedOverlay(doc, NON_TOAST_OVERLAYS);
     const target = ev.target;
     /**
      * If no active overlay, ignore this event.
@@ -516,6 +552,11 @@ const connectListeners = (doc) => {
         doc.addEventListener('focus', (ev) => {
             trapKeyboardFocus(ev, doc);
         }, true);
+        /**
+         * Whether the overlay actually dismisses is checked at press time,
+         * since `backdropDismiss` can change while it's open.
+         */
+        addCloseWatcherCondition(() => getPresentedOverlay(doc, NON_TOAST_OVERLAYS) !== undefined);
         // handle back-button click
         doc.addEventListener('ionBackButton', (ev) => {
             const lastOverlay = getPresentedOverlay(doc);
@@ -639,7 +680,8 @@ const setRootAriaHidden = (hidden = false) => {
  * Cleans up root `aria-hidden` and `backdrop-no-scroll` when
  * an overlay is removed from the DOM without going through
  * the `dismiss()` flow (e.g., when a framework unmounts the
- * overlay during a route change).
+ * overlay during a route change). Also releases the
+ * CloseWatcher if nothing is left to close.
  *
  * Should be called from an overlay's `disconnectedCallback`
  * when the overlay was still presented at the time of removal.
@@ -648,6 +690,7 @@ const cleanupRootFocusTrapAccessibility = () => {
     if (typeof document === 'undefined') {
         return;
     }
+    updateCloseWatcher();
     const remainingOverlays = getPresentedOverlays(document);
     const hasRemainingLocking = remainingOverlays.some((o) => locksAppRoot(o));
     if (!hasRemainingLocking) {
@@ -669,7 +712,9 @@ const applyRootLock = (el) => {
 };
 /**
  * Re-applies the root lock that `cleanupRootFocusTrapAccessibility()` released.
- * Call from `connectedCallback` when the overlay is still presented.
+ * Call from `connectedCallback` when the overlay is still presented. Also
+ * re-arms the CloseWatcher, which every overlay needs, so that happens
+ * before the `locksAppRoot` check.
  *
  * A synchronous move keeps the overlay connected, so the lock survives. A
  * detach with a re-insert in a later task releases it, which is the shape a
@@ -679,6 +724,7 @@ const restoreRootFocusTrapAccessibility = (overlayEl) => {
     if (typeof document === 'undefined') {
         return;
     }
+    updateCloseWatcher();
     const el = overlayEl;
     if (!locksAppRoot(el)) {
         return;
@@ -892,6 +938,11 @@ const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnim
         printIonError(`[${overlay.el.tagName.toLowerCase()}] - `, err);
     }
     overlay.el.remove();
+    /**
+     * Release the back button if nothing
+     * else is left to close.
+     */
+    updateCloseWatcher();
     return true;
 };
 const getAppRoot = (doc) => {
@@ -900,6 +951,12 @@ const getAppRoot = (doc) => {
 const overlayAnimation = async (overlay, animationBuilder, baseEl, opts) => {
     // Make overlay visible in case it's hidden
     baseEl.classList.remove('overlay-hidden');
+    /**
+     * Removing `overlay-hidden` makes the overlay count
+     * as presented, so back can dismiss it while it
+     * animates in.
+     */
+    updateCloseWatcher();
     const aniRoot = overlay.el;
     const animation = animationBuilder(aniRoot, opts);
     if (!overlay.animated || !config.getBoolean('animated', true)) {
@@ -1123,4 +1180,4 @@ const createTriggerController = () => {
 };
 const FOCUS_TRAP_DISABLE_CLASS = 'ion-disable-focus-trap';
 
-export { BACKDROP as B, FOCUS_TRAP_DISABLE_CLASS as F, GESTURE as G, MENU_BACK_BUTTON_PRIORITY as M, OVERLAY_GESTURE_PRIORITY as O, alertController as a, actionSheetController as b, createDelegateController as c, createTriggerController as d, present as e, dismiss as f, eventMethod as g, prepareOverlay as h, isCancel as i, cleanupRootFocusTrapAccessibility as j, setOverlayId as k, loadingController as l, modalController as m, getOverlaySizeType as n, focusFirstDescendant as o, popoverController as p, getPresentedOverlay as q, restoreRootFocusTrapAccessibility as r, safeCall as s, toastController as t, focusLastDescendant as u, shouldUseCloseWatcher as v, hardwareBackButton as w };
+export { BACKDROP as B, FOCUS_TRAP_DISABLE_CLASS as F, GESTURE as G, MENU_BACK_BUTTON_PRIORITY as M, OVERLAY_GESTURE_PRIORITY as O, alertController as a, actionSheetController as b, createDelegateController as c, createTriggerController as d, present as e, dismiss as f, eventMethod as g, prepareOverlay as h, isCancel as i, cleanupRootFocusTrapAccessibility as j, setOverlayId as k, loadingController as l, modalController as m, getOverlaySizeType as n, focusFirstDescendant as o, popoverController as p, addCloseWatcherCondition as q, restoreRootFocusTrapAccessibility as r, safeCall as s, toastController as t, getPresentedOverlay as u, focusLastDescendant as v, shouldUseCloseWatcher as w, updateCloseWatcher as x, hardwareBackButton as y };

package/dist/ionic/index.esm.js

@@ -1,4 +1,4 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-export{c as createAnimation}from"./p-B4wzg4z4.js";export{a as LIFECYCLE_DID_ENTER,c as LIFECYCLE_DID_LEAVE,L as LIFECYCLE_WILL_ENTER,b as LIFECYCLE_WILL_LEAVE,d as LIFECYCLE_WILL_UNLOAD,g as getIonPageElement}from"./p-PkaVMJga.js";export{iosTransitionAnimation}from"./p-kKvGoaEe.js";export{mdTransitionAnimation}from"./p-BVEsh7-M.js";export{g as getTimeGivenProgression}from"./p-hHmYLOfE.js";export{createGesture}from"./p-D0YpjgON.js";export{g as getPlatforms,i as initialize,a as isPlatform}from"./p-CrAPHbJ3.js";export{c as componentOnReady}from"./p-B4xjg_Qu.js";export{L as LogLevel,c as printIonError,a as printIonWarning}from"./p-D9OR05yj.js";export{I as IonicSafeString}from"./p-BhMQahM6.js";export{g as getMode,s as setupConfig}from"./p-DWCzVL3Y.js";export{o as openURL}from"./p-byZM6qHV.js";export{m as menuController}from"./p-Ba6ZV-qU.js";export{b as actionSheetController,a as alertController,l as loadingController,m as modalController,p as popoverController,t as toastController}from"./p-DZUqAr_6.js";import"./p-B_gJaBk0.js";import"./p-Dojwmvde.js";import"./p-B4ELlbJE.js";const e=e=>{const{swiper:o,extendParams:s}=e,t={effect:void 0,direction:"horizontal",initialSlide:0,loop:!1,parallax:!1,slidesPerView:1,spaceBetween:0,speed:300,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,touchEventsTarget:"container",freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,zoom:{maxRatio:3,minRatio:1,toggle:!1},touchRatio:1,touchAngle:45,simulateTouch:!0,touchStartPreventDefault:!1,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,threshold:0,touchMoveStopPropagation:!0,touchReleaseOnEdges:!1,iOSEdgeSwipeDetection:!1,iOSEdgeSwipeThreshold:20,resistance:!0,resistanceRatio:.85,watchSlidesProgress:!1,watchSlidesVisibility:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,loopAdditionalSlides:0,noSwiping:!0,runCallbacksOnInit:!0,coverflowEffect:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0},flipEffect:{slideShadows:!0,limitRotation:!0},cubeEffect:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94},fadeEffect:{crossFade:!1},a11y:{prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide"}};o.pagination&&(t.pagination={type:"bullets",clickable:!1,hideOnClick:!1}),o.scrollbar&&(t.scrollbar={hide:!0}),s(t)};export{e as IonicSlides}
+export{c as createAnimation}from"./p-B4wzg4z4.js";export{a as LIFECYCLE_DID_ENTER,c as LIFECYCLE_DID_LEAVE,L as LIFECYCLE_WILL_ENTER,b as LIFECYCLE_WILL_LEAVE,d as LIFECYCLE_WILL_UNLOAD,g as getIonPageElement}from"./p-PkaVMJga.js";export{iosTransitionAnimation}from"./p-kKvGoaEe.js";export{mdTransitionAnimation}from"./p-BVEsh7-M.js";export{g as getTimeGivenProgression}from"./p-hHmYLOfE.js";export{createGesture}from"./p-D0YpjgON.js";export{g as getPlatforms,i as initialize,a as isPlatform}from"./p-CrAPHbJ3.js";export{c as componentOnReady}from"./p-B4xjg_Qu.js";export{L as LogLevel,c as printIonError,a as printIonWarning}from"./p-D9OR05yj.js";export{I as IonicSafeString}from"./p-BhMQahM6.js";export{g as getMode,s as setupConfig}from"./p-DWCzVL3Y.js";export{o as openURL}from"./p-byZM6qHV.js";export{m as menuController}from"./p-OJpZr8fg.js";export{b as actionSheetController,a as alertController,l as loadingController,m as modalController,p as popoverController,t as toastController}from"./p-C036rEeA.js";import"./p-B_gJaBk0.js";import"./p-Dojwmvde.js";import"./p-B4ELlbJE.js";const e=e=>{const{swiper:o,extendParams:s}=e,t={effect:void 0,direction:"horizontal",initialSlide:0,loop:!1,parallax:!1,slidesPerView:1,spaceBetween:0,speed:300,slidesPerColumn:1,slidesPerColumnFill:"column",slidesPerGroup:1,centeredSlides:!1,slidesOffsetBefore:0,slidesOffsetAfter:0,touchEventsTarget:"container",freeMode:!1,freeModeMomentum:!0,freeModeMomentumRatio:1,freeModeMomentumBounce:!0,freeModeMomentumBounceRatio:1,freeModeMomentumVelocityRatio:1,freeModeSticky:!1,freeModeMinimumVelocity:.02,autoHeight:!1,setWrapperSize:!1,zoom:{maxRatio:3,minRatio:1,toggle:!1},touchRatio:1,touchAngle:45,simulateTouch:!0,touchStartPreventDefault:!1,shortSwipes:!0,longSwipes:!0,longSwipesRatio:.5,longSwipesMs:300,followFinger:!0,threshold:0,touchMoveStopPropagation:!0,touchReleaseOnEdges:!1,iOSEdgeSwipeDetection:!1,iOSEdgeSwipeThreshold:20,resistance:!0,resistanceRatio:.85,watchSlidesProgress:!1,watchSlidesVisibility:!1,preventClicks:!0,preventClicksPropagation:!0,slideToClickedSlide:!1,loopAdditionalSlides:0,noSwiping:!0,runCallbacksOnInit:!0,coverflowEffect:{rotate:50,stretch:0,depth:100,modifier:1,slideShadows:!0},flipEffect:{slideShadows:!0,limitRotation:!0},cubeEffect:{slideShadows:!0,shadow:!0,shadowOffset:20,shadowScale:.94},fadeEffect:{crossFade:!1},a11y:{prevSlideMessage:"Previous slide",nextSlideMessage:"Next slide",firstSlideMessage:"This is the first slide",lastSlideMessage:"This is the last slide"}};o.pagination&&(t.pagination={type:"bullets",clickable:!1,hideOnClick:!1}),o.scrollbar&&(t.scrollbar={hide:!0}),s(t)};export{e as IonicSlides}