@ionic/core 8.8.19-dev.11786610762.137bbb21 → 8.8.19-dev.11786735826.1fad7c0a

package/dist/collection/utils/overlays.js

@@ -6,7 +6,7 @@ import { focusFirstDescendant, focusLastDescendant, focusableQueryString } from
 import { shouldUseCloseWatcher } from "./hardware-back-button";
 import { printIonError, printIonWarning } from "./logging/index";
 import { config } from "../global/config";
-import { getIonMode, getIonTheme } from "../global/ionic-global";
+import { getIonMode } from "../global/ionic-global";
 import { CoreDelegate } from "./framework-delegate";
 import { BACKDROP_NO_SCROLL } from "./gesture/gesture-controller";
 import { OVERLAY_BACK_BUTTON_PRIORITY } from "./hardware-back-button";
@@ -14,120 +14,12 @@ import { addEventListener, componentOnReady, focusVisibleElement, getElementRoot
 let lastOverlayIndex = 0;
 let lastId = 0;
 export const activeAnimations = new WeakMap();
-const OVERLAY_FOCUS_TRAP_SELECTOR = 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-picker-legacy,ion-popover';
 /**
- * The focus trap is generic and knows nothing about which components are
- * inside an overlay. Components mark their elements with these `data-*`
- * attributes, which the trap reads, to control how Tab moves through them.
- * This keeps private component class names (e.g. `.modal-handle`,
- * `.action-sheet-button`) out of the trap, so changing a component does
- *  not silently break Tab order.
- *
- * - `data-focus-ignore`: skip this element as a tab stop.
- * - `data-focus-order`: explicit numeric placement in the tab sequence.
- * - `data-roving-focus`: a container whose focusable descendants share a
- *   single tab stop via a roving tabindex.
- */
-const FOCUS_IGNORE_SELECTOR = '[data-focus-ignore]';
-const FOCUS_ORDER_SELECTOR = '[data-focus-order]';
-const ROVING_FOCUS_SELECTOR = '[data-roving-focus]';
-/**
- * Returns the roving-focus group an element belongs to, or `null`.
- * A member is a descendant of a `[data-roving-focus]` container. The
- * container itself is not a member. Members share a single tab stop.
- */
-const getRovingFocusGroup = (el) => {
-    const group = el.closest(ROVING_FOCUS_SELECTOR);
-    return group !== null && group !== el ? group : null;
-};
-/**
- * Whether an element participates in a roving-focus group.
- */
-const isRovingFocusItem = (el) => getRovingFocusGroup(el) !== null;
-/**
- * Returns the currently focused element for keyboard focus checks.
- *
- * Starts from `document.activeElement` (non-shadow / light DOM focus).
- * If focus is inside one or more open shadow roots
- * (e.g. native control inside `ion-radio`), walks through nested
- * `shadowRoot.activeElement` values until the innermost focused node is reached.
- */
-const getActiveElement = (ownerDoc) => {
-    var _a;
-    let active = ownerDoc.activeElement;
-    if (!active) {
-        return null;
-    }
-    while ((_a = active.shadowRoot) === null || _a === void 0 ? void 0 : _a.activeElement) {
-        active = active.shadowRoot.activeElement;
-    }
-    return active;
-};
-/**
- * Walks from a focused node (possibly deep inside shadow roots) up to
- * the nearest roving-focus host (e.g. `ion-radio` inside an
- * `ion-radio-group`, or an action sheet `<button role="radio">`).
- */
-const getRovingFocusHost = (active) => {
-    let n = active;
-    while (n) {
-        if (isRovingFocusItem(n)) {
-            return n;
-        }
-        const root = n.getRootNode();
-        if (root instanceof ShadowRoot && root.host instanceof HTMLElement) {
-            n = root.host;
-        }
-        else {
-            return null;
-        }
-    }
-    return null;
-};
-/**
- * Reorders focusables for components that declare an explicit tab order
- * via `data-focus-order`. Elements without the attribute keep their
- * visual order and are visited first. Elements with it are appended
- * afterwards, sorted by ascending numeric value.
- *
- * Example (sheet modal): the options have no order and are visited
- * first in visual order, then the drag handle (`data-focus-order="1"`),
- * then the header Cancel button (`data-focus-order="2"`).
- */
-const applyFocusOrder = (elements) => {
-    const sortByVisualPosition = (els) => [...els].sort((a, b) => {
-        const ra = a.getBoundingClientRect();
-        const rb = b.getBoundingClientRect();
-        const topDiff = ra.top - rb.top;
-        if (Math.abs(topDiff) > 1) {
-            return topDiff;
-        }
-        return ra.left - rb.left;
-    });
-    const unordered = elements.filter((el) => !el.matches(FOCUS_ORDER_SELECTOR));
-    const ordered = elements
-        .filter((el) => el.matches(FOCUS_ORDER_SELECTOR))
-        .sort((a, b) => Number(a.getAttribute('data-focus-order')) - Number(b.getAttribute('data-focus-order')));
-    return [...sortByVisualPosition(unordered), ...ordered];
-};
-/**
- * Roving-focus members use a tabindex pattern where only one member is
- * tabbable (`tabIndex="0"`) while the others are not (`tabIndex="-1"`).
- * This returns the index of the current tabbable member.
- */
-const getTabbableRovingFocusIndex = (elements, overlay) => {
-    return elements.findIndex((el) => {
-        return overlay.contains(el) && isRovingFocusItem(el) && el.tabIndex >= 0;
-    });
-};
-/**
- * Determines if the overlay's backdrop is always blocking
- * (no background interaction).
+ * Determines if the overlay's backdrop is always blocking (no background interaction).
  * Returns false if showBackdrop=false or backdropBreakpoint > 0.
  */
 const isBackdropAlwaysBlocking = (el) => {
-    var _a;
-    return el.showBackdrop !== false && !(((_a = el.backdropBreakpoint) !== null && _a !== void 0 ? _a : 0) > 0);
+    return el.showBackdrop !== false && !((el.backdropBreakpoint ?? 0) > 0);
 };
 const createController = (tagName) => {
     return {
@@ -146,10 +38,6 @@ export const alertController = /*@__PURE__*/ createController('ion-alert');
 export const actionSheetController = /*@__PURE__*/ createController('ion-action-sheet');
 export const loadingController = /*@__PURE__*/ createController('ion-loading');
 export const modalController = /*@__PURE__*/ createController('ion-modal');
-/**
- * @deprecated Use the inline ion-picker component instead.
- */
-export const pickerController = /*@__PURE__*/ createController('ion-picker-legacy');
 export const popoverController = /*@__PURE__*/ createController('ion-popover');
 export const toastController = /*@__PURE__*/ createController('ion-toast');
 /**
@@ -189,7 +77,6 @@ export const setOverlayId = (el) => {
     return el.id;
 };
 export const createOverlay = (tagName, opts) => {
-    // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
     if (typeof window !== 'undefined' && typeof window.customElements !== 'undefined') {
         return window.customElements.whenDefined(tagName).then(() => {
             const element = document.createElement(tagName);
@@ -198,7 +85,7 @@ export const createOverlay = (tagName, opts) => {
              * Convert the passed in overlay options into props
              * that get passed down into the new overlay.
              */
-            Object.assign(element, Object.assign(Object.assign({}, opts), { hasController: true }));
+            Object.assign(element, { ...opts, hasController: true });
             // append the overlay element to the document body
             getAppRoot(document).appendChild(element);
             return new Promise((resolve) => componentOnReady(element, resolve));
@@ -222,7 +109,7 @@ const isOverlayHidden = (overlay) => overlay.classList.contains('overlay-hidden'
  */
 const focusElementInOverlay = (hostToFocus, overlay) => {
     let elementToFocus = hostToFocus;
-    const shadowRoot = hostToFocus === null || hostToFocus === void 0 ? void 0 : hostToFocus.shadowRoot;
+    const shadowRoot = hostToFocus?.shadowRoot;
     if (shadowRoot) {
         // If there are no inner focusable elements, just focus the host element.
         elementToFocus = shadowRoot.querySelector(focusableQueryString) || hostToFocus;
@@ -243,7 +130,7 @@ const focusElementInOverlay = (hostToFocus, overlay) => {
  * Should NOT include: Toast
  */
 const trapKeyboardFocus = (ev, doc) => {
-    const lastOverlay = getPresentedOverlay(doc, OVERLAY_FOCUS_TRAP_SELECTOR);
+    const lastOverlay = getPresentedOverlay(doc, 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-popover');
     const target = ev.target;
     /**
      * If no active overlay, ignore this event.
@@ -426,180 +313,10 @@ const connectListeners = (doc) => {
         doc.addEventListener('focus', (ev) => {
             trapKeyboardFocus(ev, doc);
         }, true);
-        /**
-         * Remember which roving-focus member last received focus
-         * (arrows, click, or Tab). A roving group keeps `tabIndex=0` on a
-         * single member (e.g. the checked/first radio), so the Tab trap
-         * uses this when wrapping back into the group or focusing its slot.
-         */
-        doc.addEventListener('focusin', (ev) => {
-            const lastOverlay = getPresentedOverlay(doc, OVERLAY_FOCUS_TRAP_SELECTOR);
-            if (!lastOverlay || lastOverlay.classList.contains(FOCUS_TRAP_DISABLE_CLASS)) {
-                return;
-            }
-            const target = ev.target;
-            if (!(target instanceof HTMLElement)) {
-                return;
-            }
-            const rovingHost = getRovingFocusHost(target);
-            if (rovingHost && lastOverlay.contains(rovingHost)) {
-                lastOverlay.trapLastRovingFocus = rovingHost;
-            }
-        }, true);
-        // Listen for keydown events to intercept Tab navigation.
-        // This is needed for Safari and Firefox which may skip focusable
-        // elements or allow focus to escape the overlay.
-        // It also ensures proper focus delegation for shadow DOM elements
-        // like ion-textarea.
-        doc.addEventListener('keydown', (ev) => {
-            var _a, _b, _c;
-            if (ev.key !== 'Tab' && ev.key !== 'Alt+Tab')
-                return;
-            const lastOverlay = getPresentedOverlay(doc, OVERLAY_FOCUS_TRAP_SELECTOR);
-            if (!lastOverlay || lastOverlay.classList.contains(FOCUS_TRAP_DISABLE_CLASS))
-                return;
-            const activeElement = getActiveElement(doc);
-            if (activeElement === lastOverlay) {
-                ev.preventDefault();
-                focusFirstDescendant(lastOverlay);
-                return;
-            }
-            // Check if activeElement is inside the overlay (including shadow DOM)
-            const isInsideOverlay = activeElement
-                ? lastOverlay.contains(activeElement) ||
-                    (activeElement.getRootNode() instanceof ShadowRoot &&
-                        lastOverlay.contains(activeElement.getRootNode().host)) ||
-                    ((_b = (_a = lastOverlay.shadowRoot) === null || _a === void 0 ? void 0 : _a.contains(activeElement)) !== null && _b !== void 0 ? _b : false)
-                : false;
-            if (!isInsideOverlay)
-                return;
-            // Get all focusable elements from both light and shadow DOM
-            let allFocusable = [
-                ...lastOverlay.querySelectorAll(focusableQueryString),
-                ...(((_c = lastOverlay.shadowRoot) === null || _c === void 0 ? void 0 : _c.querySelectorAll(focusableQueryString)) || []),
-            ];
-            /**
-             * Some elements match `focusableQueryString` but are not
-             * intended tab stops (e.g. the `ion-item` wrappers a select
-             * modal renders around its options). Components opt these out
-             * with `data-focus-ignore` so Tab can move between the real
-             * controls.
-             */
-            allFocusable = allFocusable.filter((el) => !el.matches(FOCUS_IGNORE_SELECTOR));
-            /**
-             * A roving-focus group is a single tab stop: only its currently
-             * tabbable member (`tabIndex >= 0`) participates. Other
-             * focusables inside the group are not independent tab stops —
-             * this includes inactive members and focusable wrappers such as
-             * the `ion-item` that carries `ion-focusable` on behalf of a
-             * radio. Drop them so Tab moves between the group and the
-             * surrounding controls (e.g. the handle), not into the wrappers.
-             */
-            allFocusable = allFocusable.filter((el) => !isRovingFocusItem(el) || el.tabIndex >= 0);
-            /**
-             * When a component declares an explicit tab order via
-             * `data-focus-order` (e.g. a sheet modal's handle and Cancel
-             * button), reorder accordingly. Overlays that declare no order
-             * keep their DOM order.
-             */
-            if (allFocusable.some((el) => el.matches(FOCUS_ORDER_SELECTOR))) {
-                allFocusable = applyFocusOrder(allFocusable);
-            }
-            if (allFocusable.length === 0) {
-                ev.preventDefault();
-                return;
-            }
-            // Find current element's index (accounting for shadow DOM)
-            let currentIndex = activeElement
-                ? allFocusable.findIndex((el) => {
-                    var _a;
-                    if (el === activeElement)
-                        return true;
-                    if ((_a = el.shadowRoot) === null || _a === void 0 ? void 0 : _a.contains(activeElement))
-                        return true;
-                    const rootNode = activeElement.getRootNode();
-                    return rootNode instanceof ShadowRoot && rootNode.host === el;
-                })
-                : -1;
-            /**
-             * A roving-focus group keeps `tabIndex=0` on a single member
-             * while the others are `-1`. Arrow keys can move focus onto a
-             * `tabIndex=-1` member, which `focusableQueryString` excludes,
-             * so `findIndex` yields -1 and Tab would wrap to
-             * `allFocusable[0]`. Treat focus on any group member as the
-             * group's tabbable slot so Tab goes to the next control (e.g.
-             * handle → Cancel), not back to the first member.
-             */
-            if (currentIndex < 0 && activeElement) {
-                const rovingHost = getRovingFocusHost(activeElement);
-                if (rovingHost && lastOverlay.contains(rovingHost)) {
-                    const directIndex = allFocusable.indexOf(rovingHost);
-                    if (directIndex >= 0) {
-                        currentIndex = directIndex;
-                    }
-                    else {
-                        const tabbableIndex = getTabbableRovingFocusIndex(allFocusable, lastOverlay);
-                        if (tabbableIndex >= 0) {
-                            currentIndex = tabbableIndex;
-                        }
-                    }
-                }
-            }
-            ev.preventDefault();
-            // Helper to focus an element, handling shadow DOM properly
-            const focusElement = (element) => {
-                const shadowRoot = element.shadowRoot;
-                if (shadowRoot) {
-                    const innerFocusable = shadowRoot.querySelector(focusableQueryString);
-                    if (innerFocusable && typeof element.setFocus !== 'function') {
-                        focusVisibleElement(innerFocusable);
-                        return;
-                    }
-                }
-                focusVisibleElement(element);
-            };
-            let nextIndex;
-            if (ev.shiftKey) {
-                // Shift+Tab: previous element, wrap to last if at first
-                if (currentIndex <= 0) {
-                    nextIndex = allFocusable.length - 1;
-                }
-                else {
-                    nextIndex = currentIndex - 1;
-                }
-            }
-            else {
-                // Tab: next element, wrap to first if at last
-                if (currentIndex < 0 || currentIndex >= allFocusable.length - 1) {
-                    nextIndex = 0;
-                }
-                else {
-                    nextIndex = currentIndex + 1;
-                }
-            }
-            const nextEl = allFocusable[nextIndex];
-            const overlayTrap = lastOverlay;
-            const tabbableRovingIndex = getTabbableRovingFocusIndex(allFocusable, lastOverlay);
-            /**
-             * The trap list only includes one tabbable member of a roving
-             * group (`tabIndex >= 0`), usually the checked/first radio.
-             * `focusin` tracks the real last-focused member. Use it whenever
-             * Tab would focus that slot (wrap from Cancel, Shift+Tab from
-             * handle, etc.).
-             */
-            let focusTarget = nextEl;
-            if (tabbableRovingIndex >= 0 && nextIndex === tabbableRovingIndex) {
-                const saved = overlayTrap.trapLastRovingFocus;
-                if ((saved === null || saved === void 0 ? void 0 : saved.isConnected) && lastOverlay.contains(saved) && saved !== nextEl) {
-                    focusTarget = saved;
-                }
-            }
-            focusElement(focusTarget);
-        }, true);
         // handle back-button click
         doc.addEventListener('ionBackButton', (ev) => {
             const lastOverlay = getPresentedOverlay(doc);
-            if (lastOverlay === null || lastOverlay === void 0 ? void 0 : lastOverlay.backdropDismiss) {
+            if (lastOverlay?.backdropDismiss) {
                 ev.detail.register(OVERLAY_BACK_BUTTON_PRIORITY, () => {
                     /**
                      * Do not return this promise otherwise
@@ -627,7 +344,7 @@ const connectListeners = (doc) => {
             doc.addEventListener('keydown', (ev) => {
                 if (ev.key === 'Escape') {
                     const lastOverlay = getPresentedOverlay(doc);
-                    if (lastOverlay === null || lastOverlay === void 0 ? void 0 : lastOverlay.backdropDismiss) {
+                    if (lastOverlay?.backdropDismiss) {
                         lastOverlay.dismiss(undefined, BACKDROP);
                     }
                 }
@@ -647,7 +364,7 @@ export const dismissOverlay = (doc, data, role, overlayTag, id) => {
  */
 export const getOverlays = (doc, selector) => {
     if (selector === undefined) {
-        selector = 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-picker-legacy,ion-popover,ion-toast';
+        selector = 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-popover,ion-toast';
     }
     return Array.from(doc.querySelectorAll(selector)).filter((c) => c.overlayIndex > 0);
 };
@@ -709,8 +426,30 @@ export const setRootAriaHidden = (hidden = false) => {
         viewContainer.removeAttribute('aria-hidden');
     }
 };
-export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, ionicEnterAnimation, opts) => {
-    var _a, _b;
+/**
+ * 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).
+ *
+ * Should be called from an overlay's `disconnectedCallback`
+ * when the overlay was still presented at the time of removal.
+ */
+export const cleanupRootFocusTrapAccessibility = () => {
+    if (typeof document === 'undefined') {
+        return;
+    }
+    const remainingOverlays = getPresentedOverlays(document);
+    const hasRemainingLocking = remainingOverlays.some((o) => {
+        const el = o;
+        return el.tagName !== 'ION-TOAST' && el.focusTrap !== false && isBackdropAlwaysBlocking(el);
+    });
+    if (!hasRemainingLocking) {
+        setRootAriaHidden(false);
+        document.body.classList.remove(BACKDROP_NO_SCROLL);
+    }
+};
+export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation, opts) => {
     if (overlay.presented) {
         return;
     }
@@ -756,20 +495,16 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
         }
         document.body.classList.add(BACKDROP_NO_SCROLL);
     }
-    (_a = overlay.willPresentShorthand) === null || _a === void 0 ? void 0 : _a.emit();
-    const theme = getIonTheme(overlay);
+    overlay.willPresentShorthand?.emit();
     const mode = getIonMode(overlay);
-    const selectedAnimation = mode === 'ios'
-        ? iosEnterAnimation
-        : theme === 'ionic' && ionicEnterAnimation
-            ? ionicEnterAnimation
-            : mdEnterAnimation;
     // get the user's animation fn if one was provided
-    const animationBuilder = overlay.enterAnimation ? overlay.enterAnimation : config.get(name, selectedAnimation);
+    const animationBuilder = overlay.enterAnimation
+        ? overlay.enterAnimation
+        : config.get(name, mode === 'ios' ? iosEnterAnimation : mdEnterAnimation);
     const completed = await overlayAnimation(overlay, animationBuilder, overlay.el, opts);
     if (completed) {
         overlay.didPresent.emit();
-        (_b = overlay.didPresentShorthand) === null || _b === void 0 ? void 0 : _b.emit();
+        overlay.didPresentShorthand?.emit();
     }
     /**
      * If the focused element is already
@@ -789,7 +524,7 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
          * exists (e.g. picker-legacy), we fall back to the host.
          */
         const overlayWrapper = getElementRoot(overlay.el).querySelector('[role="dialog"][tabindex]');
-        const focusTarget = overlayWrapper !== null && overlayWrapper !== void 0 ? overlayWrapper : overlay.el;
+        const focusTarget = overlayWrapper ?? overlay.el;
         /**
          * `preventScroll` keeps this a pure focus move so the viewport does not
          * jump when the wrapper is partially off-screen (e.g. a sheet modal).
@@ -799,7 +534,7 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
         try {
             focusTarget.focus({ preventScroll: true });
         }
-        catch (_c) {
+        catch {
             focusTarget.focus();
         }
     }
@@ -835,7 +570,7 @@ const restoreElementFocus = async (overlayEl) => {
     }
     // Ensure active element is blurred to prevent a11y warning issues
     previousElement.blur();
-    const shadowRoot = previousElement === null || previousElement === void 0 ? void 0 : previousElement.shadowRoot;
+    const shadowRoot = previousElement?.shadowRoot;
     if (shadowRoot) {
         // If there are no inner focusable elements, just focus the host element.
         previousElement = shadowRoot.querySelector(focusableQueryString) || previousElement;
@@ -870,7 +605,6 @@ const restoreElementFocus = async (overlayEl) => {
     }
 };
 export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnimation, opts) => {
-    var _a, _b;
     if (!overlay.presented) {
         return false;
     }
@@ -905,7 +639,7 @@ export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLe
         // Overlay contents should not be clickable during dismiss
         overlay.el.style.setProperty('pointer-events', 'none');
         overlay.willDismiss.emit({ data, role });
-        (_a = overlay.willDismissShorthand) === null || _a === void 0 ? void 0 : _a.emit({ data, role });
+        overlay.willDismissShorthand?.emit({ data, role });
         const mode = getIonMode(overlay);
         const animationBuilder = overlay.leaveAnimation
             ? overlay.leaveAnimation
@@ -915,7 +649,7 @@ export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLe
             await overlayAnimation(overlay, animationBuilder, overlay.el, opts);
         }
         overlay.didDismiss.emit({ data, role });
-        (_b = overlay.didDismissShorthand) === null || _b === void 0 ? void 0 : _b.emit({ data, role });
+        overlay.didDismissShorthand?.emit({ data, role });
         // Get a reference to all animations currently assigned to this overlay
         // Then tear them down to return the overlay to its initial visual state
         const animations = activeAnimations.get(overlay) || [];
@@ -943,8 +677,7 @@ export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLe
     return true;
 };
 const getAppRoot = (doc) => {
-    const appRootSelector = config.get('appRootSelector', 'ion-app');
-    return doc.querySelector(appRootSelector) || doc.body;
+    return doc.querySelector('ion-app') || doc.body;
 };
 const overlayAnimation = async (overlay, animationBuilder, baseEl, opts) => {
     // Make overlay visible in case it's hidden
@@ -957,7 +690,7 @@ const overlayAnimation = async (overlay, animationBuilder, baseEl, opts) => {
     if (overlay.keyboardClose) {
         animation.beforeAddWrite(() => {
             const activeElement = baseEl.ownerDocument.activeElement;
-            if (activeElement === null || activeElement === void 0 ? void 0 : activeElement.matches('input,ion-input, ion-textarea')) {
+            if (activeElement?.matches('input,ion-input, ion-textarea')) {
                 activeElement.blur();
             }
         });

package/dist/collection/utils/platform.js

@@ -25,7 +25,7 @@ export const setupPlatforms = (win = window) => {
 const detectPlatforms = (win) => {
     const customPlatformMethods = config.get('platform');
     return Object.keys(PLATFORMS_MAP).filter((p) => {
-        const customMethod = customPlatformMethods === null || customPlatformMethods === void 0 ? void 0 : customPlatformMethods[p];
+        const customMethod = customPlatformMethods?.[p];
         return typeof customMethod === 'function' ? customMethod(win) : PLATFORMS_MAP[p](win);
     });
 };
@@ -67,13 +67,12 @@ const isHybrid = (win) => isCordova(win) || isCapacitorNative(win);
 const isCordova = (win) => !!(win['cordova'] || win['phonegap'] || win['PhoneGap']);
 const isCapacitorNative = (win) => {
     const capacitor = win['Capacitor'];
-    // TODO(ROU-11693): Remove when we no longer support Capacitor 2, which does not have isNativePlatform
-    return !!((capacitor === null || capacitor === void 0 ? void 0 : capacitor.isNative) || ((capacitor === null || capacitor === void 0 ? void 0 : capacitor.isNativePlatform) && !!capacitor.isNativePlatform()));
+    return !!capacitor?.isNativePlatform?.();
 };
 const isElectron = (win) => testUserAgent(win, /electron/i);
-const isPWA = (win) => { var _a; return !!(((_a = win.matchMedia) === null || _a === void 0 ? void 0 : _a.call(win, '(display-mode: standalone)').matches) || win.navigator.standalone); };
+const isPWA = (win) => !!(win.matchMedia?.('(display-mode: standalone)').matches || win.navigator.standalone);
 export const testUserAgent = (win, expr) => expr.test(win.navigator.userAgent);
-const matchMedia = (win, query) => { var _a; return (_a = win.matchMedia) === null || _a === void 0 ? void 0 : _a.call(win, query).matches; };
+const matchMedia = (win, query) => win.matchMedia?.(query).matches;
 const PLATFORMS_MAP = {
     ipad: isIpad,
     iphone: isIphone,

package/dist/collection/utils/rtl/dir.js

@@ -12,5 +12,5 @@ export const isRTL = (hostEl) => {
             return hostEl.dir.toLowerCase() === 'rtl';
         }
     }
-    return (document === null || document === void 0 ? void 0 : document.dir.toLowerCase()) === 'rtl';
+    return document?.dir.toLowerCase() === 'rtl';
 };

package/dist/collection/utils/sanitization/index.js

@@ -222,9 +222,8 @@ const getElementChildren = (el) => {
     return el.children != null ? el.children : el.childNodes;
 };
 const isSanitizerEnabled = () => {
-    var _a;
     const win = window;
-    const config = (_a = win === null || win === void 0 ? void 0 : win.Ionic) === null || _a === void 0 ? void 0 : _a.config;
+    const config = win?.Ionic?.config;
     if (config) {
         if (config.get) {
             return config.get('sanitizerEnabled', true);
@@ -415,6 +414,7 @@ const elementPropsToReflect = {
     'ION-ICON': ['icon', 'name', 'src', 'ios', 'md'],
 };
 export class IonicSafeString {
+    value;
     constructor(value) {
         this.value = value;
     }

package/dist/collection/utils/select-option-render.js

@@ -33,9 +33,8 @@ import { sanitizeDOMTree } from "./sanitization/index";
  * public API.
  */
 export const cloneToVNode = (node, keyPrefix, index) => {
-    var _a;
     if (node.nodeType === Node.TEXT_NODE) {
-        return (_a = node.textContent) !== null && _a !== void 0 ? _a : '';
+        return node.textContent ?? '';
     }
     if (node.nodeType !== Node.ELEMENT_NODE) {
         return null;

package/dist/collection/utils/slot-mutation-controller.js

@@ -69,7 +69,6 @@ export const createSlotMutationController = (el, slotName, mutationCallback) =>
      * of the component.
      */
     const watchForSlotChange = (slottedEl) => {
-        var _a;
         if (slottedContentMutationObserver) {
             slottedContentMutationObserver.disconnect();
             slottedContentMutationObserver = undefined;
@@ -95,7 +94,7 @@ export const createSlotMutationController = (el, slotName, mutationCallback) =>
          * We listen on the parentElement so that we can
          * detect when slotted element itself is removed.
          */
-        slottedContentMutationObserver.observe((_a = slottedEl.parentElement) !== null && _a !== void 0 ? _a : slottedEl, { subtree: true, childList: true });
+        slottedContentMutationObserver.observe(slottedEl.parentElement ?? slottedEl, { subtree: true, childList: true });
     };
     const destroy = () => {
         if (hostMutationObserver) {

package/dist/collection/utils/test/playwright/apply-keyboard-focus.js

@@ -17,7 +17,7 @@ import { expect } from "@playwright/test";
  */
 export const applyKeyboardFocus = async (page, locator, indicatorLocator = locator) => {
     await expect(async () => {
-        await page.evaluate(() => { var _a; return (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.blur(); });
+        await page.evaluate(() => document.activeElement?.blur());
         await page.keyboard.press('Shift');
         await locator.focus();
         await expect(indicatorLocator).toHaveClass(/ion-focused/, { timeout: 250 });