@ionic/core 7.4.3-dev.11695994917.15d3036b → 7.4.3-dev.11696256088.1a73a68b

package/components/animation.js

@@ -159,6 +159,7 @@ const createAnimation = (animationId) => {
   const id = animationId;
   const onFinishCallbacks = [];
   const onFinishOneTimeCallbacks = [];
+  const onStopOneTimeCallbacks = [];
   const elements = [];
   const childAnimations = [];
   const stylesheets = [];
@@ -216,6 +217,28 @@ const createAnimation = (animationId) => {
   const isRunning = () => {
     return numAnimationsRunning !== 0 && !paused;
   };
+  /**
+   * @internal
+   * Remove a callback from a chosen callback array
+   * @param callbackToRemove: A reference to the callback that should be removed
+   * @param callbackObjects: An array of callbacks that callbackToRemove should be removed from.
+   */
+  const clearCallback = (callbackToRemove, callbackObjects) => {
+    const index = callbackObjects.findIndex((callbackObject) => callbackObject.c === callbackToRemove);
+    if (index > -1) {
+      callbackObjects.splice(index, 1);
+    }
+  };
+  /**
+   * @internal
+   * Add a callback to be fired when an animation is stopped/cancelled.
+   * @param callback: A reference to the callback that should be fired
+   * @param opts: Any options associated with this particular callback
+   */
+  const onStop = (callback, opts) => {
+    onStopOneTimeCallbacks.push({ c: callback, o: opts });
+    return ani;
+  };
   const onFinish = (callback, opts) => {
     const callbacks = (opts === null || opts === void 0 ? void 0 : opts.oneTimeCallback) ? onFinishOneTimeCallbacks : onFinishCallbacks;
     callbacks.push({ c: callback, o: opts });
@@ -884,7 +907,33 @@ const createAnimation = (animationId) => {
         numAnimationsRunning = childAnimations.length + 1;
         shouldCalculateNumAnimations = false;
       }
-      onFinish(() => resolve(), { oneTimeCallback: true });
+      /**
+       * When one of these callbacks fires we
+       * need to clear the other's callback otherwise
+       * you can potentially get these callbacks
+       * firing multiple times if the play method
+       * is subsequently called.
+       * Example:
+       * animation.play() (onStop and onFinish callbacks are registered)
+       * animation.stop() (onStop callback is fired, onFinish is not)
+       * animation.play() (onStop and onFinish callbacks are registered)
+       * Total onStop callbacks: 1
+       * Total onFinish callbacks: 2
+       */
+      const onStopCallback = () => {
+        clearCallback(onFinishCallback, onFinishOneTimeCallbacks);
+        resolve();
+      };
+      const onFinishCallback = () => {
+        clearCallback(onStopCallback, onStopOneTimeCallbacks);
+        resolve();
+      };
+      /**
+       * The play method resolves when an animation
+       * run either finishes or is cancelled.
+       */
+      onFinish(onFinishCallback, { oneTimeCallback: true });
+      onStop(onStopCallback, { oneTimeCallback: true });
       childAnimations.forEach((animation) => {
         animation.play();
       });
@@ -897,6 +946,14 @@ const createAnimation = (animationId) => {
       paused = false;
     });
   };
+  /**
+   * Stops an animation and resets it state to the
+   * beginning. This does not fire any onFinish
+   * callbacks because the animation did not finish.
+   * However, since the animation was not destroyed
+   * (i.e. the animation could run again) we do not
+   * clear the onFinish callbacks.
+   */
   const stop = () => {
     childAnimations.forEach((animation) => {
       animation.stop();
@@ -906,6 +963,8 @@ const createAnimation = (animationId) => {
       initialized = false;
     }
     resetFlags();
+    onStopOneTimeCallbacks.forEach((onStopCallback) => onStopCallback.c(0, ani));
+    onStopOneTimeCallbacks.length = 0;
   };
   const from = (property, value) => {
     const firstFrame = _keyframes[0];

package/components/ion-menu.js

@@ -50,6 +50,7 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
       }
       this.trapKeyboardFocus(ev, document);
     };
+    this.operationCancelled = false;
     this.isPaneVisible = false;
     this.isEndSide = false;
     this.contentId = undefined;
@@ -337,18 +338,23 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
     const easingReverse = mode === 'ios' ? iosEasingReverse : mdEasingReverse;
     const ani = this.animation
       .direction(isReversed ? 'reverse' : 'normal')
-      .easing(isReversed ? easingReverse : easing)
-      .onFinish(() => {
-      if (ani.getDirection() === 'reverse') {
-        ani.direction('normal');
-      }
-    });
+      .easing(isReversed ? easingReverse : easing);
     if (animated) {
       await ani.play();
     }
     else {
       ani.play({ sync: true });
     }
+    /**
+     * We run this after the play invocation
+     * instead of using ani.onFinish so that
+     * multiple onFinish callbacks do not get
+     * run if an animation is played, stopped,
+     * and then played again.
+     */
+    if (ani.getDirection() === 'reverse') {
+      ani.direction('normal');
+    }
   }
   _isActive() {
     return !this.disabled && !this.isPaneVisible;
@@ -438,7 +444,9 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
     const playTo = this._isOpen ? !shouldComplete : shouldComplete;
     this.animation
       .easing('cubic-bezier(0.4, 0.0, 0.6, 1)')
-      .onFinish(() => this.afterAnimation(shouldOpen), { oneTimeCallback: true })
+      .onFinish(() => {
+      return this.afterAnimation(shouldOpen);
+    }, { oneTimeCallback: true })
       .progressEnd(playTo ? 1 : 0, this._isOpen ? 1 - newStepValue : newStepValue, 300);
   }
   beforeAnimation(shouldOpen) {
@@ -485,6 +493,15 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
   }
   afterAnimation(isOpen) {
     var _a;
+    console.log('after animation', isOpen, this.isAnimating);
+    if (this.operationCancelled) {
+      console.log('cancelled');
+      this.operationCancelled = false;
+      this.isAnimating = false;
+      this._isOpen = false;
+      console.log('this.', this.disabled);
+      return;
+    }
     assert(this.isAnimating, '_before() should be called while animating');
     // keep opening/closing the menu disabled for a touch more yet
     // only add listeners/css if it's enabled and isOpen
@@ -544,8 +561,16 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
     if (this.gesture) {
       this.gesture.enable(isActive && this.swipeGesture);
     }
-    // Close menu immediately
-    if (!isActive && this._isOpen) {
+    /**
+     * If the menu is disabled but it is still open
+     * then we should close the menu immediately.
+     * Additionally, if the menu is in the process
+     * of animating {open, close} and the menu is disabled
+     * then it should still be closed immediately.
+     * TODO: Do we let the animation finish???
+     * what happens if we navigate away from a page?
+     */
+    if (!isActive && (this._isOpen || this.isAnimating)) {
       // close if this menu is open, and should not be enabled
       this.forceClosing();
     }
@@ -560,14 +585,15 @@ const Menu = /*@__PURE__*/ proxyCustomElement(class Menu extends HTMLElement {
         menuController._setActiveMenu(this);
       }
     }
-    assert(!this.isAnimating, 'can not be animating');
   }
   forceClosing() {
-    assert(this._isOpen, 'menu cannot be closed');
-    this.isAnimating = true;
-    const ani = this.animation.direction('reverse');
-    ani.play({ sync: true });
-    this.afterAnimation(false);
+    const { animation } = this;
+    if (animation) {
+      console.log('stopping animation');
+      // TODO - disable when menu is fully open
+      animation.stop();
+      this.operationCancelled = true;
+    }
   }
   render() {
     const { type, disabled, isPaneVisible, inheritedAttributes, side } = this;

package/components/popover.js

@@ -659,7 +659,9 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
   let originY = contentOriginY;
   let checkSafeAreaLeft = false;
   let checkSafeAreaRight = false;
-  const triggerTop = triggerCoordinates ? triggerCoordinates.top : bodyHeight / 2 - contentHeight / 2;
+  const triggerTop = triggerCoordinates
+    ? triggerCoordinates.top + triggerCoordinates.height
+    : bodyHeight / 2 - contentHeight / 2;
   const triggerHeight = triggerCoordinates ? triggerCoordinates.height : 0;
   let addPopoverBottomClass = false;
   /**
@@ -699,7 +701,7 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
        * We chose 12 here so that the popover position looks a bit nicer as
        * it is not right up against the edge of the screen.
        */
-      top = Math.max(12, triggerTop - contentHeight - (arrowHeight - 1));
+      top = Math.max(12, triggerTop - contentHeight - triggerHeight - (arrowHeight - 1));
       arrowTop = top + contentHeight;
       originY = 'bottom';
       addPopoverBottomClass = true;
@@ -712,7 +714,6 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
       bottom = bodyPadding;
     }
   }
-  console.log(top, arrowTop);
   return {
     top,
     left,

package/dist/cjs/{animation-2bb33618.js → animation-c8bdd3c7.js}

@@ -161,6 +161,7 @@ const createAnimation = (animationId) => {
   const id = animationId;
   const onFinishCallbacks = [];
   const onFinishOneTimeCallbacks = [];
+  const onStopOneTimeCallbacks = [];
   const elements = [];
   const childAnimations = [];
   const stylesheets = [];
@@ -218,6 +219,28 @@ const createAnimation = (animationId) => {
   const isRunning = () => {
     return numAnimationsRunning !== 0 && !paused;
   };
+  /**
+   * @internal
+   * Remove a callback from a chosen callback array
+   * @param callbackToRemove: A reference to the callback that should be removed
+   * @param callbackObjects: An array of callbacks that callbackToRemove should be removed from.
+   */
+  const clearCallback = (callbackToRemove, callbackObjects) => {
+    const index = callbackObjects.findIndex((callbackObject) => callbackObject.c === callbackToRemove);
+    if (index > -1) {
+      callbackObjects.splice(index, 1);
+    }
+  };
+  /**
+   * @internal
+   * Add a callback to be fired when an animation is stopped/cancelled.
+   * @param callback: A reference to the callback that should be fired
+   * @param opts: Any options associated with this particular callback
+   */
+  const onStop = (callback, opts) => {
+    onStopOneTimeCallbacks.push({ c: callback, o: opts });
+    return ani;
+  };
   const onFinish = (callback, opts) => {
     const callbacks = (opts === null || opts === void 0 ? void 0 : opts.oneTimeCallback) ? onFinishOneTimeCallbacks : onFinishCallbacks;
     callbacks.push({ c: callback, o: opts });
@@ -886,7 +909,33 @@ const createAnimation = (animationId) => {
         numAnimationsRunning = childAnimations.length + 1;
         shouldCalculateNumAnimations = false;
       }
-      onFinish(() => resolve(), { oneTimeCallback: true });
+      /**
+       * When one of these callbacks fires we
+       * need to clear the other's callback otherwise
+       * you can potentially get these callbacks
+       * firing multiple times if the play method
+       * is subsequently called.
+       * Example:
+       * animation.play() (onStop and onFinish callbacks are registered)
+       * animation.stop() (onStop callback is fired, onFinish is not)
+       * animation.play() (onStop and onFinish callbacks are registered)
+       * Total onStop callbacks: 1
+       * Total onFinish callbacks: 2
+       */
+      const onStopCallback = () => {
+        clearCallback(onFinishCallback, onFinishOneTimeCallbacks);
+        resolve();
+      };
+      const onFinishCallback = () => {
+        clearCallback(onStopCallback, onStopOneTimeCallbacks);
+        resolve();
+      };
+      /**
+       * The play method resolves when an animation
+       * run either finishes or is cancelled.
+       */
+      onFinish(onFinishCallback, { oneTimeCallback: true });
+      onStop(onStopCallback, { oneTimeCallback: true });
       childAnimations.forEach((animation) => {
         animation.play();
       });
@@ -899,6 +948,14 @@ const createAnimation = (animationId) => {
       paused = false;
     });
   };
+  /**
+   * Stops an animation and resets it state to the
+   * beginning. This does not fire any onFinish
+   * callbacks because the animation did not finish.
+   * However, since the animation was not destroyed
+   * (i.e. the animation could run again) we do not
+   * clear the onFinish callbacks.
+   */
   const stop = () => {
     childAnimations.forEach((animation) => {
       animation.stop();
@@ -908,6 +965,8 @@ const createAnimation = (animationId) => {
       initialized = false;
     }
     resetFlags();
+    onStopOneTimeCallbacks.forEach((onStopCallback) => onStopCallback.c(0, ani));
+    onStopOneTimeCallbacks.length = 0;
   };
   const from = (property, value) => {
     const firstFrame = _keyframes[0];

package/dist/cjs/{index-b183138a.js → index-c388851f.js}

@@ -12,8 +12,8 @@ const LIFECYCLE_WILL_LEAVE = 'ionViewWillLeave';
 const LIFECYCLE_DID_LEAVE = 'ionViewDidLeave';
 const LIFECYCLE_WILL_UNLOAD = 'ionViewWillUnload';
 
-const iosTransitionAnimation = () => Promise.resolve().then(function () { return require('./ios.transition-4b93903d.js'); });
-const mdTransitionAnimation = () => Promise.resolve().then(function () { return require('./md.transition-79f3a215.js'); });
+const iosTransitionAnimation = () => Promise.resolve().then(function () { return require('./ios.transition-fd592869.js'); });
+const mdTransitionAnimation = () => Promise.resolve().then(function () { return require('./md.transition-a6040d41.js'); });
 // TODO(FW-2832): types
 const transition = (opts) => {
   return new Promise((resolve, reject) => {

package/dist/cjs/{index-5121bb90.js → index-e50a18ba.js}

@@ -6,7 +6,7 @@
 const hardwareBackButton = require('./hardware-back-button-b67c8e75.js');
 const helpers = require('./helpers-ea4ccbcb.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 
 /**
  * baseAnimation

package/dist/cjs/index.cjs.js

@@ -5,16 +5,16 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const animation = require('./animation-2bb33618.js');
-const index = require('./index-b183138a.js');
-const ios_transition = require('./ios.transition-4b93903d.js');
-const md_transition = require('./md.transition-79f3a215.js');
+const animation = require('./animation-c8bdd3c7.js');
+const index = require('./index-c388851f.js');
+const ios_transition = require('./ios.transition-fd592869.js');
+const md_transition = require('./md.transition-a6040d41.js');
 const cubicBezier = require('./cubic-bezier-6b9222ad.js');
 const index$1 = require('./index-0ee995e4.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
 const helpers = require('./helpers-ea4ccbcb.js');
 const config = require('./config-d5882735.js');
-const index$2 = require('./index-5121bb90.js');
+const index$2 = require('./index-e50a18ba.js');
 const overlays = require('./overlays-d3a13e61.js');
 require('./index-306a7476.js');
 require('./index-6f887430.js');

package/dist/cjs/ion-action-sheet.cjs.entry.js

@@ -12,7 +12,7 @@ const lockController = require('./lock-controller-4ae2eb59.js');
 const overlays = require('./overlays-d3a13e61.js');
 const theme = require('./theme-fbc56b3b.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 require('./haptic-c5f6b4d5.js');
 require('./capacitor-2ffba62a.js');
 require('./index-306a7476.js');

package/dist/cjs/ion-alert.cjs.entry.js

@@ -13,7 +13,7 @@ const lockController = require('./lock-controller-4ae2eb59.js');
 const overlays = require('./overlays-d3a13e61.js');
 const theme = require('./theme-fbc56b3b.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 require('./haptic-c5f6b4d5.js');
 require('./capacitor-2ffba62a.js');
 require('./index-306a7476.js');

package/dist/cjs/ion-app_8.cjs.entry.js

@@ -14,7 +14,7 @@ const index$1 = require('./index-10873539.js');
 const keyboardController = require('./keyboard-controller-50beb83a.js');
 const cubicBezier = require('./cubic-bezier-6b9222ad.js');
 const frameworkDelegate = require('./framework-delegate-c0873a6f.js');
-const index$2 = require('./index-b183138a.js');
+const index$2 = require('./index-c388851f.js');
 require('./index-cc7dfb7c.js');
 require('./index-306a7476.js');
 require('./keyboard-fd7db491.js');

package/dist/cjs/ion-datetime_3.cjs.entry.js

@@ -16,7 +16,7 @@ const ionicGlobal = require('./ionic-global-14a0604b.js');
 const data = require('./data-db832785.js');
 const lockController = require('./lock-controller-4ae2eb59.js');
 const overlays = require('./overlays-d3a13e61.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 const haptic = require('./haptic-c5f6b4d5.js');
 require('./index-306a7476.js');
 require('./framework-delegate-c0873a6f.js');

package/dist/cjs/ion-loading.cjs.entry.js

@@ -12,7 +12,7 @@ const lockController = require('./lock-controller-4ae2eb59.js');
 const overlays = require('./overlays-d3a13e61.js');
 const theme = require('./theme-fbc56b3b.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 require('./index-306a7476.js');
 require('./framework-delegate-c0873a6f.js');
 require('./hardware-back-button-b67c8e75.js');

package/dist/cjs/ion-menu_3.cjs.entry.js

@@ -10,13 +10,13 @@ const cubicBezier = require('./cubic-bezier-6b9222ad.js');
 const index$2 = require('./index-306a7476.js');
 const gestureController = require('./gesture-controller-b46721be.js');
 const helpers = require('./helpers-ea4ccbcb.js');
-const index$1 = require('./index-5121bb90.js');
+const index$1 = require('./index-e50a18ba.js');
 const overlays = require('./overlays-d3a13e61.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
 const theme = require('./theme-fbc56b3b.js');
 const index$3 = require('./index-d8d1fc0b.js');
 require('./hardware-back-button-b67c8e75.js');
-require('./animation-2bb33618.js');
+require('./animation-c8bdd3c7.js');
 require('./framework-delegate-c0873a6f.js');
 require('./index-cc7dfb7c.js');
 
@@ -57,6 +57,7 @@ const Menu = class {
       }
       this.trapKeyboardFocus(ev, document);
     };
+    this.operationCancelled = false;
     this.isPaneVisible = false;
     this.isEndSide = false;
     this.contentId = undefined;
@@ -341,18 +342,23 @@ const Menu = class {
     const easingReverse = mode === 'ios' ? iosEasingReverse : mdEasingReverse;
     const ani = this.animation
       .direction(isReversed ? 'reverse' : 'normal')
-      .easing(isReversed ? easingReverse : easing)
-      .onFinish(() => {
-      if (ani.getDirection() === 'reverse') {
-        ani.direction('normal');
-      }
-    });
+      .easing(isReversed ? easingReverse : easing);
     if (animated) {
       await ani.play();
     }
     else {
       ani.play({ sync: true });
     }
+    /**
+     * We run this after the play invocation
+     * instead of using ani.onFinish so that
+     * multiple onFinish callbacks do not get
+     * run if an animation is played, stopped,
+     * and then played again.
+     */
+    if (ani.getDirection() === 'reverse') {
+      ani.direction('normal');
+    }
   }
   _isActive() {
     return !this.disabled && !this.isPaneVisible;
@@ -442,7 +448,9 @@ const Menu = class {
     const playTo = this._isOpen ? !shouldComplete : shouldComplete;
     this.animation
       .easing('cubic-bezier(0.4, 0.0, 0.6, 1)')
-      .onFinish(() => this.afterAnimation(shouldOpen), { oneTimeCallback: true })
+      .onFinish(() => {
+      return this.afterAnimation(shouldOpen);
+    }, { oneTimeCallback: true })
       .progressEnd(playTo ? 1 : 0, this._isOpen ? 1 - newStepValue : newStepValue, 300);
   }
   beforeAnimation(shouldOpen) {
@@ -489,6 +497,15 @@ const Menu = class {
   }
   afterAnimation(isOpen) {
     var _a;
+    console.log('after animation', isOpen, this.isAnimating);
+    if (this.operationCancelled) {
+      console.log('cancelled');
+      this.operationCancelled = false;
+      this.isAnimating = false;
+      this._isOpen = false;
+      console.log('this.', this.disabled);
+      return;
+    }
     helpers.assert(this.isAnimating, '_before() should be called while animating');
     // keep opening/closing the menu disabled for a touch more yet
     // only add listeners/css if it's enabled and isOpen
@@ -548,8 +565,16 @@ const Menu = class {
     if (this.gesture) {
       this.gesture.enable(isActive && this.swipeGesture);
     }
-    // Close menu immediately
-    if (!isActive && this._isOpen) {
+    /**
+     * If the menu is disabled but it is still open
+     * then we should close the menu immediately.
+     * Additionally, if the menu is in the process
+     * of animating {open, close} and the menu is disabled
+     * then it should still be closed immediately.
+     * TODO: Do we let the animation finish???
+     * what happens if we navigate away from a page?
+     */
+    if (!isActive && (this._isOpen || this.isAnimating)) {
       // close if this menu is open, and should not be enabled
       this.forceClosing();
     }
@@ -564,14 +589,15 @@ const Menu = class {
         index$1.menuController._setActiveMenu(this);
       }
     }
-    helpers.assert(!this.isAnimating, 'can not be animating');
   }
   forceClosing() {
-    helpers.assert(this._isOpen, 'menu cannot be closed');
-    this.isAnimating = true;
-    const ani = this.animation.direction('reverse');
-    ani.play({ sync: true });
-    this.afterAnimation(false);
+    const { animation } = this;
+    if (animation) {
+      console.log('stopping animation');
+      // TODO - disable when menu is fully open
+      animation.stop();
+      this.operationCancelled = true;
+    }
   }
   render() {
     const { type, disabled, isPaneVisible, inheritedAttributes, side } = this;

package/dist/cjs/ion-modal.cjs.entry.js

@@ -14,10 +14,10 @@ const index$4 = require('./index-cc7dfb7c.js');
 const capacitor = require('./capacitor-2ffba62a.js');
 const overlays = require('./overlays-d3a13e61.js');
 const theme = require('./theme-fbc56b3b.js');
-const index$5 = require('./index-b183138a.js');
+const index$5 = require('./index-c388851f.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
 const keyboard = require('./keyboard-38f2bb7b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 const cubicBezier = require('./cubic-bezier-6b9222ad.js');
 const index$1 = require('./index-0ee995e4.js');
 const index = require('./index-306a7476.js');

package/dist/cjs/ion-nav_2.cjs.entry.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 const index = require('./index-6f887430.js');
 const cubicBezier = require('./cubic-bezier-6b9222ad.js');
 const helpers = require('./helpers-ea4ccbcb.js');
-const index$1 = require('./index-b183138a.js');
+const index$1 = require('./index-c388851f.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
 const frameworkDelegate = require('./framework-delegate-c0873a6f.js');
 

package/dist/cjs/ion-popover.cjs.entry.js

@@ -13,8 +13,8 @@ const index$1 = require('./index-cc7dfb7c.js');
 const overlays = require('./overlays-d3a13e61.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
 const theme = require('./theme-fbc56b3b.js');
-const index$2 = require('./index-b183138a.js');
-const animation = require('./animation-2bb33618.js');
+const index$2 = require('./index-c388851f.js');
+const animation = require('./animation-c8bdd3c7.js');
 require('./index-306a7476.js');
 require('./hardware-back-button-b67c8e75.js');
 
@@ -664,7 +664,9 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
   let originY = contentOriginY;
   let checkSafeAreaLeft = false;
   let checkSafeAreaRight = false;
-  const triggerTop = triggerCoordinates ? triggerCoordinates.top : bodyHeight / 2 - contentHeight / 2;
+  const triggerTop = triggerCoordinates
+    ? triggerCoordinates.top + triggerCoordinates.height
+    : bodyHeight / 2 - contentHeight / 2;
   const triggerHeight = triggerCoordinates ? triggerCoordinates.height : 0;
   let addPopoverBottomClass = false;
   /**
@@ -704,7 +706,7 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
        * We chose 12 here so that the popover position looks a bit nicer as
        * it is not right up against the edge of the screen.
        */
-      top = Math.max(12, triggerTop - contentHeight - (arrowHeight - 1));
+      top = Math.max(12, triggerTop - contentHeight - triggerHeight - (arrowHeight - 1));
       arrowTop = top + contentHeight;
       originY = 'bottom';
       addPopoverBottomClass = true;
@@ -717,7 +719,6 @@ const calculateWindowAdjustment = (side, coordTop, coordLeft, bodyPadding, bodyW
       bottom = bodyPadding;
     }
   }
-  console.log(top, arrowTop);
   return {
     top,
     left,

package/dist/cjs/ion-refresher_2.cjs.entry.js

@@ -11,7 +11,7 @@ const index$1 = require('./index-10873539.js');
 const helpers = require('./helpers-ea4ccbcb.js');
 const haptic = require('./haptic-c5f6b4d5.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 const config = require('./config-d5882735.js');
 const index$2 = require('./index-d8d1fc0b.js');
 const spinnerConfigs = require('./spinner-configs-f7b5105b.js');

package/dist/cjs/ion-toast.cjs.entry.js

@@ -13,7 +13,7 @@ const index$1 = require('./index-cc7dfb7c.js');
 const overlays = require('./overlays-d3a13e61.js');
 const theme = require('./theme-fbc56b3b.js');
 const ionicGlobal = require('./ionic-global-14a0604b.js');
-const animation = require('./animation-2bb33618.js');
+const animation = require('./animation-c8bdd3c7.js');
 require('./index-306a7476.js');
 require('./framework-delegate-c0873a6f.js');
 require('./hardware-back-button-b67c8e75.js');

package/dist/cjs/{ios.transition-4b93903d.js → ios.transition-fd592869.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-const animation = require('./animation-2bb33618.js');
-const index = require('./index-b183138a.js');
+const animation = require('./animation-c8bdd3c7.js');
+const index = require('./index-c388851f.js');
 require('./index-306a7476.js');
 require('./helpers-ea4ccbcb.js');
 require('./index-6f887430.js');

package/dist/cjs/{md.transition-79f3a215.js → md.transition-a6040d41.js}

@@ -3,8 +3,8 @@
  */
 'use strict';
 
-const animation = require('./animation-2bb33618.js');
-const index = require('./index-b183138a.js');
+const animation = require('./animation-c8bdd3c7.js');
+const index = require('./index-c388851f.js');
 require('./index-306a7476.js');
 require('./helpers-ea4ccbcb.js');
 require('./index-6f887430.js');