@ionic/core 8.4.1-dev.11732561669.1ff93af7 → 8.4.1-dev.11732646949.1aaebad5

package/components/ionic-global.js

@@ -1,158 +1,82 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { setPlatformHelpers, setMode, Build, getElement, getMode } from '@stencil/core/internal/client';
-import { c as config, a as configFromSession, b as configFromURL, s as saveConfig } from './config2.js';
+import { setPlatformHelpers, setMode, getMode } from '@stencil/core/internal/client';
 
-const win = typeof window !== 'undefined' ? window : undefined;
-const doc = typeof document !== 'undefined' ? document : undefined;
-
-/**
- * Logs a warning to the console with an Ionic prefix
- * to indicate the library that is warning the developer.
- *
- * @param message - The string message to be logged to the console.
- */
-const printIonWarning = (message, ...params) => {
-    return console.warn(`[Ionic Warning]: ${message}`, ...params);
-};
-/*
- * Logs an error to the console with an Ionic prefix
- * to indicate the library that is warning the developer.
- *
- * @param message - The string message to be logged to the console.
- * @param params - Additional arguments to supply to the console.error.
- */
-const printIonError = (message, ...params) => {
-    return console.error(`[Ionic Error]: ${message}`, ...params);
-};
-/**
- * Prints an error informing developers that an implementation requires an element to be used
- * within a specific selector.
- *
- * @param el The web component element this is requiring the element.
- * @param targetSelectors The selector or selectors that were not found.
- */
-const printRequiredElementError = (el, ...targetSelectors) => {
-    return console.error(`<${el.tagName.toLowerCase()}> must be used inside ${targetSelectors.join(' or ')}.`);
-};
-
-/**
- * CloseWatcher is a newer API that lets
- * use detect the hardware back button event
- * in a web browser: https://caniuse.com/?search=closewatcher
- * However, not every browser supports it yet.
- *
- * This needs to be a function so that we can
- * check the config once it has been set.
- * Otherwise, this code would be evaluated the
- * moment this file is evaluated which could be
- * before the config is set.
- */
-const shouldUseCloseWatcher = () => config.get('experimentalCloseWatcher', false) && win !== undefined && 'CloseWatcher' in win;
-/**
- * When hardwareBackButton: false in config,
- * we need to make sure we also block the default
- * webview behavior. If we don't then it will be
- * possible for users to navigate backward while
- * an overlay is still open. Additionally, it will
- * give the appearance that the hardwareBackButton
- * config is not working as the page transition
- * will still happen.
- */
-const blockHardwareBackButton = () => {
-    document.addEventListener('backbutton', () => { }); // eslint-disable-line
-};
-const startHardwareBackButton = () => {
-    const doc = document;
-    let busy = false;
-    const backButtonCallback = () => {
-        if (busy) {
-            return;
+// TODO(FW-2832): types
+class Config {
+    constructor() {
+        this.m = new Map();
+    }
+    reset(configObj) {
+        this.m = new Map(Object.entries(configObj));
+    }
+    get(key, fallback) {
+        const value = this.m.get(key);
+        return value !== undefined ? value : fallback;
+    }
+    getBoolean(key, fallback = false) {
+        const val = this.m.get(key);
+        if (val === undefined) {
+            return fallback;
         }
-        let index = 0;
-        let handlers = [];
-        const ev = new CustomEvent('ionBackButton', {
-            bubbles: false,
-            detail: {
-                register(priority, handler) {
-                    handlers.push({ priority, handler, id: index++ });
-                },
-            },
-        });
-        doc.dispatchEvent(ev);
-        const executeAction = async (handlerRegister) => {
-            try {
-                if (handlerRegister === null || handlerRegister === void 0 ? void 0 : handlerRegister.handler) {
-                    const result = handlerRegister.handler(processHandlers);
-                    if (result != null) {
-                        await result;
-                    }
-                }
-            }
-            catch (e) {
-                console.error(e);
-            }
-        };
-        const processHandlers = () => {
-            if (handlers.length > 0) {
-                let selectedHandler = {
-                    priority: Number.MIN_SAFE_INTEGER,
-                    handler: () => undefined,
-                    id: -1,
-                };
-                handlers.forEach((handler) => {
-                    if (handler.priority >= selectedHandler.priority) {
-                        selectedHandler = handler;
-                    }
-                });
-                busy = true;
-                handlers = handlers.filter((handler) => handler.id !== selectedHandler.id);
-                executeAction(selectedHandler).then(() => (busy = false));
-            }
-        };
-        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.
-     */
-    if (shouldUseCloseWatcher()) {
-        let watcher;
-        const configureWatcher = () => {
-            watcher === null || watcher === void 0 ? void 0 : watcher.destroy();
-            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.
-             */
-            watcher.onclose = () => {
-                backButtonCallback();
-                configureWatcher();
-            };
-        };
-        configureWatcher();
+        if (typeof val === 'string') {
+            return val === 'true';
+        }
+        return !!val;
+    }
+    getNumber(key, fallback) {
+        const val = parseFloat(this.m.get(key));
+        return isNaN(val) ? (fallback !== undefined ? fallback : NaN) : val;
+    }
+    set(key, value) {
+        this.m.set(key, value);
+    }
+}
+const config = /*@__PURE__*/ new Config();
+const configFromSession = (win) => {
+    try {
+        const configStr = win.sessionStorage.getItem(IONIC_SESSION_KEY);
+        return configStr !== null ? JSON.parse(configStr) : {};
     }
-    else {
-        doc.addEventListener('backbutton', backButtonCallback);
+    catch (e) {
+        return {};
     }
 };
-const OVERLAY_BACK_BUTTON_PRIORITY = 100;
-const MENU_BACK_BUTTON_PRIORITY = 99; // 1 less than overlay priority since menu is displayed behind overlays
-
-const hardwareBackButton = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    shouldUseCloseWatcher: shouldUseCloseWatcher,
-    blockHardwareBackButton: blockHardwareBackButton,
-    startHardwareBackButton: startHardwareBackButton,
-    OVERLAY_BACK_BUTTON_PRIORITY: OVERLAY_BACK_BUTTON_PRIORITY,
-    MENU_BACK_BUTTON_PRIORITY: MENU_BACK_BUTTON_PRIORITY
-});
+const saveConfig = (win, c) => {
+    try {
+        win.sessionStorage.setItem(IONIC_SESSION_KEY, JSON.stringify(c));
+    }
+    catch (e) {
+        return;
+    }
+};
+const configFromURL = (win) => {
+    const configObj = {};
+    win.location.search
+        .slice(1)
+        .split('&')
+        .map((entry) => entry.split('='))
+        .map(([key, value]) => {
+        try {
+            return [decodeURIComponent(key), decodeURIComponent(value)];
+        }
+        catch (e) {
+            return ['', ''];
+        }
+    })
+        .filter(([key]) => startsWith(key, IONIC_PREFIX))
+        .map(([key, value]) => [key.slice(IONIC_PREFIX.length), value])
+        .forEach(([key, value]) => {
+        configObj[key] = value;
+    });
+    return configObj;
+};
+const startsWith = (input, search) => {
+    return input.substr(0, search.length) === search;
+};
+const IONIC_PREFIX = 'ionic:';
+const IONIC_SESSION_KEY = 'ionic-persist-config';
 
 const getPlatforms = (win) => setupPlatforms(win);
 const isPlatform = (winOrPlatform, platform) => {
@@ -242,143 +166,10 @@ const PLATFORMS_MAP = {
     hybrid: isHybrid,
 };
 
+// TODO(FW-2832): types
 let defaultMode;
-let defaultTheme = 'md';
-/**
- * Prints a warning message to the developer to inform them of
- * an invalid configuration of mode and theme.
- * @param mode The invalid mode configuration.
- * @param theme The invalid theme configuration.
- */
-const printInvalidModeWarning = (mode, theme, ref) => {
-    printIonWarning(`Invalid mode and theme combination provided: mode: ${mode}, theme: ${theme}. Fallback mode ${getDefaultModeForTheme(theme)} will be used.`, ref);
-};
-/**
- * Validates if a mode is accepted for a theme configuration.
- * @param mode The mode to validate.
- * @param theme The theme the mode is being used with.
- * @returns `true` if the mode is valid for the theme, `false` if invalid.
- */
-const isModeValidForTheme = (mode, theme) => {
-    if (mode === 'md') {
-        return theme === 'md' || theme === 'ionic';
-    }
-    else if (mode === 'ios') {
-        return theme === 'ios' || theme === 'ionic';
-    }
-    return false;
-};
-/**
- * Returns the default mode for a specified theme.
- * @param theme The theme to return a default mode for.
- * @returns The default mode, either `ios` or `md`.
- */
-const getDefaultModeForTheme = (theme) => {
-    if (theme === 'ios') {
-        return 'ios';
-    }
-    return 'md';
-};
-/**
- * Returns the default theme for a specified mode.
- * @param mode The mode to return a default theme for.
- * @returns The default theme.
- */
-const getDefaultThemeForMode = (mode) => {
-    if (mode === 'ios') {
-        return 'ios';
-    }
-    return 'md';
-};
-const isModeSupported = (elmMode) => ['ios', 'md'].includes(elmMode);
-const isThemeSupported = (theme) => ['ios', 'md', 'ionic'].includes(theme);
-const isIonicElement = (elm) => { var _a; return (_a = elm.tagName) === null || _a === void 0 ? void 0 : _a.startsWith('ION-'); };
-/**
- * Returns the mode value of the element reference or the closest
- * parent with a valid mode.
- * @param ref The element reference to look up the mode for.
- * @param theme Optionally can provide the theme to avoid an additional look-up.
- * @returns The mode value for the element reference.
- */
-const getIonMode = (ref, theme = getIonTheme(ref)) => {
-    var _a;
-    if ((ref === null || ref === void 0 ? void 0 : ref.mode) && isModeValidForTheme(ref === null || ref === void 0 ? void 0 : ref.mode, theme)) {
-        /**
-         * If the reference already has a mode configuration,
-         * use it instead of performing a look-up.
-         */
-        return ref.mode;
-    }
-    else {
-        const el = getElement(ref);
-        const mode = ((_a = el.closest('[mode]')) === null || _a === void 0 ? void 0 : _a.getAttribute('mode')) || defaultMode;
-        if (isModeValidForTheme(mode, theme)) {
-            /**
-             * The mode configuration is supported for the configured theme.
-             */
-            return mode;
-        }
-        else {
-            printInvalidModeWarning(mode, theme, ref);
-        }
-    }
-    return getDefaultModeForTheme(theme);
-};
-/**
- * Returns the theme value of the element reference or the closest
- * parent with a valid theme.
- *
- * @param ref The element reference to look up the theme for.
- * @returns The theme value for the element reference, defaults to
- * the default theme if it cannot be determined.
- */
-const getIonTheme = (ref) => {
-    var _a, _b;
-    const theme = ref && getMode(ref);
-    if (theme) {
-        return theme;
-    }
-    /**
-     * If the theme cannot be detected, then fallback to using
-     * the `mode` attribute to determine the style sheets to use.
-     */
-    const el = getElement(ref);
-    const mode = (_a = ref === null || ref === void 0 ? void 0 : ref.mode) !== null && _a !== void 0 ? _a : (_b = el.closest('[mode]')) === null || _b === void 0 ? void 0 : _b.getAttribute('mode');
-    if (mode) {
-        return getDefaultThemeForMode(mode);
-    }
-    /**
-     * If a mode is not detected, then fallback to using the
-     * default theme.
-     */
-    return defaultTheme;
-};
-const rIC = (callback) => {
-    if ('requestIdleCallback' in window) {
-        window.requestIdleCallback(callback);
-    }
-    else {
-        setTimeout(callback, 32);
-    }
-};
-const needInputShims = () => {
-    /**
-     * iOS always needs input shims
-     */
-    const needsShimsIOS = isPlatform(window, 'ios') && isPlatform(window, 'mobile');
-    if (needsShimsIOS) {
-        return true;
-    }
-    /**
-     * Android only needs input shims when running
-     * in the browser and only if the browser is using the
-     * new Chrome 108+ resize behavior: https://developer.chrome.com/blog/viewport-resize-behavior/
-     */
-    const isAndroidMobileWeb = isPlatform(window, 'android') && isPlatform(window, 'mobileweb');
-    if (isAndroidMobileWeb) {
-        return true;
-    }
-    return false;
+const getIonMode = (ref) => {
+    return (ref && getMode(ref)) || defaultMode;
 };
 const initialize = (userConfig = {}) => {
     if (typeof window === 'undefined') {
@@ -407,115 +198,34 @@ const initialize = (userConfig = {}) => {
     }
     // Setup platforms
     setupPlatforms(win);
+    // first see if the mode was set as an attribute on <html>
+    // which could have been set by the user, or by pre-rendering
+    // otherwise get the mode via config settings, and fallback to md
     Ionic.config = config;
-    /**
-     * Check if the mode was set as an attribute on <html>
-     * which could have been set by the user, or by pre-rendering
-     * otherwise get the mode via config settings, and fallback to md.
-     */
     Ionic.mode = defaultMode = config.get('mode', doc.documentElement.getAttribute('mode') || (isPlatform(win, 'ios') ? 'ios' : 'md'));
-    /**
-     * Check if the theme was set as an attribute on <html>
-     * which could have been set by the user, or by pre-rendering
-     * otherwise get the theme via config settings, and fallback to md.
-     */
-    Ionic.theme = defaultTheme = config.get('theme', doc.documentElement.getAttribute('theme') || getDefaultThemeForMode(defaultMode));
-    if (!isModeValidForTheme(defaultMode, defaultTheme)) {
-        printInvalidModeWarning(defaultMode, defaultTheme, configObj);
-        defaultMode = getDefaultModeForTheme(defaultTheme);
-    }
     config.set('mode', defaultMode);
     doc.documentElement.setAttribute('mode', defaultMode);
     doc.documentElement.classList.add(defaultMode);
-    config.set('theme', defaultTheme);
-    doc.documentElement.setAttribute('theme', defaultTheme);
-    doc.documentElement.classList.add(defaultTheme);
     if (config.getBoolean('_testing')) {
         config.set('animated', false);
     }
+    const isIonicElement = (elm) => { var _a; return (_a = elm.tagName) === null || _a === void 0 ? void 0 : _a.startsWith('ION-'); };
+    const isAllowedIonicModeValue = (elmMode) => ['ios', 'md'].includes(elmMode);
     setMode((elm) => {
-        /**
-         * Iterate over all the element nodes, to both validate and
-         * set the "mode" that is used for determining the styles to
-         * apply to the element.
-         *
-         * setMode refers to Stencil's internal metadata for "mode",
-         * which is used to set the correct styleUrl for the component.
-         *
-         * If the "theme" attribute or property is set, then use it
-         * to determine the style sheets to use.
-         *
-         * If the "mode" attribute or property is set, then use it
-         * to determine the style sheets to use. This is fallback
-         * behavior for applications that are not setting the "theme".
-         */
         while (elm) {
-            const theme = elm.getAttribute('theme');
-            if (theme) {
-                if (isThemeSupported(theme)) {
-                    return theme;
-                }
-                else if (isIonicElement(elm)) {
-                    printIonWarning(`Invalid theme: "${theme}". Supported themes include: "ios" or "md".`);
-                }
-            }
-            /**
-             * If a theme is not detected, then fallback to using the
-             * `mode` attribute to determine the style sheets to use.
-             */
-            const elmMode = elm.getAttribute('mode');
+            const elmMode = elm.mode || elm.getAttribute('mode');
             if (elmMode) {
-                if (isModeSupported(elmMode)) {
+                if (isAllowedIonicModeValue(elmMode)) {
                     return elmMode;
                 }
                 else if (isIonicElement(elm)) {
-                    printIonWarning(`Invalid mode: "${elmMode}". Ionic modes can be only "ios" or "md"`);
+                    console.warn('Invalid ionic mode: "' + elmMode + '", expected: "ios" or "md"');
                 }
             }
             elm = elm.parentElement;
         }
-        return defaultTheme;
+        return defaultMode;
     });
-    // `IonApp` code
-    // ----------------------------------------------
-    if (Build.isBrowser) {
-        rIC(async () => {
-            const isHybrid = isPlatform(window, 'hybrid');
-            if (!config.getBoolean('_testing')) {
-                import('./index7.js').then((module) => module.startTapClick(config));
-            }
-            if (config.getBoolean('statusTap', isHybrid)) {
-                import('./status-tap.js').then((module) => module.startStatusTap());
-            }
-            if (config.getBoolean('inputShims', needInputShims())) {
-                /**
-                 * needInputShims() ensures that only iOS and Android
-                 * platforms proceed into this block.
-                 */
-                const platform = isPlatform(window, 'ios') ? 'ios' : 'android';
-                import('./input-shims.js').then((module) => module.startInputShims(config, platform));
-            }
-            const hardwareBackButtonModule = await Promise.resolve().then(function () { return hardwareBackButton; });
-            const supportsHardwareBackButtonEvents = isHybrid || shouldUseCloseWatcher();
-            if (config.getBoolean('hardwareBackButton', supportsHardwareBackButtonEvents)) {
-                hardwareBackButtonModule.startHardwareBackButton();
-            }
-            else {
-                /**
-                 * If an app sets hardwareBackButton: false and experimentalCloseWatcher: true
-                 * then the close watcher will not be used.
-                 */
-                if (shouldUseCloseWatcher()) {
-                    printIonWarning('experimentalCloseWatcher was set to `true`, but hardwareBackButton was set to `false`. Both config options must be `true` for the Close Watcher API to be used.');
-                }
-                hardwareBackButtonModule.blockHardwareBackButton();
-            }
-            if (typeof window !== 'undefined') {
-                import('./keyboard2.js').then((module) => module.startKeyboardAssist(window));
-            }
-            import('./focus-visible.js').then((module) => module.getOrInitFocusVisibleUtility());
-        });
-    }
 };
 
-export { MENU_BACK_BUTTON_PRIORITY as M, OVERLAY_BACK_BUTTON_PRIORITY as O, isPlatform as a, getIonMode as b, getIonTheme as c, doc as d, printIonError as e, printRequiredElementError as f, getPlatforms as g, initialize as i, printIonWarning as p, shouldUseCloseWatcher as s, win as w };
+export { isPlatform as a, getIonMode as b, config as c, getPlatforms as g, initialize as i };

package/components/ios.transition.js

@@ -192,7 +192,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;