feat(modal): update iOS design, add swipe gesture #19428
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,90 +1,62 @@ | ||||||
| import { Animation } from '../../../interface'; | ||||||
| import { createAnimation } from '../../../utils/animation/animation'; | ||||||
| import { SwipeToCloseDefaults } from '../gestures/swipe-to-close'; | ||||||
|
|
||||||
| /** | ||||||
| * iOS Modal Enter Animation for the Card presentation style | ||||||
| */ | ||||||
| export const iosEnterAnimation = ( | ||||||
| baseEl: HTMLElement, | ||||||
| presentingEl?: HTMLElement, | ||||||
| ): Animation => { | ||||||
| // The top translate Y for the presenting element | ||||||
| const backdropAnimation = createAnimation() | ||||||
| .addElement(baseEl.querySelector('ion-backdrop')!) | ||||||
| .fromTo('opacity', 0.01, 'var(--backdrop-opacity)'); | ||||||
|
|
||||||
| const wrapperAnimation = createAnimation() | ||||||
| .addElement(baseEl.querySelector('.modal-wrapper')!) | ||||||
| .beforeStyles({ 'opacity': 1 }) | ||||||
| .fromTo('transform', 'translateY(100%)', 'translateY(0%)'); | ||||||
|
|
||||||
| const baseAnimation = createAnimation() | ||||||
| .addElement(baseEl) | ||||||
| .easing('cubic-bezier(0.32,0.72,0,1)') | ||||||
| .duration(500) | ||||||
| .beforeAddClass('show-modal') | ||||||
| .addAnimation([backdropAnimation, wrapperAnimation]); | ||||||
|
|
||||||
| // BEFORE 0->1 AFTER | ||||||
| // BEFORE 1->0 AFTER | ||||||
|
|
||||||
| // onstart(0.5) 0.5 -> 1 onFinish(1) | ||||||
| // onstart(0.5) 0.5 -> 0 onFinish(0) | ||||||
| // onstart(false) START 0->1 END onFInish(true) | ||||||
| // onstart(true) END 1->0 START onFinish(false) | ||||||
|
|
||||||
| // onstart(false) START 0->1 END onFInish(true) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| // onstart(true) END 1->0 START onFinish(false) | ||||||
|
|
||||||
| if (presentingEl) { | ||||||
| const bodyEl = document.body; | ||||||
| const toPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE; | ||||||
| const presentingToY = SwipeToCloseDefaults.MIN_PRESENTING_Y; | ||||||
| const finalTransform = `translateY(${presentingToY}%) scale(${toPresentingScale})`; | ||||||
| const presentingAnimation = createAnimation() | ||||||
| .beforeStyles({ | ||||||
| 'transform': 'translateY(0)', | ||||||
| 'border-radius': '10px 10px 0 0' | ||||||
| }) | ||||||
| .afterStyles({ | ||||||
| 'transform': finalTransform | ||||||
| }) | ||||||
| .addElement(presentingEl) | ||||||
| .fromTo('transform', 'translateY(0px) scale(1)', finalTransform); | ||||||
|
|
||||||
| // Wrap around animation code | ||||||
| bodyEl.style.backgroundColor = 'black'; | ||||||
| baseAnimation.addAnimation(presentingAnimation); | ||||||
| } | ||||||
|
|
||||||
| return baseAnimation; | ||||||
| }; | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,59 @@ | ||
| import { Animation } from '../../../interface'; | ||
| import { createAnimation } from '../../../utils/animation/animation'; | ||
| import { raf } from '../../../utils/helpers'; | ||
| import { SwipeToCloseDefaults } from '../gestures/swipe-to-close'; | ||
|
|
||
| /** | ||
| * iOS Modal Leave Animation | ||
| */ | ||
| export const iosLeaveAnimation = ( | ||
| baseEl: HTMLElement, | ||
| presentingEl?: HTMLElement, | ||
| duration = 500 | ||
| ): Animation => { | ||
|
|
||
| const backdropAnimation = createAnimation() | ||
| .addElement(baseEl.querySelector('ion-backdrop')!) | ||
| .fromTo('opacity', 'var(--backdrop-opacity)', 0.0); | ||
|
|
||
| const wrapperAnimation = createAnimation() | ||
| .addElement(baseEl.querySelector('.modal-wrapper')!) | ||
| .beforeStyles({ 'opacity': 1 }) | ||
| .fromTo('transform', `translateY(0%)`, 'translateY(100%)'); | ||
|
|
||
| const baseAnimation = createAnimation() | ||
| .addElement(baseEl) | ||
| .easing('cubic-bezier(0.32,0.72,0,1)') | ||
| .duration(duration) | ||
| .addAnimation([backdropAnimation, wrapperAnimation]); | ||
|
|
||
| if (presentingEl) { | ||
| const currentPresentingScale = SwipeToCloseDefaults.MIN_PRESENTING_SCALE; | ||
| const presentingFromY = SwipeToCloseDefaults.MIN_PRESENTING_Y; | ||
| const presentingAnimation = createAnimation() | ||
| .addElement(presentingEl) | ||
| .beforeClearStyles(['transform']) | ||
| .afterClearStyles(['transform']) | ||
| .onFinish(currentStep => { | ||
| if (currentStep === 1) { | ||
| /** | ||
| * This is a hack to work around an issue in Safari | ||
| * where the border-radius change is not rendered | ||
| * unless a layout is forced | ||
| */ | ||
| raf(() => { | ||
| presentingEl.style.removeProperty('border-radius'); | ||
| presentingEl.style.setProperty('overflow', 'unset'); | ||
| raf(() => { | ||
| presentingEl.style.setProperty('overflow', ''); | ||
| }); | ||
| }); | ||
| } | ||
| }) | ||
| .fromTo('transform', `translateY(${presentingFromY}px) scale(${currentPresentingScale})`, 'translateY(0px) scale(1)'); | ||
|
|
||
| baseAnimation.addAnimation(presentingAnimation); | ||
| } | ||
|
|
||
| return baseAnimation; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| import { Animation } from '../../../interface'; | ||
| import { getTimeGivenProgression } from '../../../utils/animation/cubic-bezier'; | ||
| import { GestureDetail, createGesture } from '../../../utils/gesture'; | ||
| import { clamp } from '../../../utils/helpers'; | ||
|
|
||
| // Defaults for the card swipe animation | ||
| export const SwipeToCloseDefaults = { | ||
| MIN_BACKDROP_OPACITY: 0.4, | ||
| MIN_PRESENTING_SCALE: 0.95, | ||
| MIN_Y_CARD: 44, | ||
| MIN_Y_FULLSCREEN: 0, | ||
| MIN_PRESENTING_Y: 0 | ||
| }; | ||
|
|
||
| export const createSwipeToCloseGesture = ( | ||
| el: HTMLIonModalElement, | ||
| animation: Animation, | ||
| onDismiss: () => void | ||
| ) => { | ||
| const height = el.offsetHeight; | ||
| let isOpen = false; | ||
|
|
||
| const canStart = (detail: GestureDetail) => { | ||
| const target = detail.event.target as HTMLElement | null; | ||
|
|
||
| if (target === null || | ||
| !(target as any).closest) { | ||
| return true; | ||
| } | ||
|
|
||
| const content = target.closest('ion-content'); | ||
| if (content === null) { | ||
| return true; | ||
| } | ||
| // Target is in the content so we don't start the gesture. | ||
| // We could be more nuanced here and allow it for content that | ||
| // does not need to scroll. | ||
| return false; | ||
| }; | ||
|
|
||
| const onStart = () => { | ||
| animation.progressStart(true, (isOpen) ? 1 : 0); | ||
| }; | ||
|
|
||
| const onMove = (detail: GestureDetail) => { | ||
| const step = detail.deltaY / height; | ||
| if (step < 0) { return; } | ||
|
|
||
| animation.progressStep(step); | ||
| }; | ||
|
|
||
| const onEnd = (detail: GestureDetail) => { | ||
| const velocity = detail.velocityY; | ||
| const step = detail.deltaY / height; | ||
| if (step < 0) { return; } | ||
|
|
||
| const threshold = (detail.deltaY + velocity * 1000) / height; | ||
|
|
||
| const shouldComplete = threshold >= 0.5; | ||
| let newStepValue = (shouldComplete) ? -0.001 : 0.001; | ||
|
|
||
| if (!shouldComplete) { | ||
| animation.easing('cubic-bezier(1, 0, 0.68, 0.28)'); | ||
| newStepValue += getTimeGivenProgression([0, 0], [1, 0], [0.68, 0.28], [1, 1], step)[0]; | ||
| } else { | ||
| animation.easing('cubic-bezier(0.32, 0.72, 0, 1)'); | ||
| newStepValue += getTimeGivenProgression([0, 0], [0.32, 0.72], [0, 1], [1, 1], step)[0]; | ||
| } | ||
|
|
||
| const duration = (shouldComplete) ? computeDuration(step * height, velocity) : computeDuration((1 - step) * height, velocity); | ||
| isOpen = shouldComplete; | ||
|
|
||
| animation | ||
| .onFinish(() => { | ||
| if (shouldComplete) { | ||
| onDismiss(); | ||
| } | ||
| }) | ||
| .progressEnd((shouldComplete) ? 1 : 0, newStepValue, duration); | ||
| }; | ||
|
|
||
| return createGesture({ | ||
| el, | ||
| gestureName: 'modalSwipeToClose', | ||
| gesturePriority: 40, | ||
| direction: 'y', | ||
| threshold: 10, | ||
| canStart, | ||
| onStart, | ||
| onMove, | ||
| onEnd | ||
| }); | ||
| }; | ||
|
|
||
| const computeDuration = (remaining: number, velocity: number) => { | ||
| return clamp(100, remaining / Math.abs(velocity * 1.1), 400); | ||
| }; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@manucorporat do you still want these comments in here, or can I remove then?