Merge branch 'djenkov/location-strategy' of github.com:NativeScript/nativescript-angular into djenkov/location-strategy

Author: ADjenkov

Diff for: .github/ISSUE_TEMPLATE.md

@@ -1,7 +1,26 @@
-PSST! Want to get faster responses to bug reports and important issues? Help us keep the issue tracker organized by:
+### Make sure to check the existing issues in this repository 
 
-- Reporting bugs. Please include all details about the problem and provide a sample app (consider using the [playground](https://play.nativescript.org) for this.
-- Proposing features and enhancements.
-- Discussing implementation details.
+### If there is no issue for your problem, tell us about it
+Please, ensure your title is less than 63 characters long and starts with a capital
+letter.
 
-Please move all other content to the [forums](https://discourse.nativescript.org/).
+### Which platform(s) does your issue occur on?
+- iOS/Android/Both 
+- iOS/Android versions 
+- emulator or device. What type of device?
+
+### Please, provide the following version numbers that your issue occurs with:
+
+- CLI: (run `tns --version` to fetch it)
+- Cross-platform modules: (check the 'version' attribute in the
+`node_modules/tns-core-modules/package.json` file in your project)
+- Runtime(s): (look for the `"tns-android"` and `"tns-ios"` properties in the `package.json` file of your project)
+- Plugin(s): (look for the version numbers in the `package.json` file of your
+project and paste your dependencies and devDependencies here)
+
+### Please, tell us how to recreate the issue in as much detail as possible. 
+Describe the steps to reproduce it.
+
+### Is there any code involved? 
+ - provide a code example to recreate the problem 
+ - (EVEN BETTER) consider using the [playground](https://play.nativescript.org) to provide an application where the problem is reproducible. If this is not possible, provide a .zip with application or refer to a repository with application where the problem is reproducible.

Diff for: e2e/modal-navigation-ng/app/app.css

@@ -10,3 +10,6 @@ of writing your own CSS rules. For a full list of class names in the theme
 refer to http://docs.nativescript.org/ui/theme.
 */
 @import '~nativescript-theme-core/css/core.light.css';
+Button {
+    font-size: 10px;
+}

Diff for: e2e/modal-navigation-ng/app/home/home.component.html

@@ -1,8 +1,8 @@
 <ActionBar class="action-bar">
-    <Label class="action-bar-title" text="Home"></Label>
+    <Label class="action-bar-title" text="Home Component"></Label>
 </ActionBar>
 
-<StackLayout>
+<WrapLayout>
     <Button text="Show Modal Without Frame" (tap)="onModalNoFrame()"></Button>
     <Button text="Show Modal Page With Frame" (tap)="onModalFrame()"></Button>
     <Button text="Navigate To Second Page" (tap)="onNavigateSecond()"></Button>
@@ -14,5 +14,4 @@
 
     <Button text="show shared modal" (tap)="onRootModalTap()"></Button>
     <Button text="go to second (to open shared modal)" [nsRouterLink]="['/modal-shared-second-host']"></Button>
-    <Label text="home component" verticalAlignment="bottom"></Label>
-</StackLayout>  
+</WrapLayout>  

Diff for: e2e/modal-navigation-ng/app/layout.component.html

@@ -1,10 +1,10 @@
-<StackLayout>
-    <Label text="Home" horizontalAlignment="center"></Label>
+<WrapLayout>
+    <Label text="Home Component" horizontalAlignment="center"></Label>
     <Button text="Show Modal Without Frame" (tap)="onModalNoFrame()"></Button>
     <Button text="Show Modal Page With Frame" (tap)="onModalFrame()"></Button>
     <Button text="Reset Named Frame Root View" (tap)="onNamedFrameRootViewReset()"></Button>
     <Button text="Reset Frame Root View" (tap)="onFrameRootViewReset()"></Button>
     <Button text="Reset Tab Root View" (tap)="onTabRootViewReset()"></Button>
     <Button text="Reset Layout Root View" (tap)="onLayoutRootViewReset()"></Button>
     <Button text="Show Dialog" (tap)="onShowDialog()"></Button>
-</StackLayout>
+</WrapLayout>

Diff for: e2e/modal-navigation-ng/e2e/modal.shared.e2e-spec.ts

@@ -1,6 +1,8 @@
 import { AppiumDriver, createDriver, SearchOptions } from "nativescript-dev-appium";
 import { assert } from "chai";
 
+const homeComponent = "Home Component";
+
 describe("Shared modal from home and back", () => {
     let driver: AppiumDriver;
 
@@ -22,7 +24,7 @@ describe("Shared modal from home and back", () => {
     });
 
     it ("should find home component", async () => {
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 
     it("should open/close shared modal from home component", async () => {
@@ -31,7 +33,7 @@ describe("Shared modal from home and back", () => {
     });
 
     it ("should find home component again", async () => {
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 });
 
@@ -56,7 +58,7 @@ describe("Shared modal from second and back", () => {
     });
 
     it ("should find home component", async () => {
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 
     it ("should navigate to second component", async() => {
@@ -98,7 +100,7 @@ describe("Shared modal from different components", () => {
     });
 
     it ("should find home component", async () => {
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 
     it("should open/close shared modal from home component", async () => {
@@ -107,7 +109,7 @@ describe("Shared modal from different components", () => {
     });
 
     it ("should find home component again", async () => {
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 
     it ("should navigate to second component", async() => {
@@ -129,7 +131,7 @@ describe("Shared modal from different components", () => {
 
     it ("should navigate back to home component", async () => {
         await goBack(driver);
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 
     it("should open/close shared modal from home component after manipulations with second", async () => {
@@ -138,7 +140,7 @@ describe("Shared modal from different components", () => {
     });
 
     it ("should find home component again", async () => {
-        await assertComponent(driver, "home component");
+        await assertComponent(driver, homeComponent);
     });
 });
 

Diff for: e2e/modal-navigation-ng/e2e/screen.ts

@@ -1,7 +1,7 @@
 import { AppiumDriver } from "nativescript-dev-appium";
 import { assert } from "chai";
 
-const home = "Home"
+const home = "Home Component"
 const first = "First"
 const modal = "Modal";
 const modalFirst = "Modal First";

Diff for: nativescript-angular/directives/dialogs.ts

@@ -78,19 +78,25 @@ export class ModalDialogService {
 
         this.location._beginModalNavigation(frame);
 
-        return new Promise(resolve => {
-            setTimeout(() => this._showDialog({
-                containerRef: viewContainerRef,
-                context,
-                doneCallback: resolve,
-                fullscreen,
-                animated,
-                stretched,
-                pageFactory,
-                parentView,
-                resolver,
-                type,
-            }), 10);
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                try {
+                    this._showDialog({
+                        containerRef: viewContainerRef,
+                        context,
+                        doneCallback: resolve,
+                        fullscreen,
+                        animated,
+                        stretched,
+                        pageFactory,
+                        parentView,
+                        resolver,
+                        type,
+                    });
+                } catch (err) {
+                    reject(err);
+                }
+            }, 10);
         });
     }
 

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

@@ -77,10 +77,10 @@ export class FrameService {
         const { cachedFrame, cachedFrameRootOutlet } = this.findFrame(topmostFrame);
 
         if (cachedFrame && cachedFrameRootOutlet) {
-            const latestFrameByOutlet = this.getLatestFrameByOutlet(cachedFrameRootOutlet);
+            const topmostFrameByOutlet = this.getTopmostFrameByOutlet(cachedFrameRootOutlet);
 
-            if (latestFrameByOutlet && latestFrameByOutlet !== cachedFrame) {
-                topmostFrame = latestFrameByOutlet;
+            if (topmostFrameByOutlet && topmostFrameByOutlet !== cachedFrame) {
+                topmostFrame = topmostFrameByOutlet;
             }
         }
 
@@ -95,29 +95,40 @@ export class FrameService {
         this.frames = this.frames.filter(currentFrame => currentFrame.frame !== frame);
     }
 
-    findFrame(frame: Frame, name?: string) {
+    containsOutlet(name: string) {
+        let nameFound = false;
+
+        for (let i = 0; i < this.frames.length; i++) {
+            const currentFrame = this.frames[i];
+
+            if (name && currentFrame.name === name) {
+                nameFound = true;
+                break;
+            }
+        }
+
+        return nameFound;
+    }
+
+    findFrame(frame: Frame) {
         let cachedFrame;
         let cachedFrameRootOutlet;
-        let hasDuplicateOutletName = false;
 
         for (let i = 0; i < this.frames.length; i++) {
             const currentFrame = this.frames[i];
 
             if (currentFrame.frame === frame) {
                 cachedFrame = currentFrame;
                 cachedFrameRootOutlet = currentFrame.rootOutlet;
-            }
-
-            if (name && currentFrame.name === name) {
-                hasDuplicateOutletName = true;
+                break;
             }
         }
 
-        return { cachedFrame, cachedFrameRootOutlet, hasDuplicateOutletName };
+        return { cachedFrame, cachedFrameRootOutlet };
     }
 
     // Return the latest navigated frame from the given outlet branch.
-    private getLatestFrameByOutlet(rootOutlet: string): Frame {
+    private getTopmostFrameByOutlet(rootOutlet: string): Frame {
         let frame: Frame;
 
         for (let i = this.frames.length - 1; i > 0; i--) {

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

@@ -292,11 +292,11 @@ export class NSLocationStrategy extends LocationStrategy {
         }
         this._isPageNavigationBack = true;
 
-        let { cachedFrame, hasDuplicateOutletName } = this.frameService.findFrame(frame, name);
+        let { cachedFrame } = this.frameService.findFrame(frame);
 
         if (cachedFrame) {
             this.currentOutlet = cachedFrame.rootOutlet;
-        } else if (!hasDuplicateOutletName) {
+        } else if (!this.frameService.containsOutlet(name)) {
             this.currentOutlet = name;
         }
     }
@@ -348,12 +348,13 @@ export class NSLocationStrategy extends LocationStrategy {
     public _beginPageNavigation(name: string, frame: Frame): NavigationOptions {
         routerLog("NSLocationStrategy._beginPageNavigation()");
 
-        let { cachedFrame, hasDuplicateOutletName } = this.frameService.findFrame(frame, name);
+        let { cachedFrame } = this.frameService.findFrame(frame);
 
         if (cachedFrame) {
             this.currentOutlet = cachedFrame.rootOutlet;
         } else {
-            if (!hasDuplicateOutletName && this.statesByOutlet[name]) {
+            // Changing the current outlet only if navigating in non-cached root outlet.
+            if (!this.frameService.containsOutlet(name) && this.statesByOutlet[name] /* ensure root outlet exists */) {
                 this.currentOutlet = name;
             }