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

fix(router): ion-nav

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-27 12:05:22 +02:00
parent 00fc460c4e
commit 113af9e53b
5 changed files with 90 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/utils/transition.ts
View File

@@ -27,9 +27,9 @@ export async function transition(opts: AnimationOptions): Promise<Animation|void
return transition;
}
async function notifyViewReady(viewIsReady: undefined | (() => Promise<any>)) {
async function notifyViewReady(viewIsReady: undefined | ((enteringEl: HTMLElement) => Promise<any>), enteringEl: HTMLElement) {
if (viewIsReady) {
await viewIsReady();
await viewIsReady(enteringEl);
}
}
@@ -51,7 +51,7 @@ async function waitDeepReady(opts: AnimationOptions) {
deepReady(opts.enteringEl),
deepReady(opts.leavingEl)
]);
await notifyViewReady(opts.viewIsReady);
await notifyViewReady(opts.viewIsReady, opts.enteringEl);
}
async function waitShallowReady(opts: AnimationOptions) {
@@ -59,7 +59,7 @@ async function waitShallowReady(opts: AnimationOptions) {
shallowReady(opts.enteringEl),
shallowReady(opts.leavingEl)
]);
await notifyViewReady(opts.viewIsReady);
await notifyViewReady(opts.viewIsReady, opts.enteringEl);
}
function showPages(enteringEl: HTMLElement, leavingEl: HTMLElement) {
@@ -177,7 +177,7 @@ export interface AnimationOptions {
direction?: NavDirection;
duration?: number;
easing?: string;
viewIsReady?: () => Promise<any>;
viewIsReady?: (enteringEl: HTMLElement) => Promise<any>;
showGoBack?: boolean;
progressAnimation?: Function;
enteringEl: HTMLElement;