@ionic/core 8.8.19 → 8.8.20-dev.11787158518.168a2fea

package/dist/collection/components/router/router.js

@@ -7,33 +7,41 @@ import { findChainForIDs, findChainForSegments, findRouteRedirect } from "./util
 import { readRedirects, readRoutes } from "./utils/parser";
 import { chainToSegments, generatePath, parsePath, readSegments, writeSegments } from "./utils/path";
 export class Router {
-    constructor() {
-        this.previousPath = null;
-        this.busy = false;
-        this.state = 0;
-        this.lastState = 0;
-        this.fragmentScrollToken = 0;
-        /**
-         * The root path to use when matching URLs. By default, this is set to "/", but you can specify
-         * an alternate prefix for all URL paths.
-         */
-        this.root = '/';
-        /**
-         * The router can work in two "modes":
-         * - With hash: `/index.html#/path/to/page`
-         * - Without hash: `/path/to/page`
-         *
-         * Using one or another might depend in the requirements of your app and/or where it's deployed.
-         *
-         * Usually "hash-less" navigation works better for SEO and it's more user friendly too, but it might
-         * requires additional server-side configuration in order to properly work.
-         *
-         * On the other side hash-navigation is much easier to deploy, it even works over the file protocol.
-         *
-         * By default, this property is `true`, change to `false` to allow hash-less URLs.
-         */
-        this.useHash = true;
-    }
+    previousPath = null;
+    busy = false;
+    state = 0;
+    lastState = 0;
+    waitPromise;
+    fragmentScrollToken = 0;
+    el;
+    /**
+     * The root path to use when matching URLs. By default, this is set to "/", but you can specify
+     * an alternate prefix for all URL paths.
+     */
+    root = '/';
+    /**
+     * The router can work in two "modes":
+     * - With hash: `/index.html#/path/to/page`
+     * - Without hash: `/path/to/page`
+     *
+     * Using one or another might depend in the requirements of your app and/or where it's deployed.
+     *
+     * Usually "hash-less" navigation works better for SEO and it's more user friendly too, but it might
+     * requires additional server-side configuration in order to properly work.
+     *
+     * On the other side hash-navigation is much easier to deploy, it even works over the file protocol.
+     *
+     * By default, this property is `true`, change to `false` to allow hash-less URLs.
+     */
+    useHash = true;
+    /**
+     * Event emitted when the route is about to change
+     */
+    ionRouteWillChange;
+    /**
+     * Emitted when the route had changed
+     */
+    ionRouteDidChange;
     async componentWillLoad() {
         await waitUntilNavNode();
         const canProceed = await this.runGuards(this.getSegments());
@@ -103,9 +111,8 @@ export class Router {
      * @param animation A custom animation to use for the transition.
      */
     async push(path, direction = 'forward', animation) {
-        var _a;
         if (path.startsWith('.')) {
-            const currentPath = (_a = this.previousPath) !== null && _a !== void 0 ? _a : '/';
+            const currentPath = this.previousPath ?? '/';
             // Convert currentPath to an URL by pre-pending a protocol and a host to resolve the relative path.
             const url = new URL(path, `https://host/${currentPath}`);
             path = url.pathname + url.search + url.hash;
@@ -176,11 +183,10 @@ export class Router {
         return this.writeNavStateRoot(this.getSegments(), ROUTER_INTENT_NONE);
     }
     historyDirection() {
-        var _a;
         const win = window;
         if (win.history.state === null) {
             this.state++;
-            win.history.replaceState(this.state, win.document.title, (_a = win.document.location) === null || _a === void 0 ? void 0 : _a.href);
+            win.history.replaceState(this.state, win.document.title, win.document.location?.href);
         }
         const state = win.history.state;
         const lastState = this.lastState;
@@ -254,14 +260,12 @@ export class Router {
         }
         const routes = readRoutes(this.el);
         const fromChain = findChainForSegments(from, routes);
-        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
         const beforeLeaveHook = fromChain && fromChain[fromChain.length - 1].beforeLeave;
         const canLeave = beforeLeaveHook ? await beforeLeaveHook() : true;
         if (canLeave === false || typeof canLeave === 'object') {
             return canLeave;
         }
         const toChain = findChainForSegments(to, routes);
-        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
         const beforeEnterHook = toChain && toChain[toChain.length - 1].beforeEnter;
         return beforeEnterHook ? beforeEnterHook() : true;
     }

package/dist/collection/components/router/utils/dom.js

@@ -1,9 +1,10 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
+import { Build } from "@stencil/core";
 import { findClosestIonContent, getScrollElement, isIonContent } from "../../../utils/content/index";
 import { componentOnReady, raf } from "../../../utils/helpers";
-import { printIonError } from "../../../utils/logging/index";
+import { printIonError, printIonWarning } from "../../../utils/logging/index";
 import { ROUTER_INTENT_NONE } from "./constants";
 /**
  * Activates the passed route chain.
@@ -53,7 +54,6 @@ export const readNavState = async (root) => {
     const ids = [];
     let outlet;
     let node = root;
-    // eslint-disable-next-line no-cond-assign
     while ((outlet = searchNavNode(node))) {
         const id = await outlet.getRouteId();
         if (id) {
@@ -108,7 +108,7 @@ const findFragmentTarget = async (fragment, shouldContinue) => {
             try {
                 candidates = [...document.querySelectorAll(`#${escaped}, a[name="${escaped}"]`)];
             }
-            catch (_a) {
+            catch {
                 candidates = [...document.querySelectorAll(`#${escaped}`)];
             }
         }
@@ -145,7 +145,7 @@ export const scrollToFragment = async (fragment, shouldContinue = () => true) =>
     try {
         decoded = decodeURIComponent(fragment);
     }
-    catch (_a) {
+    catch {
         decoded = fragment;
     }
     const target = await findFragmentTarget(decoded, shouldContinue);
@@ -179,16 +179,34 @@ export const scrollToFragment = async (fragment, shouldContinue = () => true) =>
         return false;
     }
 };
+/** How long the router waits for a navigation outlet before giving up and proceeding. */
+const NAV_NODE_TIMEOUT = 500;
 export const waitUntilNavNode = () => {
     if (searchNavNode(document.body)) {
         return Promise.resolve();
     }
     return new Promise((resolve) => {
-        window.addEventListener('ionNavWillLoad', () => resolve(), { once: true });
+        /**
+         * Outlets emit `ionNavWillLoad` as they load, so resolve as soon as one does.
+         * A timeout backstops the case where the page has no outlet at all: without it
+         * the router would wait forever and its `componentWillLoad` would never settle,
+         * which in turn prevents the app from signalling that it has finished loading.
+         */
+        const done = () => {
+            window.removeEventListener('ionNavWillLoad', done);
+            clearTimeout(timeout);
+            if (Build.isDev && !searchNavNode(document.body)) {
+                printIonWarning('[ion-router] - No outlet found. The router requires an ion-router-outlet or ion-tabs to render routed views. ' +
+                    'Note that as of Ionic 9 ion-nav is no longer a router outlet.');
+            }
+            resolve();
+        };
+        const timeout = setTimeout(done, NAV_NODE_TIMEOUT);
+        window.addEventListener('ionNavWillLoad', done, { once: true });
     });
 };
 /** Selector for all the outlets supported by the router. */
-const OUTLET_SELECTOR = ':not([no-router]) ion-nav, :not([no-router]) ion-tabs, :not([no-router]) ion-router-outlet';
+const OUTLET_SELECTOR = ':not([no-router]) ion-tabs, :not([no-router]) ion-router-outlet';
 const searchNavNode = (root) => {
     if (!root) {
         return undefined;
@@ -197,5 +215,5 @@ const searchNavNode = (root) => {
         return root;
     }
     const outlet = root.querySelector(OUTLET_SELECTOR);
-    return outlet !== null && outlet !== void 0 ? outlet : undefined;
+    return outlet ?? undefined;
 };

package/dist/collection/components/router/utils/matching.js

@@ -134,7 +134,7 @@ export const matchesSegments = (segments, chain) => {
  * Returns undefined when both parameters are undefined.
  */
 export const mergeParams = (a, b) => {
-    return a || b ? Object.assign(Object.assign({}, a), b) : undefined;
+    return a || b ? { ...a, ...b } : undefined;
 };
 /**
  * Finds the best match for the ids in the chains.
@@ -154,14 +154,11 @@ export const findChainForIDs = (ids, chains) => {
         }
     }
     if (match) {
-        return match.map((route, i) => {
-            var _a;
-            return ({
-                id: route.id,
-                segments: route.segments,
-                params: mergeParams(route.params, (_a = ids[i]) === null || _a === void 0 ? void 0 : _a.params),
-            });
-        });
+        return match.map((route, i) => ({
+            id: route.id,
+            segments: route.segments,
+            params: mergeParams(route.params, ids[i]?.params),
+        }));
     }
     return null;
 };
@@ -215,6 +212,7 @@ export const computePriority = (chain) => {
     return score;
 };
 export class RouterSegments {
+    segments;
     constructor(segments) {
         this.segments = segments.slice();
     }

package/dist/collection/components/router/utils/parser.js

@@ -42,7 +42,7 @@ export const readRoutes = (root) => {
  */
 export const readRouteNodes = (node) => {
     return Array.from(node.children)
-        .filter((el) => el.tagName === 'ION-ROUTE' && el.component)
+        .filter((el) => el.tagName === 'ION-ROUTE' && Boolean(el.component))
         .map((el) => {
         const component = readProp(el, 'component');
         return {

package/dist/collection/components/router/utils/path.js

@@ -41,7 +41,6 @@ export const chainToSegments = (chain) => {
     for (const route of chain) {
         for (const segment of route.segments) {
             if (segment[0] === ':') {
-                // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
                 const param = route.params && route.params[segment.slice(1)];
                 if (!param) {
                     return null;

package/dist/collection/components/router-link/router-link.js

@@ -5,16 +5,41 @@ import { Host, h } from "@stencil/core";
 import { createColorClasses, openURL } from "../../utils/theme";
 import { getIonMode } from "../../global/ionic-global";
 export class RouterLink {
-    constructor() {
-        /**
-         * When using a router, it specifies the transition direction when navigating to
-         * another page using `href`.
-         */
-        this.routerDirection = 'forward';
-        this.onClick = (ev) => {
-            openURL(this.href, ev, this.routerDirection, this.routerAnimation);
-        };
-    }
+    /**
+     * The color to use from your application's color palette.
+     * Default options are: `"primary"`, `"secondary"`, `"tertiary"`, `"success"`, `"warning"`, `"danger"`, `"light"`, `"medium"`, and `"dark"`.
+     * For more information on colors, see [theming](/docs/theming/basics).
+     */
+    color;
+    /**
+     * Contains a URL or a URL fragment that the hyperlink points to.
+     * If this property is set, an anchor tag will be rendered.
+     */
+    href;
+    /**
+     * Specifies the relationship of the target object to the link object.
+     * The value is a space-separated list of [link types](https://developer.mozilla.org/en-US/docs/Web/HTML/Link_types).
+     */
+    rel;
+    /**
+     * When using a router, it specifies the transition direction when navigating to
+     * another page using `href`.
+     */
+    routerDirection = 'forward';
+    /**
+     * When using a router, it specifies the transition animation when navigating to
+     * another page using `href`.
+     */
+    routerAnimation;
+    /**
+     * Specifies where to display the linked URL.
+     * Only applies when an `href` is provided.
+     * Special keywords: `"_blank"`, `"_self"`, `"_parent"`, `"_top"`.
+     */
+    target;
+    onClick = (ev) => {
+        openURL(this.href, ev, this.routerDirection, this.routerAnimation);
+    };
     render() {
         const mode = getIonMode(this);
         const attrs = {
@@ -22,10 +47,10 @@ export class RouterLink {
             rel: this.rel,
             target: this.target,
         };
-        return (h(Host, { key: '8372835161d507c7b821b7536c55f912eb6ce704', onClick: this.onClick, class: createColorClasses(this.color, {
+        return (h(Host, { key: '8aaf732d8f5cc4ced351e2b3164605c10bd90cad', onClick: this.onClick, class: createColorClasses(this.color, {
                 [mode]: true,
                 'ion-activatable': true,
-            }) }, h("a", Object.assign({ key: '315966e14a17760f3f64197e8315200039787897' }, attrs), h("slot", { key: '95fc1697b884225e85e647dddcaa8f4af8b9a979' }))));
+            }) }, h("a", { key: '8f291ffbbce5b08dd10720d855eb020880bf1be1', ...attrs }, h("slot", { key: '24dc388a49204011e1c1f0a1131c9a1b0a4ae4da' }))));
     }
     static get is() { return "ion-router-link"; }
     static get encapsulation() { return "shadow"; }

package/dist/collection/components/router-outlet/router-outlet.js

@@ -11,23 +11,46 @@ import { transition } from "../../utils/transition/index";
 import { config } from "../../global/config";
 import { getIonMode } from "../../global/ionic-global";
 export class RouterOutlet {
-    constructor() {
-        this.lockController = createLockController();
-        this.gestureOrAnimationInProgress = false;
-        /**
-         * The mode determines which platform styles to use.
-         */
-        this.mode = getIonMode(this);
-        /**
-         * If `true`, the router-outlet should animate the transition of components.
-         */
-        this.animated = true;
+    lockController = createLockController();
+    activeEl;
+    // TODO(FW-2832): types
+    activeComponent;
+    activeParams;
+    gesture;
+    ani;
+    gestureOrAnimationInProgress = false;
+    el;
+    /**
+     * The mode determines which platform styles to use.
+     */
+    mode = getIonMode(this);
+    /** @internal */
+    delegate;
+    /**
+     * If `true`, the router-outlet should animate the transition of components.
+     */
+    animated = true;
+    /** This property allows to create custom transition using AnimationBuilder functions. */
+    animation;
+    /**
+     * If `true`, the router-outlet should allow navigation via swipe-to-go-back gesture.
+     * Defaults to `true` for `"ios"` mode and `false` for `"md"` mode.
+     */
+    swipeGesture;
+    swipeGestureChanged() {
+        this.updateGestureEnabled();
     }
+    /** @internal */
+    swipeHandler;
     swipeHandlerChanged() {
-        if (this.gesture) {
-            this.gesture.enable(this.swipeHandler !== undefined);
-        }
+        this.updateGestureEnabled();
     }
+    /** @internal */
+    ionNavWillLoad;
+    /** @internal */
+    ionNavWillChange;
+    /** @internal */
+    ionNavDidChange;
     async connectedCallback() {
         const onStart = () => {
             this.gestureOrAnimationInProgress = true;
@@ -35,7 +58,7 @@ export class RouterOutlet {
                 this.swipeHandler.onStart();
             }
         };
-        this.gesture = (await import('../../utils/gesture/swipe-back')).createSwipeBackGesture(this.el, () => !this.gestureOrAnimationInProgress && !!this.swipeHandler && this.swipeHandler.canStart(), () => onStart(), (step) => { var _a; return (_a = this.ani) === null || _a === void 0 ? void 0 : _a.progressStep(step); }, (shouldComplete, step, dur) => {
+        this.gesture = (await import('../../utils/gesture/swipe-back')).createSwipeBackGesture(this.el, () => !this.gestureOrAnimationInProgress && !!this.swipeHandler && this.swipeHandler.canStart(), () => onStart(), (step) => this.ani?.progressStep(step), (shouldComplete, step, dur) => {
             if (this.ani) {
                 this.ani.onFinish(() => {
                     this.gestureOrAnimationInProgress = false;
@@ -66,11 +89,21 @@ export class RouterOutlet {
                 this.gestureOrAnimationInProgress = false;
             }
         });
-        this.swipeHandlerChanged();
+        if (this.swipeGesture === undefined) {
+            this.swipeGesture = config.getBoolean('swipeBackEnabled', this.mode === 'ios');
+        }
+        else {
+            this.updateGestureEnabled();
+        }
     }
     componentWillLoad() {
         this.ionNavWillLoad.emit();
     }
+    updateGestureEnabled() {
+        if (this.gesture) {
+            this.gesture.enable(this.swipeHandler !== undefined && this.swipeGesture === true);
+        }
+    }
     disconnectedCallback() {
         if (this.gesture) {
             this.gesture.destroy();
@@ -137,16 +170,19 @@ export class RouterOutlet {
         const { el, mode } = this;
         const animated = this.animated && config.getBoolean('animated', true);
         const animationBuilder = opts.animationBuilder || this.animation || config.get('navAnimation');
-        await transition(Object.assign(Object.assign({ mode,
+        await transition({
+            mode,
             animated,
             enteringEl,
-            leavingEl, baseEl: el,
+            leavingEl,
+            baseEl: el,
             /**
              * We need to wait for all Stencil components
              * to be ready only when using the lazy
              * loaded bundle.
              */
-            deepWait: hasLazyBuild(el), progressCallback: opts.progressAnimation
+            deepWait: hasLazyBuild(el),
+            progressCallback: opts.progressAnimation
                 ? (ani) => {
                     /**
                      * Because this progress callback is called asynchronously
@@ -175,13 +211,16 @@ export class RouterOutlet {
                         this.ani = ani;
                     }
                 }
-                : undefined }, opts), { animationBuilder }));
+                : undefined,
+            ...opts,
+            animationBuilder,
+        });
         // emit nav changed event
         this.ionNavDidChange.emit();
         return true;
     }
     render() {
-        return h("slot", { key: '386c41745b61daba161cf75063da97fe29ba36cb' });
+        return h("slot", { key: '249e7d8a063c781db52fa535e42d648c7bf2909a' });
     }
     static get is() { return "ion-router-outlet"; }
     static get encapsulation() { return "shadow"; }
@@ -293,6 +332,25 @@ export class RouterOutlet {
                 "getter": false,
                 "setter": false
             },
+            "swipeGesture": {
+                "type": "boolean",
+                "mutable": true,
+                "complexType": {
+                    "original": "boolean",
+                    "resolved": "boolean | undefined",
+                    "references": {}
+                },
+                "required": false,
+                "optional": true,
+                "docs": {
+                    "tags": [],
+                    "text": "If `true`, the router-outlet should allow navigation via swipe-to-go-back gesture.\nDefaults to `true` for `\"ios\"` mode and `false` for `\"md\"` mode."
+                },
+                "getter": false,
+                "setter": false,
+                "reflect": false,
+                "attribute": "swipe-gesture"
+            },
             "swipeHandler": {
                 "type": "unknown",
                 "mutable": false,
@@ -514,6 +572,9 @@ export class RouterOutlet {
     static get elementRef() { return "el"; }
     static get watchers() {
         return [{
+                "propName": "swipeGesture",
+                "methodName": "swipeGestureChanged"
+            }, {
                 "propName": "swipeHandler",
                 "methodName": "swipeHandlerChanged"
             }];

package/dist/collection/components/row/row.js

@@ -5,7 +5,7 @@ import { Host, h } from "@stencil/core";
 import { getIonMode } from "../../global/ionic-global";
 export class Row {
     render() {
-        return (h(Host, { key: '8ba906a8cbea060a79ed658c9bf34906f0c11d38', class: getIonMode(this) }, h("slot", { key: 'd1009176f45b588fa52c7d9eb336f3c6d3214bb8' })));
+        return (h(Host, { key: '12b7419dd67ff18dd00e1bf5093299bd94c75503', class: getIonMode(this) }, h("slot", { key: '43fc76a289ecaf398a77a90034ee576003a826fd' })));
     }
     static get is() { return "ion-row"; }
     static get encapsulation() { return "shadow"; }