javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 13:32:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): ion-nav nested animation

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-02-16 11:05:29 +01:00
parent ca2aded47e
commit d7ec7e1e48
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/core/src/components/nav/transitions/transition.ios.ts
View File

@ -39,10 +39,18 @@ export function buildIOSTransition(rootTransition: Transition, enteringView: Vie
const backDirection = (opts.direction === 'back'); const backDirection = (opts.direction === 'back');
// setting up enter view // setting up enter view
if (enteringView) { if (enteringView) {
const contentEl = enteringView.element.querySelector('ion-content');
const headerEls = enteringView.element.querySelectorAll('ion-header > *:not(ion-toolbar),ion-footer > *');
const enteringToolBarEle = enteringView.element.querySelector('ion-toolbar');
const enteringContent = rootTransition.create(); const enteringContent = rootTransition.create();
enteringContent.addElement(enteringView.element.querySelector('ion-content'));
enteringContent.addElement(enteringView.element.querySelectorAll('ion-header > *:not(ion-toolbar),ion-footer > *')); if (!contentEl && !enteringToolBarEle && headerEls.length === 0) {
enteringContent.addElement(enteringView.element.querySelector('ion-page,ion-nav,ion-tabs'));
} else {
enteringContent.addElement(contentEl);
enteringContent.addElement(headerEls);
}
rootTransition.add(enteringContent); rootTransition.add(enteringContent);
if (backDirection) { if (backDirection) {
@ -58,7 +66,6 @@ export function buildIOSTransition(rootTransition: Transition, enteringView: Vie
} }
const enteringToolBarEle = enteringView.element.querySelector('ion-toolbar');
if (enteringToolBarEle) { if (enteringToolBarEle) {
const enteringToolBar = rootTransition.create(); const enteringToolBar = rootTransition.create();
enteringToolBar.addElement(enteringToolBarEle); enteringToolBar.addElement(enteringToolBarEle);