Skip to content

Commit 391e6e4

Browse files
committed
feat: tweak MD page transitions directions
1 parent 5e5cf02 commit 391e6e4

6 files changed

Lines changed: 25 additions & 24 deletions

File tree

src/core/components/page/page-ios.less

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@
1515
transform: translate3d(100%, 0, 0);
1616
}
1717
});
18-
.page-previous {
19-
.page-opacity-effect {
20-
opacity: 1;
21-
}
22-
&:after {
23-
opacity: 1;
24-
}
25-
}
18+
2619
.page-current {
2720
.page-shadow-effect {
2821
opacity: 1;

src/core/components/page/page-md.less

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.md {
22
.page-previous {
3-
transform: translate3d(0, -20px, 0);
3+
transform: translate3d(-24px, 0px, 0);
44
}
55
.page-next {
66
pointer-events: none;
7-
transform: translate3d(0, 128px, 0);
7+
transform: translate3d(128px, 0px, 0);
88
opacity: 0;
99
&.page-next-on-right {
1010
.ltr({
@@ -32,29 +32,30 @@
3232
.router-transition-backward {
3333
.page-current {
3434
animation:
35-
md-page-current-to-next calc(var(--f7-page-transition-duration) / 4) forwards
36-
cubic-bezier(0.8, 0, 1, 0.3),
37-
md-page-current-to-next-opacity 0ms calc(var(--f7-page-transition-duration) / 4) forwards;
35+
md-page-current-to-next calc(var(--f7-page-transition-duration) / 2) forwards
36+
cubic-bezier(0, 1, 0.8, 1),
37+
md-page-current-to-next-opacity calc(var(--f7-page-transition-duration) / 2) forwards;
3838
}
3939
.page-previous {
40-
animation: md-page-previous-to-current var(--f7-page-transition-duration) forwards;
40+
animation: md-page-previous-to-current calc(var(--f7-page-transition-duration) / 2) forwards
41+
cubic-bezier(0, 1, 0.8, 1);
4142
}
4243
}
4344
}
4445
@keyframes md-page-next-to-current {
4546
from {
46-
transform: translate3d(0, 128px, 0);
47+
transform: translate3d(128px, 0px, 0);
4748
}
4849
to {
49-
transform: translate3d(0, 0px, 0);
50+
transform: translate3d(0px, 0px, 0);
5051
}
5152
}
5253
@keyframes md-page-current-to-next {
5354
from {
5455
transform: translate3d(0, 0, 0);
5556
}
5657
to {
57-
transform: translate3d(0, 128px, 0);
58+
transform: translate3d(128px, 0px, 0);
5859
}
5960
}
6061
@keyframes md-page-current-to-next-opacity {
@@ -70,12 +71,12 @@
7071
transform: translate3d(0, 0, 0);
7172
}
7273
to {
73-
transform: translate3d(0, -20px, 0);
74+
transform: translate3d(-24px, 0px, 0);
7475
}
7576
}
7677
@keyframes md-page-previous-to-current {
7778
from {
78-
transform: translate3d(0, -20px, 0);
79+
transform: translate3d(-24px, 0px, 0);
7980
}
8081
to {
8182
transform: translate3d(0, 0px, 0);

src/core/components/page/page.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@
4242
var(--f7-page-content-extra-padding-bottom, 0px)
4343
);
4444
}
45+
.page-previous {
46+
.page-opacity-effect {
47+
opacity: 1;
48+
}
49+
&:after {
50+
opacity: 1;
51+
}
52+
}
4553
.page-transitioning {
4654
&,
4755
.page-shadow-effect,

src/core/components/toolbar/toolbar-md.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
height: var(--f7-toolbar-link-height, var(--f7-toolbar-height));
1414
}
1515
a:is(.icon-only, :has(i:only-child), :has(svg:only-child)) {
16-
min-width: 0;
16+
min-width: 48px;
1717
flex-shrink: 0;
1818
padding: 0;
1919
}

src/core/components/view/view.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export default {
7474
iosSwipeBackThreshold: 0,
7575
mdSwipeBack: false,
7676
mdSwipeBackAnimateShadow: true,
77-
mdSwipeBackAnimateOpacity: false,
77+
mdSwipeBackAnimateOpacity: true,
7878
mdSwipeBackActiveArea: 30,
7979
mdSwipeBackThreshold: 0,
8080
// Push State

src/core/modules/router/swipe-back.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ function SwipeBack(r) {
148148
// Transform pages
149149
let currentPageTranslate = touchesDiff * inverter;
150150
let previousPageTranslate = (touchesDiff / 5 - viewContainerWidth / 5) * inverter;
151+
151152
if (!app.rtl) {
152153
currentPageTranslate = Math.min(currentPageTranslate, viewContainerWidth);
153154
previousPageTranslate = Math.min(previousPageTranslate, 0);
@@ -166,9 +167,7 @@ function SwipeBack(r) {
166167
$currentPageEl.transform(`translate3d(${currentPageTranslate}px,0,0)`);
167168
if (paramsSwipeBackAnimateShadow) $pageShadowEl[0].style.opacity = 1 - 1 * percentage;
168169

169-
if (app.theme === 'ios') {
170-
$previousPageEl.transform(`translate3d(${previousPageTranslate}px,0,0)`);
171-
}
170+
$previousPageEl.transform(`translate3d(${previousPageTranslate}px,0,0)`);
172171
if (paramsSwipeBackAnimateOpacity) $pageOpacityEl[0].style.opacity = 1 - 1 * percentage;
173172
}
174173
function handleTouchEnd(e) {

0 commit comments

Comments
 (0)