javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 11:17:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): properly animate content when navigating from a tabbed page (#20918)

Browse Source 
fixes #20912
This commit is contained in:
Liam DeBeasi
2020-04-08 15:16:10 -04:00
committed by GitHub
parent 6f13b8c792
commit 8a02b28efe
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/utils/transition/ios.transition.ts
View File

@ -386,12 +386,18 @@ export const iosTransitionAnimation = (navEl: HTMLElement, opts: TransitionOptio
// setup leaving view // setup leaving view
if (leavingEl) { if (leavingEl) {
const leavingContent = createAnimation(); const leavingContent = createAnimation();
const leavingContentEl = leavingEl.querySelector(':scope > ion-content'); const leavingContentEl = leavingEl.querySelector(':scope > ion-content');
const leavingToolBarEls = leavingEl.querySelectorAll(':scope > ion-header > ion-toolbar');
const leavingHeaderEls = leavingEl.querySelectorAll(':scope > ion-header > *:not(ion-toolbar), :scope > ion-footer > *');
if (!leavingContentEl && leavingToolBarEls.length === 0 && leavingHeaderEls.length === 0) {
leavingContent.addElement(leavingEl.querySelector(':scope > .ion-page, :scope > ion-nav, :scope > ion-tabs')!); // REVIEW
} else {
leavingContent.addElement(leavingContentEl!); // REVIEW
leavingContent.addElement(leavingHeaderEls);
}
leavingContent.addElement(leavingContentEl!); // REVIEW
leavingContent.addElement(leavingEl.querySelectorAll(':scope > ion-header > *:not(ion-toolbar), :scope > ion-footer > *'));
rootAnimation.addAnimation(leavingContent); rootAnimation.addAnimation(leavingContent);
if (backDirection) { if (backDirection) {
@ -445,7 +451,6 @@ export const iosTransitionAnimation = (navEl: HTMLElement, opts: TransitionOptio
} }
} }
const leavingToolBarEls = leavingEl.querySelectorAll(':scope > ion-header > ion-toolbar');
leavingToolBarEls.forEach(leavingToolBarEl => { leavingToolBarEls.forEach(leavingToolBarEl => {
const leavingToolBar = createAnimation(); const leavingToolBar = createAnimation();
leavingToolBar.addElement(leavingToolBarEl); leavingToolBar.addElement(leavingToolBarEl);