fix(router-extensions): unable to go back with relativeTo param

Author: ADjenkov

Diff for: nativescript-angular/router/ns-location-strategy.ts

@@ -41,6 +41,10 @@ export class Outlet {
         return this.frames.indexOf(frame) > -1;
     }
 
+    isNSEmptyOutlet(): boolean {
+        return this.frames.length > 1;
+    }
+
     peekState(): LocationState {
         if (this.states.length > 0) {
             return this.states[this.states.length - 1];

Diff for: nativescript-angular/router/router-extensions.ts

@@ -93,22 +93,24 @@ export class RouterExtensions {
         const outletsToBack: Array<Outlet> = [];
         const rootRoute: ActivatedRoute = this.router.routerState.root;
         let outlets = options.outlets;
-        let relativeRoute = options.relativeTo;
+        let relativeRoute = options.relativeTo || rootRoute;
 
-        if (!outlets && relativeRoute) {
-            outlets = [relativeRoute.outlet];
-            relativeRoute = relativeRoute.parent || rootRoute;
-        } else if (!relativeRoute) {
-            relativeRoute = rootRoute;
+        const relativeRouteOutlet = this.findOutletByRoute(relativeRoute);
+        const isNSEmptyOutlet = relativeRouteOutlet && relativeRouteOutlet.isNSEmptyOutlet();
+
+        // Lazy named outlet has added 'primary' inner NSEmptyOutlet child.
+        // Take parent route when `relativeTo` option points to the outer named outlet.
+        if (isNSEmptyOutlet && relativeRoute.outlet !== "primary") {
+            relativeRoute = relativeRoute.parent || relativeRoute;
         }
 
-        for (let index = 0; index < relativeRoute.children.length; index++) {
-            const currentRoute = relativeRoute.children[index];
+        const routesToMatch = outlets ? relativeRoute.children : [relativeRoute];
+        outlets = outlets || [relativeRoute.outlet];
 
+        for (let index = 0; index < routesToMatch.length; index++) {
+            const currentRoute = routesToMatch[index];
             if (outlets.some(currentOutlet => currentOutlet === currentRoute.outlet)) {
-                const currentRouteSnapshop = findTopActivatedRouteNodeForOutlet(currentRoute.snapshot);
-                const outletKey = this.locationStrategy.getRouteFullPath(currentRouteSnapshop);
-                let outlet = this.locationStrategy.findOutletByKey(outletKey);
+                let outlet = this.findOutletByRoute(currentRoute);
 
                 if (outlet) {
                     outletsToBack.push(outlet);
@@ -118,4 +120,14 @@ export class RouterExtensions {
 
         return { outletsToBack: outletsToBack, outlets: outlets };
     }
+
+    private findOutletByRoute(currentRoute: ActivatedRoute): Outlet {
+        let outlet;
+
+        const currentRouteSnapshop = findTopActivatedRouteNodeForOutlet(currentRoute.snapshot);
+        const outletKey = this.locationStrategy.getRouteFullPath(currentRouteSnapshop);
+        outlet = this.locationStrategy.findOutletByKey(outletKey);
+
+        return outlet;
+    }
 }