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

refactor(transition): deduplicates animation builder

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-04-27 00:15:06 +02:00
parent 89d5a358a7
commit aa53563944
7 changed files with 64 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
core/src/components/nav/nav.tsx
View File

@ -1,20 +1,15 @@
import { Build, Component, Element, Event, EventEmitter, Method, Prop, Watch } from '@stencil/core';
import { Animation, ComponentProps, Config, FrameworkDelegate, GestureDetail, Mode, NavOutlet, QueueController, RouteID, RouteWrite, RouterDirection } from '../../interface';
import { NavComponent, NavDirection, NavOptions, NavResult, TransitionDoneFn, TransitionInstruction } from '../../interface';
import { NavComponent, NavOptions, NavResult, TransitionDoneFn, TransitionInstruction } from '../../interface';
import { assert } from '../../utils/helpers';
import { AnimationOptions, ViewLifecycle, lifecycle, transition } from '../../utils/transition';
import { TransitionOptions, ViewLifecycle, lifecycle, transition } from '../../utils/transition';
import { ViewController, ViewState, convertToViews, matches } from './view-controller';
import iosTransitionAnimation from './animations/ios.transition';
import mdTransitionAnimation from './animations/md.transition';
@Component({
tag: 'ion-nav',
})
export class Nav implements NavOutlet {
private init = false;
private transInstr: TransitionInstruction[] = [];
private sbTrns?: Animation;
private useRouter = false;
@ -288,7 +283,6 @@ export class Nav implements NavOutlet {
this.fireError('nav controller was destroyed', ti);
return;
}
this.init = true;
if (ti.done) {
ti.done(
@ -557,30 +551,24 @@ export class Nav implements NavOutlet {
// or if it is a portal (modal, actionsheet, etc.)
const opts = ti.opts!;
const animationBuilder = this.getAnimationBuilder(opts);
const progressAnimation = opts.progressAnimation
? (animation: Animation) => this.sbTrns = animation
const progressCallback = opts.progressAnimation
? (animation: Animation) => { this.sbTrns = animation; }
: undefined;
const enteringEl = enteringView.element!;
const leavingEl = leavingView && leavingView.element!;
const animationOpts: AnimationOptions = {
animationCtrl: this.animationCtrl,
animationBuilder: animationBuilder,
animation: undefined,
direction: opts.direction as NavDirection,
duration: opts.duration,
easing: opts.easing,
viewIsReady: opts.viewIsReady,
const animationOpts: TransitionOptions = {
mode: this.mode,
animate: this.animated,
showGoBack: this.canGoBack(enteringView),
progressAnimation,
animationCtrl: this.animationCtrl,
progressCallback,
window: this.win,
baseEl: this.el,
enteringEl,
leavingEl
leavingEl,
...opts
};
const trns = await transition(animationOpts);
return this.transitionFinish(trns, enteringView, leavingView, opts);
@ -607,14 +595,6 @@ export class Nav implements NavOutlet {
};
}
private getAnimationBuilder(opts: NavOptions) {
if (opts.duration === 0 || opts.animate === false || !this.init || this.animated === false || this.views.length <= 1) {
return undefined;
}
const mode = opts.animation || this.config.get('pageTransition', this.mode);
return mode === 'ios' ? iosTransitionAnimation : mdTransitionAnimation;
}
private insertViewAt(view: ViewController, index: number) {
const views = this.views;
const existingIndex = views.indexOf(view);