@ionic/core 7.7.2-dev.11707425083.192d8103 → 7.7.2-dev.11707840956.16e27b4c

package/dist/collection/components/toggle/toggle.ios.css

@@ -129,10 +129,28 @@
   opacity: 0;
   pointer-events: none;
 }
-:host(.legacy-toggle) label {
-  inset-inline-start: 0;
+@supports (inset-inline-start: 0) {
+  :host(.legacy-toggle) label {
+    inset-inline-start: 0;
+  }
+}
+@supports not (inset-inline-start: 0) {
+  :host(.legacy-toggle) label {
+    left: 0;
+  }
+  :host-context([dir=rtl]):host(.legacy-toggle) label, :host-context([dir=rtl]).legacy-toggle label {
+    left: unset;
+    right: unset;
+    right: 0;
+  }
+  @supports selector(:dir(rtl)) {
+    :host(.legacy-toggle:dir(rtl)) label {
+      left: unset;
+      right: unset;
+      right: 0;
+    }
+  }
 }
-
 :host(.legacy-toggle) label::-moz-focus-inner {
   border: 0;
 }
@@ -514,29 +532,29 @@ input {
  */
 :host {
   --track-background: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.088);
-  --track-background-checked: var(--ion-color-primary, #0054e9);
-  --border-radius: 15.5px;
+  --track-background-checked: var(--ion-color-primary, #3880ff);
+  --border-radius: 16px;
   --handle-background: #ffffff;
   --handle-background-checked: #ffffff;
   --handle-border-radius: 25.5px;
-  --handle-box-shadow: 0 3px 4px rgba(0, 0, 0, 0.06), 0 3px 8px rgba(0, 0, 0, 0.06);
-  --handle-height: calc(31px - (2px * 2));
+  --handle-box-shadow: 0 3px 12px rgba(0, 0, 0, 0.16), 0 3px 1px rgba(0, 0, 0, 0.1);
+  --handle-height: calc(32px - (2px * 2));
   --handle-max-height: calc(100% - var(--handle-spacing) * 2);
-  --handle-width: calc(31px - (2px * 2));
+  --handle-width: calc(32px - (2px * 2));
   --handle-spacing: 2px;
   --handle-transition: transform 300ms, width 120ms ease-in-out 80ms, left 110ms ease-in-out 80ms, right 110ms ease-in-out 80ms;
 }
 
 :host(.legacy-toggle) {
   width: 51px;
-  height: 31px;
+  height: 32px;
   contain: strict;
   overflow: hidden;
 }
 
 .native-wrapper .toggle-icon {
   width: 51px;
-  height: 31px;
+  height: 32px;
   /**
    * The handle box shadow should not
    * overflow outside of the track container.
@@ -572,7 +590,7 @@ input {
 
 .toggle-switch-icon {
   position: absolute;
-  color: var(--ion-color-dark, #2f2f2f);
+  color: var(--ion-color-dark);
 }
 
 :host(.toggle-ltr) .toggle-switch-icon {

package/dist/collection/components/toggle/toggle.md.css

@@ -129,10 +129,28 @@
   opacity: 0;
   pointer-events: none;
 }
-:host(.legacy-toggle) label {
-  inset-inline-start: 0;
+@supports (inset-inline-start: 0) {
+  :host(.legacy-toggle) label {
+    inset-inline-start: 0;
+  }
+}
+@supports not (inset-inline-start: 0) {
+  :host(.legacy-toggle) label {
+    left: 0;
+  }
+  :host-context([dir=rtl]):host(.legacy-toggle) label, :host-context([dir=rtl]).legacy-toggle label {
+    left: unset;
+    right: unset;
+    right: 0;
+  }
+  @supports selector(:dir(rtl)) {
+    :host(.legacy-toggle:dir(rtl)) label {
+      left: unset;
+      right: unset;
+      right: 0;
+    }
+  }
 }
-
 :host(.legacy-toggle) label::-moz-focus-inner {
   border: 0;
 }
@@ -514,10 +532,10 @@ input {
  */
 :host {
   --track-background: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.39);
-  --track-background-checked: rgba(var(--ion-color-primary-rgb, 0, 84, 233), 0.5);
+  --track-background-checked: rgba(var(--ion-color-primary-rgb, 56, 128, 255), 0.5);
   --border-radius: 14px;
   --handle-background: #ffffff;
-  --handle-background-checked: var(--ion-color-primary, #0054e9);
+  --handle-background-checked: var(--ion-color-primary, #3880ff);
   --handle-border-radius: 50%;
   --handle-box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
   --handle-width: 20px;

package/dist/collection/components/toolbar/toolbar.js

@@ -62,10 +62,10 @@ export class Toolbar {
         this.childrenStyles.forEach((value) => {
             Object.assign(childStyles, value);
         });
-        return (h(Host, { key: '921a07b820aabf0ba2ec7593eed812e3b8727af6', class: Object.assign(Object.assign({}, childStyles), createColorClasses(this.color, {
+        return (h(Host, { key: 'afac0f08f3981483c072984ce047df5dc9cc1e99', class: Object.assign(Object.assign({}, childStyles), createColorClasses(this.color, {
                 [mode]: true,
                 'in-toolbar': hostContext('ion-toolbar', this.el),
-            })) }, h("div", { key: '3276d6d80737ef9657214ef2c5497d646b00e34b', class: "toolbar-background" }), h("div", { key: '9239220864bda5c213e917b07d02b84158bf0204', class: "toolbar-container" }, h("slot", { key: '6daeb51d141ec3174db6c899cbd441c892090ee6', name: "start" }), h("slot", { key: '3296db905660738a9b750de5ea5ed818fc27ca76', name: "secondary" }), h("div", { key: '34885ca5fe15b588164d748e7799ef2cdb29bfce', class: "toolbar-content" }, h("slot", { key: 'd3431eb7666bf5280ea233f4d7e1da8708b54420' })), h("slot", { key: 'b01ec5f1d6594629f12fc788e7510f5f55f5a744', name: "primary" }), h("slot", { key: '505a0a5947b84188c1e505b64fcd8657da092717', name: "end" }))));
+            })) }, h("div", { key: '30d4f1d0ec01cc646398301b5f7d469391eb35d2', class: "toolbar-background" }), h("div", { key: '175d1f283e670b57a9bf8fd2a8c5e7d0da749aa8', class: "toolbar-container" }, h("slot", { key: '4853b18092737b32b5995457536fa5a7fc2816ef', name: "start" }), h("slot", { key: '6eb4921200aad02d7977d134edad6cff2aad91ad', name: "secondary" }), h("div", { key: '024e0339c74c4b9a886d49e96723243719643dc2', class: "toolbar-content" }, h("slot", { key: 'b6452c84692fedd6efe33ac67907d01253b76f8f' })), h("slot", { key: '636e56eeaa318ce45a9c3854a30b8eb2819a33e0', name: "primary" }), h("slot", { key: 'a45c19b93dca3719d75bd4d99acc49de87137a7d', name: "end" }))));
     }
     static get is() { return "ion-toolbar"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/css/test/a11y/typography.e2e.js

@@ -1,7 +1,6 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import AxeBuilder from "@axe-core/playwright";
 import { expect } from "@playwright/test";
 import { configs, test } from "../../../utils/test/playwright/index";
 configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, screenshot, config }) => {
@@ -31,20 +30,3 @@ configs({ directions: ['ltr'], modes: ['ios'] }).forEach(({ title, screenshot, c
         });
     });
 });
-configs({ directions: ['ltr'], themes: ['light', 'dark'] }).forEach(({ config, title }) => {
-    test.describe(title('typography: a11y'), () => {
-        test('should not have accessibility violations for anchor tags', async ({ page }) => {
-            /**
-             * All page content should be contained by landmarks (main, nav, etc.)
-             * By containing the badge in a main element, we can avoid this violation.
-             */
-            await page.setContent(`
-        <main>
-          <a href="#">Link</a>
-        </main>
-      `, config);
-            const results = await new AxeBuilder({ page }).analyze();
-            expect(results.violations).toEqual([]);
-        });
-    });
-});

package/dist/collection/utils/gesture/button-active.js

@@ -12,7 +12,7 @@ export const createButtonActiveGesture = (el, isButton) => {
             return;
         }
         const target = document.elementFromPoint(x, y);
-        if (!target || !isButton(target) || target.disabled) {
+        if (!target || !isButton(target)) {
             clearActiveButton();
             return;
         }

package/dist/collection/utils/gesture/gesture-controller.js

@@ -189,5 +189,5 @@ class BlockerDelegate {
         this.ctrl = undefined;
     }
 }
-export const BACKDROP_NO_SCROLL = 'backdrop-no-scroll';
+const BACKDROP_NO_SCROLL = 'backdrop-no-scroll';
 export const GESTURE_CONTROLLER = new GestureController();

package/dist/collection/utils/overlays.js

@@ -6,7 +6,6 @@ import { shoudUseCloseWatcher } from "./hardware-back-button";
 import { config } from "../global/config";
 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";
 import { addEventListener, componentOnReady, focusElement, getElementRoot, removeEventListener } from "./helpers";
 import { printIonWarning } from "./logging";
@@ -30,10 +29,7 @@ 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 pickerController = /*@__PURE__*/ createController('ion-picker');
 export const popoverController = /*@__PURE__*/ createController('ion-popover');
 export const toastController = /*@__PURE__*/ createController('ion-toast');
 /**
@@ -143,7 +139,7 @@ const focusLastDescendant = (ref, overlay) => {
  * Should NOT include: Toast
  */
 const trapKeyboardFocus = (ev, doc) => {
-    const lastOverlay = getPresentedOverlay(doc, 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-picker-legacy,ion-popover');
+    const lastOverlay = getPresentedOverlay(doc, 'ion-alert,ion-action-sheet,ion-loading,ion-modal,ion-picker,ion-popover');
     const target = ev.target;
     /**
      * If no active overlay, ignore this event.
@@ -347,7 +343,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-picker,ion-popover,ion-toast';
     }
     return Array.from(doc.querySelectorAll(selector)).filter((c) => c.overlayIndex > 0);
 };
@@ -413,7 +409,15 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
         return;
     }
     setRootAriaHidden(true);
-    document.body.classList.add(BACKDROP_NO_SCROLL);
+    /**
+     * Hide all other overlays from screen readers so only this one
+     * can be read. Note that presenting an overlay always makes
+     * it the topmost one.
+     */
+    if (doc !== undefined) {
+        const presentedOverlays = getPresentedOverlays(doc);
+        presentedOverlays.forEach((o) => o.setAttribute('aria-hidden', 'true'));
+    }
     overlay.presented = true;
     overlay.willPresent.emit();
     (_a = overlay.willPresentShorthand) === null || _a === void 0 ? void 0 : _a.emit();
@@ -436,7 +440,7 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
      * from returning focus as a result.
      */
     if (overlay.el.tagName !== 'ION-TOAST') {
-        focusPreviousElementOnDismiss(overlay.el);
+        restoreElementFocus(overlay.el);
     }
     /**
      * If the focused element is already
@@ -447,6 +451,14 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
     if (overlay.keyboardClose && (document.activeElement === null || !overlay.el.contains(document.activeElement))) {
         overlay.el.focus();
     }
+    /**
+     * If this overlay was previously dismissed without being
+     * the topmost one (such as by manually calling dismiss()),
+     * it would still have aria-hidden on being presented again.
+     * Removing it here ensures the overlay is visible to screen
+     * readers.
+     */
+    overlay.el.removeAttribute('aria-hidden');
 };
 /**
  * When an overlay component is dismissed,
@@ -458,7 +470,7 @@ export const present = async (overlay, name, iosEnterAnimation, mdEnterAnimation
  * to where they were before they
  * opened the overlay.
  */
-const focusPreviousElementOnDismiss = async (overlayEl) => {
+const restoreElementFocus = async (overlayEl) => {
     let previousElement = document.activeElement;
     if (!previousElement) {
         return;
@@ -469,21 +481,45 @@ const focusPreviousElementOnDismiss = async (overlayEl) => {
         previousElement = shadowRoot.querySelector(focusableQueryString) || previousElement;
     }
     await overlayEl.onDidDismiss();
-    previousElement.focus();
+    /**
+     * After onDidDismiss, the overlay loses focus
+     * because it is removed from the document
+     *
+     * > An element will also lose focus [...]
+     * > if the element is removed from the document)
+     *
+     * https://developer.mozilla.org/en-US/docs/Web/API/Element/blur_event
+     *
+     * Additionally, `document.activeElement` returns:
+     *
+     * > The Element which currently has focus,
+     * > `<body>` or null if there is
+     * > no focused element.
+     *
+     * https://developer.mozilla.org/en-US/docs/Web/API/Document/activeElement#value
+     *
+     * However, if the user has already focused
+     * an element sometime between onWillDismiss
+     * and onDidDismiss (for example, focusing a
+     * text box after tapping a button in an
+     * action sheet) then don't restore focus to
+     * previous element
+     */
+    if (document.activeElement === null || document.activeElement === document.body) {
+        previousElement.focus();
+    }
 };
 export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLeaveAnimation, opts) => {
-    var _a, _b;
+    var _a, _b, _c;
     if (!overlay.presented) {
         return false;
     }
-    const lastOverlay = doc !== undefined && getPresentedOverlays(doc).length === 1;
     /**
      * If this is the last visible overlay then
      * we want to re-add the root to the accessibility tree.
      */
-    if (lastOverlay) {
+    if (doc !== undefined && getPresentedOverlays(doc).length === 1) {
         setRootAriaHidden(false);
-        document.body.classList.remove(BACKDROP_NO_SCROLL);
     }
     overlay.presented = false;
     try {
@@ -525,6 +561,13 @@ export const dismiss = async (overlay, data, role, name, iosLeaveAnimation, mdLe
         console.error(err);
     }
     overlay.el.remove();
+    /**
+     * If there are other overlays presented, unhide the new
+     * topmost one from screen readers.
+     */
+    if (doc !== undefined) {
+        (_c = getPresentedOverlay(doc)) === null || _c === void 0 ? void 0 : _c.removeAttribute('aria-hidden');
+    }
     return true;
 };
 const getAppRoot = (doc) => {

package/dist/collection/utils/test/overlays/overlays.e2e.js

@@ -175,5 +175,38 @@ configs({ modes: ['ios'], directions: ['ltr'] }).forEach(({ title, config }) =>
             await modalInputOne.click();
             await expect(modalInputOne).toBeFocused();
         });
+        test('should not return focus to another element if focus already manually returned', async ({ page, skip, }, testInfo) => {
+            skip.browser('webkit', 'WebKit does not consider buttons to be focusable, so this test always passes since the input is the only focusable element.');
+            testInfo.annotations.push({
+                type: 'issue',
+                description: 'https://github.com/ionic-team/ionic-framework/issues/28849',
+            });
+            await page.setContent(`
+        <button id="open-action-sheet">open</button>
+        <ion-action-sheet trigger="open-action-sheet"></ion-action-sheet>
+        <input id="test-input" />
+
+        <script>
+          const actionSheet = document.querySelector('ion-action-sheet');
+
+          actionSheet.addEventListener('ionActionSheetWillDismiss', () => {
+            requestAnimationFrame(() => {
+              document.querySelector('#test-input').focus();
+            });
+          });
+        </script>
+      `, config);
+            const ionActionSheetDidPresent = await page.spyOnEvent('ionActionSheetDidPresent');
+            const actionSheet = page.locator('ion-action-sheet');
+            const input = page.locator('#test-input');
+            const trigger = page.locator('#open-action-sheet');
+            // present action sheet
+            await trigger.click();
+            await ionActionSheetDidPresent.next();
+            // dismiss action sheet
+            await actionSheet.evaluate((el) => el.dismiss());
+            // verify focus is in correct location
+            await expect(input).toBeFocused();
+        });
     });
 });

package/dist/collection/utils/test/overlays/overlays.spec.js

@@ -100,3 +100,54 @@ describe('setRootAriaHidden()', () => {
         expect(routerOutlet.hasAttribute('aria-hidden')).toEqual(false);
     });
 });
+describe('aria-hidden on individual overlays', () => {
+    it('should hide non-topmost overlays from screen readers', async () => {
+        const page = await newSpecPage({
+            components: [Modal],
+            html: `
+        <ion-modal id="one"></ion-modal>
+        <ion-modal id="two"></ion-modal>
+      `,
+        });
+        const modalOne = page.body.querySelector('ion-modal#one');
+        const modalTwo = page.body.querySelector('ion-modal#two');
+        await modalOne.present();
+        await modalTwo.present();
+        expect(modalOne.hasAttribute('aria-hidden')).toEqual(true);
+        expect(modalTwo.hasAttribute('aria-hidden')).toEqual(false);
+    });
+    it('should unhide new topmost overlay from screen readers when topmost is dismissed', async () => {
+        const page = await newSpecPage({
+            components: [Modal],
+            html: `
+        <ion-modal id="one"></ion-modal>
+        <ion-modal id="two"></ion-modal>
+      `,
+        });
+        const modalOne = page.body.querySelector('ion-modal#one');
+        const modalTwo = page.body.querySelector('ion-modal#two');
+        await modalOne.present();
+        await modalTwo.present();
+        // dismiss modalTwo so that modalOne becomes the new topmost overlay
+        await modalTwo.dismiss();
+        expect(modalOne.hasAttribute('aria-hidden')).toEqual(false);
+    });
+    it('should not keep overlays hidden from screen readers if presented after being dismissed while non-topmost', async () => {
+        const page = await newSpecPage({
+            components: [Modal],
+            html: `
+        <ion-modal id="one"></ion-modal>
+        <ion-modal id="two"></ion-modal>
+      `,
+        });
+        const modalOne = page.body.querySelector('ion-modal#one');
+        const modalTwo = page.body.querySelector('ion-modal#two');
+        await modalOne.present();
+        await modalTwo.present();
+        // modalOne is not the topmost overlay at this point and is hidden from screen readers
+        await modalOne.dismiss();
+        // modalOne will become the topmost overlay; ensure it isn't still hidden from screen readers
+        await modalOne.present();
+        expect(modalOne.hasAttribute('aria-hidden')).toEqual(false);
+    });
+});

package/dist/collection/utils/test/playwright/generator.js

@@ -72,5 +72,4 @@ const DEFAULT_THEMES = ['light'];
 const DEFAULT_TEST_CONFIG_OPTION = {
     modes: DEFAULT_MODES,
     directions: DEFAULT_DIRECTIONS,
-    themes: DEFAULT_THEMES,
 };

package/dist/collection/utils/test/playwright/page/utils/set-content.js

@@ -39,7 +39,7 @@ export const setContent = async (page, html, testInfo, options) => {
         <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0" />
         <link href="${baseUrl}/css/ionic.bundle.css" rel="stylesheet" />
         <link href="${baseUrl}/scripts/testing/styles.css" rel="stylesheet" />
-        ${theme !== 'light' ? `<link href="${baseUrl}/css/themes/${theme}.always.css" rel="stylesheet" />` : ''}
+        ${theme !== 'light' ? `<link href="${baseUrl}/scripts/testing/themes/${theme}.css" rel="stylesheet" />` : ''}
         <script src="${baseUrl}/scripts/testing/scripts.js"></script>
         <script type="module" src="${baseUrl}/dist/ionic/ionic.esm.js"></script>
         <script>