diff --git a/packages/core/src/components/popover/animations/ios.enter.ts b/packages/core/src/components/popover/animations/ios.enter.ts index 574b2eb0bc..27023ef1e0 100644 --- a/packages/core/src/components/popover/animations/ios.enter.ts +++ b/packages/core/src/components/popover/animations/ios.enter.ts @@ -97,25 +97,17 @@ export default function iosEnterAnimation(Animation: Animation, baseElm: HTMLEle if (checkSafeAreaLeft) { if (CSS.supports('left', 'constant(safe-area-inset-left)')) { - contentEl.style.left = `calc(${ - popoverCSS.left - }px + constant(safe-area-inset-left)`; + contentEl.style.left = `calc(${popoverCSS.left}px + constant(safe-area-inset-left)`; } else if (CSS.supports('left', 'env(safe-area-inset-left)')) { - contentEl.style.left = `calc(${ - popoverCSS.left - }px + env(safe-area-inset-left)`; + contentEl.style.left = `calc(${popoverCSS.left}px + env(safe-area-inset-left)`; } } if (checkSafeAreaRight) { if (CSS.supports('right', 'constant(safe-area-inset-right)')) { - contentEl.style.left = `calc(${ - popoverCSS.left - }px - constant(safe-area-inset-right)`; + contentEl.style.left = `calc(${popoverCSS.left}px - constant(safe-area-inset-right)`; } else if (CSS.supports('right', 'env(safe-area-inset-right)')) { - contentEl.style.left = `calc(${ - popoverCSS.left - }px - env(safe-area-inset-right)`; + contentEl.style.left = `calc(${popoverCSS.left}px - env(safe-area-inset-right)`; } } diff --git a/packages/core/src/components/popover/popover.tsx b/packages/core/src/components/popover/popover.tsx index a96a685e5a..0fed1287c6 100644 --- a/packages/core/src/components/popover/popover.tsx +++ b/packages/core/src/components/popover/popover.tsx @@ -75,7 +75,7 @@ export class Popover { @Prop() popoverId: string; @Prop() showBackdrop: boolean = true; @Prop() translucent: boolean = false; - @Prop() animate: boolean; + @Prop() animate: boolean = true; @Method() @@ -90,7 +90,7 @@ export class Popover { const animationBuilder = this.enterAnimation || this.config.get('popoverEnter', this.mode === 'ios' ? iosEnterAnimation : mdEnterAnimation); // build the animation and kick it off - return this.animationCtrl.create(animationBuilder, this.el).then(animation => { + return this.animationCtrl.create(animationBuilder, this.el, this.ev).then(animation => { this.animation = animation; if (!this.animate) { // if the duration is 0, it won't actually animate I don't think diff --git a/packages/core/src/components/popover/test/basic/index.html b/packages/core/src/components/popover/test/basic/index.html index e1def3cede..356cacd963 100644 --- a/packages/core/src/components/popover/test/basic/index.html +++ b/packages/core/src/components/popover/test/basic/index.html @@ -115,4 +115,4 @@ - \ No newline at end of file +