From 6b5ad0123c23c404d3e84f64cf15f4e58f9f9130 Mon Sep 17 00:00:00 2001 From: sis0k0 Date: Wed, 29 Mar 2017 15:29:23 +0300 Subject: [PATCH] fix(ns-router-link): navigate with urlTree closes #724 --- nativescript-angular/router/ns-router-link.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nativescript-angular/router/ns-router-link.ts b/nativescript-angular/router/ns-router-link.ts index 140b1da0f..5b090783f 100644 --- a/nativescript-angular/router/ns-router-link.ts +++ b/nativescript-angular/router/ns-router-link.ts @@ -76,21 +76,19 @@ export class NSRouterLink implements OnChanges { // tslint:disable-line:directiv JSON.stringify(this.pageTransition)); const extras = this.getExtras(); - this.navigator.navigate(this.commands, extras); + this.navigator.navigateByUrl(this.urlTree, extras); } - private getExtras() { + private getExtras(): NavigationExtras & NavigationOptions { const transition = this.getTransition(); - const extras: NavigationExtras & NavigationOptions = { + return { queryParams: this.queryParams, fragment: this.fragment, clearHistory: this.clearHistory, animated: transition.animated, transition: transition.transition, + relativeTo: this.currentRoute, }; - - return (Object).assign(extras, - this.currentRoute.toString() !== "Route(url:'', path:'')" && this.currentRoute); } private getTransition(): { animated: boolean, transition?: NavigationTransition } {