@ionic/core 8.7.6-dev.11759493293.13f81b9f → 8.7.6-dev.11759524961.1cff6814

package/components/index2.js

@@ -123,11 +123,22 @@ const iosTransitionAnimation = () => import('./ios.transition.js');
 const mdTransitionAnimation = () => import('./md.transition.js');
 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.
+ */
 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();
                 }
@@ -136,15 +147,21 @@ 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');
     }
@@ -333,6 +350,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);
+    }
+};
 const getIonPageElement = (element) => {
     if (element.classList.contains('ion-page')) {
         return element;
@@ -344,5 +390,26 @@ 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');
+};
 
 export { LIFECYCLE_WILL_ENTER as L, LIFECYCLE_DID_ENTER as a, LIFECYCLE_WILL_LEAVE as b, LIFECYCLE_DID_LEAVE as c, LIFECYCLE_WILL_UNLOAD as d, deepReady as e, getIonPageElement as g, lifecycle as l, setPageHidden as s, transition as t, waitForMount as w };

package/components/index5.js

@@ -1,9 +1,11 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { c as getIonMode, d as doc, M as MENU_BACK_BUTTON_PRIORITY } from './ionic-global.js';
+import { d as doc } from './index9.js';
+import { MENU_BACK_BUTTON_PRIORITY } from './hardware-back-button.js';
 import { p as printIonWarning } from './index4.js';
 import { c as componentOnReady } from './helpers.js';
+import { b as getIonMode } from './ionic-global.js';
 import { c as createAnimation } from './animation.js';
 
 /**
@@ -46,10 +48,10 @@ 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]);
 };
 
 /**
@@ -62,7 +64,6 @@ 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';
@@ -78,7 +79,7 @@ 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]);
 };
 
 /**
@@ -88,12 +89,11 @@ const menuPushAnimation = (menu) => {
  */
 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);
 };
 
 const createMenuController = () => {

package/components/index6.js

@@ -29,4 +29,4 @@ const reorderTwoSharp = "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2
 const searchOutline = "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' class='ionicon'><path d='M221.09 64a157.09 157.09 0 1 0 157.09 157.09A157.1 157.1 0 0 0 221.09 64Z' stroke-miterlimit='10' class='ionicon-fill-none ionicon-stroke-width'/><path d='M338.29 338.29 448 448' stroke-linecap='round' stroke-miterlimit='10' class='ionicon-fill-none ionicon-stroke-width'/></svg>";
 const searchSharp = "data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 512 512' class='ionicon'><path d='M464 428 339.92 303.9a160.48 160.48 0 0 0 30.72-94.58C370.64 120.37 298.27 48 209.32 48S48 120.37 48 209.32s72.37 161.32 161.32 161.32a160.48 160.48 0 0 0 94.58-30.72L428 464ZM209.32 319.69a110.38 110.38 0 1 1 110.37-110.37 110.5 110.5 0 0 1-110.37 110.37'/></svg>";
 
-export { arrowBackSharp as a, chevronBack as b, chevronDown as c, chevronForwardOutline as d, ellipsisHorizontal as e, chevronForward as f, caretDownSharp as g, caretUpSharp as h, close as i, closeSharp as j, closeCircle as k, eyeOff as l, eye as m, menuSharp as n, menuOutline as o, arrowDown as p, caretBackSharp as q, reorderTwoSharp as r, reorderThreeOutline as s, searchSharp as t, searchOutline as u, chevronExpand as v, checkmarkOutline as w, removeOutline as x, ellipseOutline as y };
+export { chevronBack as a, arrowBackSharp as b, chevronDown as c, chevronForwardOutline as d, ellipsisHorizontal as e, caretUpSharp as f, chevronForward as g, caretDownSharp as h, close as i, closeCircle as j, closeSharp as k, eyeOff as l, eye as m, menuOutline as n, menuSharp as o, arrowDown as p, caretBackSharp as q, reorderThreeOutline as r, reorderTwoSharp as s, searchOutline as t, searchSharp as u, chevronExpand as v, checkmarkOutline as w, removeOutline as x, ellipseOutline as y };

package/components/index7.js

@@ -1,128 +1,167 @@
 /*!
  * (C) Ionic http://ionicframework.com - MIT License
  */
-import { c as componentOnReady } from './helpers.js';
-import { e as printRequiredElementError } from './index4.js';
+import { d as doc } from './index9.js';
+import { q as pointerCoord } from './helpers.js';
 
-const ION_CONTENT_TAG_NAME = 'ION-CONTENT';
-const ION_CONTENT_ELEMENT_SELECTOR = 'ion-content';
-const ION_CONTENT_CLASS_SELECTOR = '.ion-content-scroll-host';
-/**
- * Selector used for implementations reliant on `<ion-content>` for scroll event changes.
- *
- * Developers should use the `.ion-content-scroll-host` selector to target the element emitting
- * scroll events. With virtual scroll implementations this will be the host element for
- * the scroll viewport.
- */
-const ION_CONTENT_SELECTOR = `${ION_CONTENT_ELEMENT_SELECTOR}, ${ION_CONTENT_CLASS_SELECTOR}`;
-const isIonContent = (el) => el.tagName === ION_CONTENT_TAG_NAME;
-/**
- * Waits for the element host fully initialize before
- * returning the inner scroll element.
- *
- * For `ion-content` the scroll target will be the result
- * of the `getScrollElement` function.
- *
- * For custom implementations it will be the element host
- * or a selector within the host, if supplied through `scrollTarget`.
- */
-const getScrollElement = async (el) => {
-    if (isIonContent(el)) {
-        await new Promise((resolve) => componentOnReady(el, resolve));
-        return el.getScrollElement();
+const startTapClick = (config) => {
+    if (doc === undefined) {
+        return;
     }
-    return el;
-};
-/**
- * Queries the element matching the selector for IonContent.
- * See ION_CONTENT_SELECTOR for the selector used.
- */
-const findIonContent = (el) => {
+    let lastActivated = 0;
+    let activatableEle;
+    let activeRipple;
+    let activeDefer;
+    const useRippleEffect = config.getBoolean('animated', true) && config.getBoolean('rippleEffect', true);
+    const clearDefers = new WeakMap();
+    const cancelActive = () => {
+        if (activeDefer)
+            clearTimeout(activeDefer);
+        activeDefer = undefined;
+        if (activatableEle) {
+            removeActivated(false);
+            activatableEle = undefined;
+        }
+    };
+    const pointerDown = (ev) => {
+        // Ignore right clicks
+        if (activatableEle || ev.button === 2) {
+            return;
+        }
+        setActivatedElement(getActivatableTarget(ev), ev);
+    };
+    const pointerUp = (ev) => {
+        setActivatedElement(undefined, ev);
+    };
+    const setActivatedElement = (el, ev) => {
+        // do nothing
+        if (el && el === activatableEle) {
+            return;
+        }
+        if (activeDefer)
+            clearTimeout(activeDefer);
+        activeDefer = undefined;
+        const { x, y } = pointerCoord(ev);
+        // deactivate selected
+        if (activatableEle) {
+            if (clearDefers.has(activatableEle)) {
+                throw new Error('internal error');
+            }
+            if (!activatableEle.classList.contains(ACTIVATED)) {
+                addActivated(activatableEle, x, y);
+            }
+            removeActivated(true);
+        }
+        // activate
+        if (el) {
+            const deferId = clearDefers.get(el);
+            if (deferId) {
+                clearTimeout(deferId);
+                clearDefers.delete(el);
+            }
+            el.classList.remove(ACTIVATED);
+            const callback = () => {
+                addActivated(el, x, y);
+                activeDefer = undefined;
+            };
+            if (isInstant(el)) {
+                callback();
+            }
+            else {
+                activeDefer = setTimeout(callback, ADD_ACTIVATED_DEFERS);
+            }
+        }
+        activatableEle = el;
+    };
+    const addActivated = (el, x, y) => {
+        lastActivated = Date.now();
+        el.classList.add(ACTIVATED);
+        if (!useRippleEffect)
+            return;
+        const rippleEffect = getRippleEffect(el);
+        if (rippleEffect !== null) {
+            removeRipple();
+            activeRipple = rippleEffect.addRipple(x, y);
+        }
+    };
+    const removeRipple = () => {
+        if (activeRipple !== undefined) {
+            activeRipple.then((remove) => remove());
+            activeRipple = undefined;
+        }
+    };
+    const removeActivated = (smooth) => {
+        removeRipple();
+        const active = activatableEle;
+        if (!active) {
+            return;
+        }
+        const time = CLEAR_STATE_DEFERS - Date.now() + lastActivated;
+        if (smooth && time > 0 && !isInstant(active)) {
+            const deferId = setTimeout(() => {
+                active.classList.remove(ACTIVATED);
+                clearDefers.delete(active);
+            }, CLEAR_STATE_DEFERS);
+            clearDefers.set(active, deferId);
+        }
+        else {
+            active.classList.remove(ACTIVATED);
+        }
+    };
+    doc.addEventListener('ionGestureCaptured', cancelActive);
+    doc.addEventListener('pointerdown', pointerDown, true);
+    doc.addEventListener('pointerup', pointerUp, true);
     /**
-     * First we try to query the custom scroll host selector in cases where
-     * the implementation is using an outer `ion-content` with an inner custom
-     * scroll container.
+     * Tap click effects such as the ripple effect should
+     * not happen when scrolling. For example, if a user scrolls
+     * the page but also happens to do a touchstart on a button
+     * as part of the scroll, the ripple effect should not
+     * be dispatched. The ripple effect should only happen
+     * if the button is activated and the page is not scrolling.
+     *
+     * pointercancel is dispatched on a gesture when scrolling
+     * starts, so this lets us avoid having to listen for
+     * ion-content's scroll events.
      */
-    const customContentHost = el.querySelector(ION_CONTENT_CLASS_SELECTOR);
-    if (customContentHost) {
-        return customContentHost;
-    }
-    return el.querySelector(ION_CONTENT_SELECTOR);
-};
-/**
- * Queries the closest element matching the selector for IonContent.
- */
-const findClosestIonContent = (el) => {
-    return el.closest(ION_CONTENT_SELECTOR);
-};
-/**
- * Scrolls to the top of the element. If an `ion-content` is found, it will scroll
- * using the public API `scrollToTop` with a duration.
- */
-const scrollToTop = (el, durationMs) => {
-    if (isIonContent(el)) {
-        const content = el;
-        return content.scrollToTop(durationMs);
-    }
-    return Promise.resolve(el.scrollTo({
-        top: 0,
-        left: 0,
-        behavior: 'smooth' ,
-    }));
+    doc.addEventListener('pointercancel', cancelActive, true);
 };
-/**
- * Scrolls by a specified X/Y distance in the component. If an `ion-content` is found, it will scroll
- * using the public API `scrollByPoint` with a duration.
- */
-const scrollByPoint = (el, x, y, durationMs) => {
-    if (isIonContent(el)) {
-        const content = el;
-        return content.scrollByPoint(x, y, durationMs);
-    }
-    return Promise.resolve(el.scrollBy({
-        top: y,
-        left: x,
-        behavior: durationMs > 0 ? 'smooth' : 'auto',
-    }));
-};
-/**
- * Prints an error informing developers that an implementation requires an element to be used
- * within either the `ion-content` selector or the `.ion-content-scroll-host` class.
- */
-const printIonContentErrorMsg = (el) => {
-    return printRequiredElementError(el, ION_CONTENT_ELEMENT_SELECTOR);
-};
-/**
- * Several components in Ionic need to prevent scrolling
- * during a gesture (card modal, range, item sliding, etc).
- * Use this utility to account for ion-content and custom content hosts.
- */
-const disableContentScrollY = (contentEl) => {
-    if (isIonContent(contentEl)) {
-        const ionContent = contentEl;
-        const initialScrollY = ionContent.scrollY;
-        ionContent.scrollY = false;
+// TODO(FW-2832): type
+const getActivatableTarget = (ev) => {
+    if (ev.composedPath !== undefined) {
         /**
-         * This should be passed into resetContentScrollY
-         * so that we can revert ion-content's scrollY to the
-         * correct state. For example, if scrollY = false
-         * initially, we do not want to enable scrolling
-         * when we call resetContentScrollY.
+         * composedPath returns EventTarget[]. However,
+         * objects other than Element can be targets too.
+         * For example, AudioContext can be a target. In this
+         * case, we know that the event is a UIEvent so we
+         * can assume that the path will contain either Element
+         * or ShadowRoot.
          */
-        return initialScrollY;
+        const path = ev.composedPath();
+        for (let i = 0; i < path.length - 2; i++) {
+            const el = path[i];
+            if (!(el instanceof ShadowRoot) && el.classList.contains('ion-activatable')) {
+                return el;
+            }
+        }
     }
     else {
-        contentEl.style.setProperty('overflow', 'hidden');
-        return true;
+        return ev.target.closest('.ion-activatable');
     }
 };
-const resetContentScrollY = (contentEl, initialScrollY) => {
-    if (isIonContent(contentEl)) {
-        contentEl.scrollY = initialScrollY;
-    }
-    else {
-        contentEl.style.removeProperty('overflow');
+const isInstant = (el) => {
+    return el.classList.contains('ion-activatable-instant');
+};
+const getRippleEffect = (el) => {
+    if (el.shadowRoot) {
+        const ripple = el.shadowRoot.querySelector('ion-ripple-effect');
+        if (ripple) {
+            return ripple;
+        }
     }
+    return el.querySelector('ion-ripple-effect');
 };
+const ACTIVATED = 'ion-activated';
+const ADD_ACTIVATED_DEFERS = 100;
+const CLEAR_STATE_DEFERS = 150;
 
-export { ION_CONTENT_CLASS_SELECTOR as I, findClosestIonContent as a, ION_CONTENT_ELEMENT_SELECTOR as b, scrollByPoint as c, disableContentScrollY as d, findIonContent as f, getScrollElement as g, isIonContent as i, printIonContentErrorMsg as p, resetContentScrollY as r, scrollToTop as s };
+export { startTapClick };