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

feat(nav): animation is customizable

Browse Source 
fixes #15851
This commit is contained in:
Manu Mtz.-Almeida
2018-10-04 18:05:49 +02:00
parent dc976cc745
commit 24f33730a0
5 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
import { Build, Component, Element, Event, EventEmitter, Method, Prop, QueueApi, Watch } from '@stencil/core';
import { ViewLifecycle } from '../..';
import { Animation, ComponentProps, Config, FrameworkDelegate, Gesture, GestureDetail, Mode, NavComponent, NavOptions, NavOutlet, NavResult, RouteID, RouteWrite, TransitionDoneFn, TransitionInstruction, ViewController } from '../../interface';
import { Animation, AnimationBuilder, ComponentProps, Config, FrameworkDelegate, Gesture, GestureDetail, Mode, NavComponent, NavOptions, NavOutlet, NavResult, RouteID, RouteWrite, TransitionDoneFn, TransitionInstruction, ViewController } from '../../interface';
import { assert } from '../../utils/helpers';
import { TransitionOptions, lifecycle, setPageHidden, transition } from '../../utils/transition';
@ -27,11 +27,8 @@ export class Nav implements NavOutlet {
@Element() el!: HTMLElement;
@Prop({ context: 'queue' }) queue!: QueueApi;
@Prop({ context: 'config' }) config!: Config;
@Prop({ context: 'window' }) win!: Window;
@Prop({ connect: 'ion-animation-controller' }) animationCtrl!: HTMLIonAnimationControllerElement;
/**
@ -49,6 +46,7 @@ export class Nav implements NavOutlet {
* If the nav should animate the components or not
*/
@Prop() animated = true;
@Prop() animation?: AnimationBuilder;
/** @hidden */
@Prop() delegate?: FrameworkDelegate;
@ -795,6 +793,7 @@ export class Nav implements NavOutlet {
queue: this.queue,
window: this.win,
baseEl: this.el,
animationBuilder: this.animation || opts.animationBuilder || this.config.get('navAnimation'),
progressCallback,
animated,