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

fix(angular): ion-nav no routing

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-20 18:52:12 +01:00
parent f39d3ad9dd
commit 9094c66f3d
13 changed files with 318 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
angular/src/navigation/ion-nav.ts
View File

@ -1,7 +1,6 @@
import { ComponentFactoryResolver, Directive, ElementRef, Injector} from '@angular/core';
import { NavigationEnd, NavigationStart, Router } from '@angular/router';
import { FrameworkDelegate, NavOptions, NavParams, TransitionDoneFn, ViewController } from '@ionic/core';
import { NavOptions, NavParams, TransitionDoneFn, ViewController } from '@ionic/core';
import { proxyEl } from '../util/util';
import { AngularDelegate } from '..';
@ -11,50 +10,37 @@ import { AngularDelegate } from '..';
})
export class IonNav {
private delegate: FrameworkDelegate;
constructor(
private ref: ElementRef,
router: Router,
cfr: ComponentFactoryResolver,
injector: Injector,
angularDelegate: AngularDelegate,
) {
this.delegate = angularDelegate.create(cfr, injector);
console.log('ion-nav');
router.events.subscribe(ev => {
if (ev instanceof NavigationStart) {
console.log('NavigationStart', ev.url);
} else if (ev instanceof NavigationEnd) {
console.log('NavigationEnd', ev.url);
}
});
this.ref.nativeElement.delegate = angularDelegate.create(cfr, injector);
}
push(page: any, params?: NavParams, opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'push', page, params, this.wrap(opts), done);
return proxyEl(this.ref, 'push', page, params, opts, done);
}
insert(insertIndex: number, page: any, params?: NavParams, opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'insert', insertIndex, page, params, this.wrap(opts), done);
return proxyEl(this.ref, 'insert', insertIndex, page, params, opts, done);
}
insertPages(insertIndex: number, insertPages: any[], opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'insertPages', insertIndex, insertPages, this.wrap(opts), done);
return proxyEl(this.ref, 'insertPages', insertIndex, insertPages, opts, done);
}
pop(opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'pop', this.wrap(opts), done);
return proxyEl(this.ref, 'pop', opts, done);
}
popTo(indexOrViewCtrl: any, opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'popTo', indexOrViewCtrl, this.wrap(opts), done);
return proxyEl(this.ref, 'popTo', indexOrViewCtrl, opts, done);
}
popToRoot(opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'popToRoot', this.wrap(opts), done);
return proxyEl(this.ref, 'popToRoot', opts, done);
}
popAll(): Promise<boolean[]> {
@ -62,19 +48,19 @@ export class IonNav {
}
removeIndex(startIndex: number, removeCount = 1, opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'removeIndex', startIndex, removeCount, this.wrap(opts), done);
return proxyEl(this.ref, 'removeIndex', startIndex, removeCount, opts, done);
}
removeView(viewController: ViewController, opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'removeView', viewController, this.wrap(opts), done);
return proxyEl(this.ref, 'removeView', viewController, opts, done);
}
setRoot(pageOrViewCtrl: any, params?: any, opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'setRoot', pageOrViewCtrl, params, this.wrap(opts), done);
return proxyEl(this.ref, 'setRoot', pageOrViewCtrl, params, opts, done);
}
setPages(pages: any[], opts?: NavOptions, done?: TransitionDoneFn): Promise<boolean> {
return proxyEl(this.ref, 'setPages', pages, this.wrap(opts), done);
return proxyEl(this.ref, 'setPages', pages, opts, done);
}
getAllChildNavs(): any[] {
@ -114,12 +100,4 @@ export class IonNav {
length() {
return proxyEl(this.ref, 'length');
}
private wrap(opts?: NavOptions): NavOptions {
return {
...this.wrap(opts),
delegate: this.delegate
};
}
}

6
angular/src/providers/angular-delegate.ts
View File

@ -53,9 +53,9 @@ export class AngularFrameworkDelegate implements FrameworkDelegate {
}
removeViewFromDom(_container: any, component: any): Promise<void> {
const mountingData = this.elRefMap.get(component);
if (mountingData) {
mountingData.componentRef.destroy();
const componentRef = this.elRefMap.get(component);
if (componentRef) {
componentRef.destroy();
this.elRefMap.delete(component);
}
return Promise.resolve();