fix(ns-router-link): add relativeTo navigation extra only if

currentRoute is not empty

Author: sis0k0

nativescript-angular/router/ns-router-link.ts

@@ -34,85 +34,89 @@ import { isString } from "tns-core-modules/utils/types";
  */
 @Directive({ selector: "[nsRouterLink]" })
 export class NSRouterLink implements OnChanges { // tslint:disable-line:directive-class-suffix
-  private commands: any[] = [];
-  @Input() target: string;
-  @Input() queryParams: { [k: string]: any };
-  @Input() fragment: string;
+    private commands: any[] = [];
+    @Input() target: string;
+    @Input() queryParams: { [k: string]: any };
+    @Input() fragment: string;
 
-  @Input() clearHistory: boolean;
-  @Input() pageTransition: boolean | string | NavigationTransition = true;
+    @Input() clearHistory: boolean;
+    @Input() pageTransition: boolean | string | NavigationTransition = true;
 
-  urlTree: UrlTree;
+    urlTree: UrlTree;
 
-  private usePageRoute: boolean;
+    private usePageRoute: boolean;
 
-  private get currentRoute(): ActivatedRoute {
-    return this.usePageRoute ? this.pageRoute.activatedRoute.getValue() : this.route;
-  }
-
-  constructor(
-    private router: Router,
-    private navigator: RouterExtensions,
-    private route: ActivatedRoute,
-    @Optional() private pageRoute: PageRoute) {
-
-    this.usePageRoute = (this.pageRoute && this.route === this.pageRoute.activatedRoute.getValue());
-  }
-
-  @Input("nsRouterLink")
-  set params(data: any[] | string) {
-    if (Array.isArray(data)) {
-      this.commands = data;
-    } else {
-      this.commands = [data];
+    private get currentRoute(): ActivatedRoute {
+        return this.usePageRoute ? this.pageRoute.activatedRoute.getValue() : this.route;
     }
-  }
-
-
-  @HostListener("tap")
-  onTap() {
-    routerLog("nsRouterLink.tapped: " + this.commands + " usePageRoute: " +
-        this.usePageRoute + " clearHistory: " + this.clearHistory + " transition: " +
-        JSON.stringify(this.pageTransition));
-
-    const transition = this.getTransition();
-
-    let extras: NavigationExtras & NavigationOptions = {
-      relativeTo: this.currentRoute,
-      queryParams: this.queryParams,
-      fragment: this.fragment,
-      clearHistory: this.clearHistory,
-      animated: transition.animated,
-      transition: transition.transition
-    };
-
-    this.navigator.navigate(this.commands, extras);
-  }
-
-  private getTransition(): { animated: boolean, transition?: NavigationTransition } {
-    if (typeof this.pageTransition === "boolean") {
-      return { animated: <boolean>this.pageTransition };
-    } else if (isString(this.pageTransition)) {
-      if (this.pageTransition === "none" || this.pageTransition === "false") {
-        return { animated: false };
-      } else {
-        return { animated: true, transition: { name: <string>this.pageTransition } };
-      }
-    } else {
-      return {
-        animated: true,
-        transition: this.pageTransition
-      };
-    }
-  }
-
-  ngOnChanges(_: {}): any {
-    this.updateUrlTree();
-  }
 
-  private updateUrlTree(): void {
-    this.urlTree = this.router.createUrlTree(
-      this.commands,
-      { relativeTo: this.currentRoute, queryParams: this.queryParams, fragment: this.fragment });
-  }
+    constructor(
+        private router: Router,
+        private navigator: RouterExtensions,
+        private route: ActivatedRoute,
+        @Optional() private pageRoute: PageRoute) {
+
+            this.usePageRoute = (this.pageRoute && this.route === this.pageRoute.activatedRoute.getValue());
+        }
+
+        @Input("nsRouterLink")
+        set params(data: any[] | string) {
+            if (Array.isArray(data)) {
+                this.commands = data;
+            } else {
+                this.commands = [data];
+            }
+        }
+
+
+        @HostListener("tap")
+        onTap() {
+            routerLog("nsRouterLink.tapped: " + this.commands + " usePageRoute: " +
+                      this.usePageRoute + " clearHistory: " + this.clearHistory + " transition: " +
+                      JSON.stringify(this.pageTransition));
+
+            const extras = this.getExtras();
+            this.navigator.navigate(this.commands, extras);
+        }
+
+        private getExtras() {
+            const transition = this.getTransition();
+            const extras: NavigationExtras & NavigationOptions = {
+                queryParams: this.queryParams,
+                fragment: this.fragment,
+                clearHistory: this.clearHistory,
+                animated: transition.animated,
+                transition: transition.transition,
+            };
+
+            return (<any>Object).assign(extras,
+                this.currentRoute.toString() !== "Route(url:'', path:'')" && this.currentRoute);
+        }
+
+        private getTransition(): { animated: boolean, transition?: NavigationTransition } {
+            if (typeof this.pageTransition === "boolean") {
+                return { animated: <boolean>this.pageTransition };
+            } else if (isString(this.pageTransition)) {
+                if (this.pageTransition === "none" || this.pageTransition === "false") {
+                    return { animated: false };
+                } else {
+                    return { animated: true, transition: { name: <string>this.pageTransition } };
+                }
+            } else {
+                return {
+                    animated: true,
+                    transition: this.pageTransition
+                };
+            }
+        }
+
+        ngOnChanges(_: {}): any {
+            this.updateUrlTree();
+        }
+
+        private updateUrlTree(): void {
+            this.urlTree = this.router.createUrlTree(
+                this.commands,
+                { relativeTo: this.currentRoute, queryParams: this.queryParams, fragment: this.fragment });
+        }
 }

tests/e2e-tests/lazy-load-routing.js

@@ -61,6 +61,6 @@ describe("lazy load routing", function () {
                 .should.eventually.exist
                 .text().should.eventually.equal("Second: lazy-load")
             .elementByAccessibilityId("router-location-strategy-states-lazy-load")
-            .text().should.eventually.equal("/first/lazy-load,/second/lazy-load")
+            .text().should.eventually.equal("/second/lazy-load")
     });
 });