@ionic/core 8.7.6-dev.11759493293.13f81b9f → 8.7.6-dev.11759523190.11a976aa

package/dist/collection/utils/focus-visible.js

@@ -17,28 +17,6 @@ const FOCUS_KEYS = [
     'Home',
     'End',
 ];
-let focusVisibleUtility = null;
-export const getOrInitFocusVisibleUtility = () => {
-    if (!focusVisibleUtility) {
-        focusVisibleUtility = startFocusVisible();
-    }
-    return focusVisibleUtility;
-};
-/**
- * Used to set focus on an element that uses `ion-focusable`.
- * Do not use this if focusing the element as a result of a keyboard
- * event as the focus utility should handle this for us. This method
- * should be used when we want to programmatically focus an element as
- * a result of another user action. (Ex: We focus the first element
- * inside of a popover when the user presents it, but the popover is not always
- * presented as a result of keyboard action.)
- *
- * @param elements - The elements to set focus on.
- */
-export const focusElements = (elements) => {
-    const focusVisible = getOrInitFocusVisibleUtility();
-    focusVisible.setFocus(elements);
-};
 export const startFocusVisible = (rootEl) => {
     let currentFocus = [];
     let keyboardMode = true;

package/dist/collection/utils/framework-delegate.js

@@ -1,7 +1,6 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { config } from "../global/config";
 import { componentOnReady } from "./helpers";
 // TODO(FW-2832): types
 export const attachComponent = async (delegate, container, component, cssClasses, componentProps, inline) => {
@@ -102,8 +101,7 @@ export const CoreDelegate = () => {
          * Get the root of the app and
          * add the overlay there.
          */
-        const appRootSelector = config.get('appRootSelector', 'ion-app');
-        const app = document.querySelector(appRootSelector) || document.body;
+        const app = document.querySelector('ion-app') || document.body;
         /**
          * Create a placeholder comment so that
          * we can return this component to where

package/dist/collection/utils/helpers.js

@@ -1,9 +1,7 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { focusElements } from "./focus-visible";
 import { printIonError } from "./logging/index";
-import { config } from "../global/config";
 export const transitionEndAsync = (el, expectedDuration = 0) => {
     return new Promise((resolve) => {
         transitionEnd(el, expectedDuration, resolve);
@@ -205,17 +203,6 @@ export const raf = (h) => {
 export const hasShadowDom = (el) => {
     return !!el.shadowRoot && !!el.attachShadow;
 };
-/**
- * Focuses a given element while ensuring proper focus management
- * within the Ionic framework. If the element is marked as `ion-focusable`,
- * this function will delegate focus handling to `ion-app` or manually
- * apply focus when a custom app root is used.
- *
- * This function helps maintain accessibility and expected focus behavior
- * in both standard and custom root environments.
- *
- * @param el - The element to focus.
- */
 export const focusVisibleElement = (el) => {
     el.focus();
     /**
@@ -227,36 +214,9 @@ export const focusVisibleElement = (el) => {
      * which will let us explicitly set the elements to focus.
      */
     if (el.classList.contains('ion-focusable')) {
-        const appRootSelector = config.get('appRootSelector', 'ion-app');
-        const app = el.closest(appRootSelector);
+        const app = el.closest('ion-app');
         if (app) {
-            if (appRootSelector === 'ion-app') {
-                /**
-                 * If the app root is the default, then it will be
-                 * in charge of setting focus. This is because the
-                 * focus-visible utility is attached to the app root
-                 * and will handle setting focus on the correct element.
-                 */
-                app.setFocus([el]);
-            }
-            else {
-                /**
-                 * When using a custom app root selector, the focus-visible
-                 * utility is not available to manage focus automatically.
-                 * If we set focus immediately, the element may not be fully
-                 * rendered or interactive, especially if it was just added
-                 * to the DOM. Using requestAnimationFrame ensures that focus
-                 * is applied on the next frame, allowing the DOM to settle
-                 * before changing focus.
-                 */
-                requestAnimationFrame(() => {
-                    /**
-                     * The focus-visible utility is used to set focus on an
-                     * element that uses `ion-focusable`.
-                     */
-                    focusElements([el]);
-                });
-            }
+            app.setFocus([el]);
         }
     }
 };

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

@@ -2,7 +2,6 @@
  * (C) Ionic http://ionicframework.com - MIT License
  */
 import { doc, win } from "../browser/index";
-import { config } from "../../global/config";
 import { Keyboard, KeyboardResize } from "../native/keyboard";
 /**
  * The element that resizes when the keyboard opens
@@ -26,8 +25,7 @@ const getResizeContainer = (resizeMode) => {
      * on that. In the event `ion-app` is not available then
      * we can fall back to `body`.
      */
-    const appRootSelector = config.get('appRootSelector', 'ion-app');
-    const ionApp = doc.querySelector(appRootSelector);
+    const ionApp = doc.querySelector('ion-app');
     return ionApp !== null && ionApp !== void 0 ? ionApp : doc.body;
 };
 /**

package/dist/collection/utils/menu-controller/animations/overlay.js

@@ -27,8 +27,8 @@ export const menuOverlayAnimation = (menu) => {
     }
     menuAnimation.addElement(menu.menuInnerEl).fromTo('transform', `translateX(${closedX})`, `translateX(${openedX})`);
     const mode = getIonMode(menu);
-    const isIOS = mode === 'ios';
-    const opacity = isIOS ? 0.2 : 0.25;
+    const isIos = mode === 'ios';
+    const opacity = isIos ? 0.2 : 0.25;
     backdropAnimation.addElement(menu.backdropEl).fromTo('opacity', 0.01, opacity);
-    return baseAnimation(isIOS).addAnimation([menuAnimation, backdropAnimation]);
+    return baseAnimation(isIos).addAnimation([menuAnimation, backdropAnimation]);
 };

package/dist/collection/utils/menu-controller/animations/push.js

@@ -14,7 +14,6 @@ export const menuPushAnimation = (menu) => {
     let menuClosedX;
     const mode = getIonMode(menu);
     const width = menu.width;
-    const isIOS = mode === 'ios';
     if (menu.isEndSide) {
         contentOpenedX = -width + 'px';
         menuClosedX = width + 'px';
@@ -30,5 +29,5 @@ export const menuPushAnimation = (menu) => {
         .addElement(menu.contentEl)
         .fromTo('transform', 'translateX(0px)', `translateX(${contentOpenedX})`);
     const backdropAnimation = createAnimation().addElement(menu.backdropEl).fromTo('opacity', 0.01, 0.32);
-    return baseAnimation(isIOS).addAnimation([menuAnimation, contentAnimation, backdropAnimation]);
+    return baseAnimation(mode === 'ios').addAnimation([menuAnimation, contentAnimation, backdropAnimation]);
 };

package/dist/collection/utils/menu-controller/animations/reveal.js

@@ -11,10 +11,9 @@ import { baseAnimation } from "./base";
  */
 export const menuRevealAnimation = (menu) => {
     const mode = getIonMode(menu);
-    const isIOS = mode === 'ios';
     const openedX = menu.width * (menu.isEndSide ? -1 : 1) + 'px';
     const contentOpen = createAnimation()
         .addElement(menu.contentEl) // REVIEW
         .fromTo('transform', 'translateX(0px)', `translateX(${openedX})`);
-    return baseAnimation(isIOS).addAnimation(contentOpen);
+    return baseAnimation(mode === 'ios').addAnimation(contentOpen);
 };

package/dist/collection/utils/overlays.js

@@ -631,8 +631,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

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

@@ -8,56 +8,34 @@
  * each test title is unique.
  */
 const generateTitle = (title, config) => {
-    const { direction, palette, mode, theme } = config;
-    /**
-     * The iOS theme can only be used with the iOS mode,
-     * and the MD theme can only be used with the MD mode.
-     *
-     * This logic enables the fallback behavior for existing tests,
-     * where we only tested against a mode, which accounted for both
-     * the theme and mode.
-     */
-    if (theme === 'ios' || theme === 'md') {
-        if (palette === 'light') {
-            /**
-             * Ionic has many existing tests that existed prior to
-             * the introduction of theme testing. To maintain backwards
-             * compatibility, we will not include the theme in the test
-             * title if the theme is set to light.
-             */
-            return `${title} - ${mode}/${direction}`;
-        }
-        return `${title} - ${mode}/${direction}/${palette}`;
+    const { mode, direction, palette } = config;
+    if (palette === 'light') {
+        /**
+         * Ionic has many existing tests that existed prior to
+         * the introduction of palette testing. To maintain backwards
+         * compatibility, we will not include the palette in the test
+         * title if the palette is set to light.
+         */
+        return `${title} - ${mode}/${direction}`;
     }
-    return `${title} - ${theme}/${mode}/${direction}/${palette}`;
+    return `${title} - ${mode}/${direction}/${palette}`;
 };
 /**
  * Generates a unique filename based on a base filename
  * and a test config.
  */
 const generateScreenshotName = (fileName, config) => {
-    const { direction, palette, mode, theme } = config;
-    /**
-     * The iOS theme can only be used with the iOS mode,
-     * and the MD theme can only be used with the MD mode.
-     *
-     * This logic enables the fallback behavior for existing tests,
-     * where we only tested against a mode, which accounted for both
-     * the theme and mode.
-     */
-    if (theme === 'ios' || theme === 'md') {
-        if (palette === 'light') {
-            /**
-             * Ionic has many existing tests that existed prior to
-             * the introduction of theme testing. To maintain backwards
-             * compatibility, we will not include the theme in the screenshot
-             * name if the theme is set to light.
-             */
-            return `${fileName}-${mode}-${direction}.png`;
-        }
-        return `${fileName}-${mode}-${direction}-${palette}.png`;
+    const { mode, direction, palette } = config;
+    if (palette === 'light') {
+        /**
+         * Ionic has many existing tests that existed prior to
+         * the introduction of palette testing. To maintain backwards
+         * compatibility, we will not include the palette in the screenshot
+         * name if the palette is set to light.
+         */
+        return `${fileName}-${mode}-${direction}.png`;
     }
-    return `${fileName}-${theme}-${mode}-${direction}-${palette}.png`;
+    return `${fileName}-${mode}-${direction}-${palette}.png`;
 };
 /**
  * Given a config generate an array of test variants.
@@ -70,16 +48,13 @@ export const configs = (testConfig = DEFAULT_TEST_CONFIG_OPTION) => {
      * If certain options are not provided,
      * fall back to the defaults.
      */
-    const processedModes = modes !== null && modes !== void 0 ? modes : DEFAULT_MODES;
+    const processedMode = modes !== null && modes !== void 0 ? modes : DEFAULT_MODES;
     const processedDirection = directions !== null && directions !== void 0 ? directions : DEFAULT_DIRECTIONS;
     const processedPalette = (_a = testConfig.palettes) !== null && _a !== void 0 ? _a : DEFAULT_PALETTES;
-    processedModes.forEach((mode) => {
-        const [themeOrCombinedMode, modeName] = mode.split('-');
-        const parsedTheme = themeOrCombinedMode;
-        const parsedMode = modeName !== null && modeName !== void 0 ? modeName : themeOrCombinedMode;
+    processedMode.forEach((mode) => {
         processedDirection.forEach((direction) => {
             processedPalette.forEach((palette) => {
-                configs.push({ direction, palette, mode: parsedMode, theme: parsedTheme });
+                configs.push({ mode, direction, palette });
             });
         });
     });

package/dist/collection/utils/test/playwright/page/utils/goto.js

@@ -9,7 +9,7 @@
  * to be hydrated before proceeding with the test.
  */
 export const goto = async (page, url, testInfo, originalFn, options) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     if (options === undefined && testInfo.project.metadata.mode === undefined) {
         throw new Error(`
 A config must be passed to page.goto to use a generator test:
@@ -21,18 +21,15 @@ configs().forEach(({ config, title }) => {
 });`);
     }
     let mode;
-    let theme;
     let direction;
     let palette;
     if (options == undefined) {
         mode = testInfo.project.metadata.mode;
-        theme = testInfo.project.metadata.theme;
         direction = testInfo.project.metadata.rtl ? 'rtl' : 'ltr';
         palette = testInfo.project.metadata.palette;
     }
     else {
         mode = options.mode;
-        theme = options.theme;
         direction = options.direction;
         palette = options.palette;
     }
@@ -45,15 +42,13 @@ configs().forEach(({ config, title }) => {
      */
     const urlToParams = new URLSearchParams(paramsString);
     const formattedMode = (_a = urlToParams.get('ionic:mode')) !== null && _a !== void 0 ? _a : mode;
-    const formattedTheme = (_b = urlToParams.get('ionic:theme')) !== null && _b !== void 0 ? _b : theme;
-    const formattedRtl = (_c = urlToParams.get('rtl')) !== null && _c !== void 0 ? _c : rtlString;
-    const formattedPalette = (_d = urlToParams.get('palette')) !== null && _d !== void 0 ? _d : palette;
-    const ionicTesting = (_e = urlToParams.get('ionic:_testing')) !== null && _e !== void 0 ? _e : true;
+    const formattedRtl = (_b = urlToParams.get('rtl')) !== null && _b !== void 0 ? _b : rtlString;
+    const formattedPalette = (_c = urlToParams.get('palette')) !== null && _c !== void 0 ? _c : palette;
+    const ionicTesting = (_d = urlToParams.get('ionic:_testing')) !== null && _d !== void 0 ? _d : true;
     /**
      * Pass through other custom query params
      */
     urlToParams.delete('ionic:mode');
-    urlToParams.delete('ionic:theme');
     urlToParams.delete('rtl');
     urlToParams.delete('palette');
     urlToParams.delete('ionic:_testing');
@@ -64,15 +59,11 @@ configs().forEach(({ config, title }) => {
      */
     const remainingQueryParams = decodeURIComponent(urlToParams.toString());
     const remainingQueryParamsString = remainingQueryParams == '' ? '' : `&${remainingQueryParams}`;
-    const formattedUrl = `${splitUrl[0]}?ionic:_testing=${ionicTesting}&ionic:mode=${formattedMode}&ionic:theme=${formattedTheme}&rtl=${formattedRtl}&palette=${formattedPalette}${remainingQueryParamsString}`;
+    const formattedUrl = `${splitUrl[0]}?ionic:_testing=${ionicTesting}&ionic:mode=${formattedMode}&rtl=${formattedRtl}&palette=${formattedPalette}${remainingQueryParamsString}`;
     testInfo.annotations.push({
         type: 'mode',
         description: formattedMode,
     });
-    testInfo.annotations.push({
-        type: 'theme',
-        description: formattedTheme,
-    });
     testInfo.annotations.push({
         type: 'direction',
         description: formattedRtl === 'true' ? 'rtl' : 'ltr',

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

@@ -18,41 +18,29 @@ export const setContent = async (page, html, testInfo, options) => {
     }
     let mode;
     let direction;
-    let theme;
     let palette;
     if (options == undefined) {
         mode = testInfo.project.metadata.mode;
         direction = testInfo.project.metadata.rtl ? 'rtl' : 'ltr';
-        theme = testInfo.project.metadata.theme;
         palette = testInfo.project.metadata.palette;
     }
     else {
         mode = options.mode;
         direction = options.direction;
-        theme = options.theme;
         palette = options.palette;
     }
     const baseUrl = process.env.PLAYWRIGHT_TEST_BASE_URL;
     // The Ionic bundle is included locally by default unless the test
     // config passes in the importIonicFromCDN option. This is useful
     // when testing with the CDN version of Ionic.
-    let ionicCSSImports = theme === 'ionic'
-        ? `
-    <link href="${baseUrl}/css/ionic/bundle.ionic.css" rel="stylesheet" />
-  `
-        : `
+    let ionicCSSImports = `
     <link href="${baseUrl}/css/ionic.bundle.css" rel="stylesheet" />
   `;
     let ionicJSImports = `
     <script type="module" src="${baseUrl}/dist/ionic/ionic.esm.js"></script>
   `;
     if (options === null || options === void 0 ? void 0 : options.importIonicFromCDN) {
-        ionicCSSImports =
-            theme === 'ionic'
-                ? `
-      <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@ionic/core/css/ionic/bundle.ionic.css" />
-    `
-                : `
+        ionicCSSImports = `
       <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@ionic/core/css/ionic.bundle.css" />
     `;
         ionicJSImports = `
@@ -75,8 +63,7 @@ export const setContent = async (page, html, testInfo, options) => {
         <script>
           window.Ionic = {
             config: {
-              mode: '${mode}',
-              theme: '${theme}'
+              mode: '${mode}'
             }
           }
         </script>
@@ -86,18 +73,10 @@ export const setContent = async (page, html, testInfo, options) => {
       </body>
     </html>
   `;
-    testInfo.annotations.push({
-        type: 'mode',
-        description: mode,
-    });
     testInfo.annotations.push({
         type: 'palette',
         description: palette,
     });
-    testInfo.annotations.push({
-        type: 'theme',
-        description: theme,
-    });
     if (baseUrl) {
         await page.route(baseUrl, (route) => {
             if (route.request().url() === `${baseUrl}/`) {

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

@@ -10,11 +10,22 @@ const iosTransitionAnimation = () => import('./ios.transition');
 const mdTransitionAnimation = () => import('./md.transition');
 const focusController = createFocusController();
 // TODO(FW-2832): types
+/**
+ * Executes the main page transition.
+ * It also manages the lifecycle of header visibility (if any)
+ * to prevent visual flickering in iOS. The flickering only
+ * occurs for a condensed header that is placed above the content.
+ *
+ * @param opts Options for the transition.
+ * @returns A promise that resolves when the transition is complete.
+ */
 export const transition = (opts) => {
     return new Promise((resolve, reject) => {
         writeTask(() => {
-            beforeTransition(opts);
-            runTransition(opts).then((result) => {
+            const transitioningInactiveHeader = getIosIonHeader(opts);
+            beforeTransition(opts, transitioningInactiveHeader);
+            runTransition(opts)
+                .then((result) => {
                 if (result.animation) {
                     result.animation.destroy();
                 }
@@ -23,15 +34,21 @@ export const transition = (opts) => {
             }, (error) => {
                 afterTransition(opts);
                 reject(error);
+            })
+                .finally(() => {
+                // Ensure that the header is restored to its original state.
+                setHeaderTransitionClass(transitioningInactiveHeader, false);
             });
         });
     });
 };
-const beforeTransition = (opts) => {
+const beforeTransition = (opts, transitioningInactiveHeader) => {
     const enteringEl = opts.enteringEl;
     const leavingEl = opts.leavingEl;
     focusController.saveViewFocus(leavingEl);
     setZIndex(enteringEl, leavingEl, opts.direction);
+    // Prevent flickering of the header by adding a class.
+    setHeaderTransitionClass(transitioningInactiveHeader, true);
     if (opts.showGoBack) {
         enteringEl.classList.add('can-go-back');
     }
@@ -220,6 +237,35 @@ const setZIndex = (enteringEl, leavingEl, direction) => {
         leavingEl.style.zIndex = '100';
     }
 };
+/**
+ * Add a class to ensure that the inactive header (if any)
+ * does not flicker during the transition. By adding the
+ * transitioning class, we ensure that the header has
+ * the necessary styles to prevent the following flickers:
+ * 1. When entering a page with a condensed header, the
+ * inactive header should never be visible. However,
+ * it briefly renders the background color while
+ * the transition is occurring.
+ * 2. When leaving a page with a condensed header, the
+ * inactive header has an opacity of 0 and the pages
+ * have a z-index which causes the entering page to
+ * briefly show it's content underneath the leaving page.
+ *
+ * @param header The header element to modify.
+ * @param isTransitioning Whether the transition is occurring.
+ */
+const setHeaderTransitionClass = (header, isTransitioning) => {
+    if (!header) {
+        return;
+    }
+    const transitionClass = 'header-transitioning';
+    if (isTransitioning) {
+        header.classList.add(transitionClass);
+    }
+    else {
+        header.classList.remove(transitionClass);
+    }
+};
 export const getIonPageElement = (element) => {
     if (element.classList.contains('ion-page')) {
         return element;
@@ -231,3 +277,24 @@ export const getIonPageElement = (element) => {
     // idk, return the original element so at least something animates and we don't have a null pointer
     return element;
 };
+/**
+ * Retrieves the ion-header element from a page based on the
+ * direction of the transition.
+ *
+ * @param opts Options for the transition.
+ * @returns The ion-header element or null if not found or not in 'ios' mode.
+ */
+const getIosIonHeader = (opts) => {
+    const enteringEl = opts.enteringEl;
+    const leavingEl = opts.leavingEl;
+    const direction = opts.direction;
+    const mode = opts.mode;
+    if (mode !== 'ios') {
+        return null;
+    }
+    const element = direction === 'back' ? leavingEl : enteringEl;
+    if (!element) {
+        return null;
+    }
+    return element.querySelector('ion-header');
+};

package/dist/collection/utils/transition/ios.transition.js

@@ -191,7 +191,6 @@ const animateBackButton = (rootAnimation, rtl, backDirection, backButtonEl, back
     const clonedBackButtonIconEl = shadow(clonedBackButtonEl).querySelector('ion-icon');
     clonedBackButtonEl.text = backButtonEl.text;
     clonedBackButtonEl.mode = backButtonEl.mode;
-    clonedBackButtonEl.theme = backButtonEl.theme;
     clonedBackButtonEl.icon = backButtonEl.icon;
     clonedBackButtonEl.color = backButtonEl.color;
     clonedBackButtonEl.disabled = backButtonEl.disabled;