Skip to content

Commit eab5726

Browse files
committed
fix(navbar): Don't fade out navbars. Fixes #8060
1 parent 2834cd8 commit eab5726

File tree

1 file changed

+8
-29
lines changed

1 file changed

+8
-29
lines changed

src/transitions/transition-ios.ts

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -88,21 +88,9 @@ export class IOSTransition extends PageTransition {
8888
// entering navbar, forward direction
8989
enteringTitle.fromTo(TRANSLATEX, OFF_RIGHT, CENTER, true);
9090

91-
if (leavingHasNavbar) {
92-
// entering navbar, forward direction, and there's a leaving navbar
93-
// should just fade in, no sliding
94-
enteringNavbarBg
95-
.beforeClearStyles([TRANSLATEX])
96-
.fromTo(OPACITY, 0.01, 1, true);
97-
98-
} else {
99-
// entering navbar, forward direction, and there's no leaving navbar
100-
// should just slide in, no fading in
101-
enteringNavbarBg
102-
.beforeClearStyles([OPACITY])
103-
.fromTo(TRANSLATEX, OFF_RIGHT, CENTER, true);
104-
}
105-
91+
enteringNavbarBg
92+
.beforeClearStyles([OPACITY])
93+
.fromTo(TRANSLATEX, OFF_RIGHT, CENTER, true);
10694

10795
if (enteringView.enableBack()) {
10896
// forward direction, entering page has a back button
@@ -170,20 +158,11 @@ export class IOSTransition extends PageTransition {
170158
// leaving navbar, back direction
171159
leavingTitle.fromTo(TRANSLATEX, CENTER, '100%');
172160

173-
if (enteringHasNavbar) {
174-
// leaving navbar, back direction, and there's an entering navbar
175-
// should just fade out, no sliding
176-
leavingNavbarBg
177-
.beforeClearStyles([TRANSLATEX])
178-
.fromTo(OPACITY, 0.99, 0);
179-
180-
} else {
181-
// leaving navbar, back direction, and there's no entering navbar
182-
// should just slide out, no fading out
183-
leavingNavbarBg
184-
.beforeClearStyles([OPACITY])
185-
.fromTo(TRANSLATEX, CENTER, '100%');
186-
}
161+
// leaving navbar, back direction, and there's no entering navbar
162+
// should just slide out, no fading out
163+
leavingNavbarBg
164+
.beforeClearStyles([OPACITY])
165+
.fromTo(TRANSLATEX, CENTER, '100%');
187166

188167
let leavingBackBtnText = new Animation(leavingNavbarEle.querySelector('.back-button-text'));
189168
leavingBackBtnText.fromTo(TRANSLATEX, CENTER, (300) + 'px');

0 commit comments

Comments
 (0)