chore(location-strategy): address PR review issues and comments

Author: ADjenkov

Diff for: nativescript-angular/platform-providers.ts

@@ -73,18 +73,18 @@ export class FrameService {
     // which could be the wrong topmost frame (modal with nested frame e.g.):
     // TabViewItem -> Frame -> Modal -> Frame2 -> Frame2-Navigation
     getFrame(): Frame {
-        let tompostFrame = topmost();
-        const { cachedFrame, cachedFrameRootOutlet } = this.findFrame(tompostFrame);
+        let topmostFrame = topmost();
+        const { cachedFrame, cachedFrameRootOutlet } = this.findFrame(topmostFrame);
 
         if (cachedFrame && cachedFrameRootOutlet) {
             const latestFrameByOutlet = this.getLatestFrameByOutlet(cachedFrameRootOutlet);
 
             if (latestFrameByOutlet && latestFrameByOutlet !== cachedFrame) {
-                tompostFrame = latestFrameByOutlet;
+                topmostFrame = latestFrameByOutlet;
             }
         }
 
-        return tompostFrame;
+        return topmostFrame;
     }
 
     addFrame(frame: Frame, name: string, rootOutlet: string) {
@@ -98,7 +98,7 @@ export class FrameService {
     findFrame(frame: Frame, name?: string) {
         let cachedFrame;
         let cachedFrameRootOutlet;
-        let hasDuplicateOutlet = false;
+        let hasDuplicateOutletName = false;
 
         for (let i = 0; i < this.frames.length; i++) {
             const currentFrame = this.frames[i];
@@ -109,11 +109,11 @@ export class FrameService {
             }
 
             if (name && currentFrame.name === name) {
-                hasDuplicateOutlet = true;
+                hasDuplicateOutletName = true;
             }
         }
 
-        return { cachedFrame, cachedFrameRootOutlet, hasDuplicateOutlet };
+        return { cachedFrame, cachedFrameRootOutlet, hasDuplicateOutletName };
     }
 
     // Return the latest navigated frame from the given outlet branch.

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

@@ -292,11 +292,11 @@ export class NSLocationStrategy extends LocationStrategy {
         }
         this._isPageNavigationBack = true;
 
-        let { cachedFrame, hasDuplicateOutlet } = this.frameService.findFrame(frame, name);
+        let { cachedFrame, hasDuplicateOutletName } = this.frameService.findFrame(frame, name);
 
         if (cachedFrame) {
             this.currentOutlet = cachedFrame.rootOutlet;
-        } else if (!hasDuplicateOutlet) {
+        } else if (!hasDuplicateOutletName) {
             this.currentOutlet = name;
         }
     }
@@ -348,12 +348,12 @@ export class NSLocationStrategy extends LocationStrategy {
     public _beginPageNavigation(name: string, frame: Frame): NavigationOptions {
         routerLog("NSLocationStrategy._beginPageNavigation()");
 
-        let { cachedFrame, hasDuplicateOutlet } = this.frameService.findFrame(frame, name);
+        let { cachedFrame, hasDuplicateOutletName } = this.frameService.findFrame(frame, name);
 
         if (cachedFrame) {
             this.currentOutlet = cachedFrame.rootOutlet;
         } else {
-            if (!hasDuplicateOutlet) {
+            if (!hasDuplicateOutletName && this.statesByOutlet[name]) {
                 this.currentOutlet = name;
             }