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

feature(angular): nav-params integrate with router

Browse Source
This commit is contained in:
Dan Bucholtz
2018-02-13 15:05:12 -06:00
parent f4d1c6f561
commit 8c8b8548e7
5 changed files with 57 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
packages/angular/src/router/outlet.ts
View File

@ -125,7 +125,9 @@ export class RouterOutlet implements OnDestroy, OnInit, RouterDelegate {
const isTopLevel = !hasChildComponent(activatedRoute);
return this.routeEventHandler.externalNavStart().then(() => {
return activateRoute(this.elementRef.nativeElement, component, cfr, injector, isTopLevel).then(() => {
return getDataFromRoute(activatedRoute);
}).then((dataObj: any) => {
return activateRoute(this.elementRef.nativeElement, component, dataObj, cfr, injector, isTopLevel).then(() => {
this.changeDetector.markForCheck();
this.activateEvents.emit(null);
this.activationStatus = ACTIVATED;
@ -135,11 +137,11 @@ export class RouterOutlet implements OnDestroy, OnInit, RouterDelegate {
}
export function activateRoute(navElement: HTMLIonNavElement,
component: Type<any>, cfr: ComponentFactoryResolver, injector: Injector, isTopLevel: boolean): Promise<void> {
component: Type<any>, data: any = {}, cfr: ComponentFactoryResolver, injector: Injector, isTopLevel: boolean): Promise<void> {
return ensureExternalRounterController().then((externalRouterController) => {
const escapeHatch = getEscapeHatch(cfr, injector);
return externalRouterController.reconcileNav(navElement, component, escapeHatch, isTopLevel);
return externalRouterController.reconcileNav(navElement, component, data, escapeHatch, isTopLevel);
});
}
@ -165,3 +167,32 @@ export function getEscapeHatch(cfr: ComponentFactoryResolver, injector: Injector
url: location.pathname
};
}
export function getDataFromRoute(activatedRoute: ActivatedRoute): Promise<any> {
const promises: Promise<any>[] = [];
promises.push(getDataFromObservable(activatedRoute));
promises.push(getDataFromParams(activatedRoute));
return Promise.all(promises).then(([data, params]: any[]) => {
let combined = {};
Object.assign(combined, data, params);
return combined;
});
}
export function getDataFromObservable(activatedRoute: ActivatedRoute) {
return new Promise((resolve) => {
activatedRoute.data.subscribe((data: any) => {
resolve(data || {});
});
});
}
export function getDataFromParams(activatedRoute: ActivatedRoute) {
return new Promise((resolve) => {
activatedRoute.params.subscribe((data: any) => {
console.log('data: ', data);
resolve(data || {});
});
});
}