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

fix(angular): respect animation property for ion-router-outlet (#20767)

Browse Source 
fixes #20764
This commit is contained in:
Liam DeBeasi
2020-03-12 15:26:24 -04:00
committed by Liam DeBeasi
parent 2ece194a08
commit f2dbe1ff3b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
angular/src/directives/navigation/ion-router-outlet.ts
View File

@ -4,6 +4,7 @@ import { ActivatedRoute, ChildrenOutletContexts, OutletContext, PRIMARY_OUTLET,
import { BehaviorSubject, Observable } from 'rxjs'; import { BehaviorSubject, Observable } from 'rxjs';
import { distinctUntilChanged, filter, switchMap } from 'rxjs/operators'; import { distinctUntilChanged, filter, switchMap } from 'rxjs/operators';
import { AnimationBuilder } from '../../';
import { Config } from '../../providers/config'; import { Config } from '../../providers/config';
import { NavController } from '../../providers/nav-controller'; import { NavController } from '../../providers/nav-controller';
@ -13,7 +14,7 @@ import { RouteView, getUrl } from './stack-utils';
@Directive({ @Directive({
selector: 'ion-router-outlet', selector: 'ion-router-outlet',
exportAs: 'outlet', exportAs: 'outlet',
inputs: ['animated', 'swipeGesture'] inputs: ['animated', 'animation', 'swipeGesture']
}) })
export class IonRouterOutlet implements OnDestroy, OnInit { export class IonRouterOutlet implements OnDestroy, OnInit {
nativeEl: HTMLIonRouterOutletElement; nativeEl: HTMLIonRouterOutletElement;
@ -38,6 +39,10 @@ export class IonRouterOutlet implements OnDestroy, OnInit {
@Output('activate') activateEvents = new EventEmitter<any>(); @Output('activate') activateEvents = new EventEmitter<any>();
@Output('deactivate') deactivateEvents = new EventEmitter<any>(); @Output('deactivate') deactivateEvents = new EventEmitter<any>();
set animation(animation: AnimationBuilder) {
this.nativeEl.animation = animation;
}
set animated(animated: boolean) { set animated(animated: boolean) {
this.nativeEl.animated = animated; this.nativeEl.animated = animated;
} }