Skip to content

Commit a0dd6dc

Browse files
committed
chore: Replace bottom-sheet transition for android navigation with fade-through transition
1 parent 6f8dbb2 commit a0dd6dc

File tree

1 file changed

+1
-55
lines changed

1 file changed

+1
-55
lines changed

core/src/utils/transition/md.transition.ts

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,12 @@
11
import type { Animation } from '../../interface';
22
import { createAnimation } from '../animation/animation';
33
import type { TransitionOptions } from '../transition';
4-
import { getIonPageElement } from '../transition';
54

6-
export const mdTransitionAnimation = (_: HTMLElement, opts: TransitionOptions): Animation => {
7-
const OFF_BOTTOM = '40px';
8-
const CENTER = '0px';
9-
10-
const backDirection = opts.direction === 'back';
11-
const enteringEl = opts.enteringEl;
12-
const leavingEl = opts.leavingEl;
13-
14-
const ionPageElement = getIonPageElement(enteringEl);
15-
const enteringToolbarEle = ionPageElement.querySelector('ion-toolbar');
16-
const rootTransition = createAnimation();
17-
18-
rootTransition.addElement(ionPageElement).fill('both').beforeRemoveClass('ion-page-invisible');
19-
20-
// animate the component itself
21-
if (backDirection) {
22-
rootTransition.duration((opts.duration ?? 0) || 200).easing('cubic-bezier(0.47,0,0.745,0.715)');
23-
} else {
24-
rootTransition
25-
.duration((opts.duration ?? 0) || 280)
26-
.easing('cubic-bezier(0.36,0.66,0.04,1)')
27-
.fromTo('transform', `translateY(${OFF_BOTTOM})`, `translateY(${CENTER})`)
28-
.fromTo('opacity', 0.01, 1);
29-
}
30-
31-
// Animate toolbar if it's there
32-
if (enteringToolbarEle) {
33-
const enteringToolBar = createAnimation();
34-
enteringToolBar.addElement(enteringToolbarEle);
35-
rootTransition.addAnimation(enteringToolBar);
36-
}
37-
38-
// setup leaving view
39-
if (leavingEl && backDirection) {
40-
// leaving content
41-
rootTransition.duration((opts.duration ?? 0) || 200).easing('cubic-bezier(0.47,0,0.745,0.715)');
42-
43-
const leavingPage = createAnimation();
44-
leavingPage
45-
.addElement(getIonPageElement(leavingEl))
46-
.onFinish((currentStep) => {
47-
if (currentStep === 1 && leavingPage.elements.length > 0) {
48-
leavingPage.elements[0].style.setProperty('display', 'none');
49-
}
50-
})
51-
.fromTo('transform', `translateY(${CENTER})`, `translateY(${OFF_BOTTOM})`)
52-
.fromTo('opacity', 1, 0);
53-
54-
rootTransition.addAnimation(leavingPage);
55-
}
56-
57-
return rootTransition;
58-
};
595

606

617
const dpToPx = (n: number) => window.devicePixelRatio * n;
628

63-
export const mdTransitionAnimation2 = (_: HTMLElement, opts: TransitionOptions): Animation => {
9+
export const mdTransitionAnimation = (_: HTMLElement, opts: TransitionOptions): Animation => {
6410
const enteringEl = opts.enteringEl;
6511
const leavingEl = opts.leavingEl;
6612

0 commit comments

Comments
 (0)