Merge branch 'master' into sis0k0/remove-short-imports-resolution

Author: elena-p

CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="7.2.3"></a>
+## [7.2.3](https://github.com/NativeScript/nativescript-angular/compare/7.2.2...7.2.3) (2019-03-14)
+
+
+### Bug Fixes
+
+* **location-strategy:** crash on going back with router-outlet after closing modal ([#1748](https://github.com/NativeScript/nativescript-angular/issues/1748)) ([0ed7de6](https://github.com/NativeScript/nativescript-angular/commit/0ed7de6))
+
+
+
 <a name="7.2.2"></a>
 ## [7.2.2](https://github.com/NativeScript/nativescript-angular/compare/7.2.1...7.2.2) (2019-02-19)
 

nativescript-angular/platform-common.ts

@@ -33,6 +33,8 @@ import {
     on,
     launchEvent,
     LaunchEventData,
+    exitEvent,
+    ApplicationEventData,
 } from "tns-core-modules/application";
 import { TextView } from "tns-core-modules/ui/text-view";
 
@@ -255,7 +257,29 @@ export class NativeScriptPlatformRef extends PlatformRef {
                 args.root = rootContent;
             }
         );
+        const exitCallback = profile(
+            "nativescript-angular/platform-common.exitCallback", (args: ApplicationEventData) => {
+                const androidActivity = args.android;
+                if (androidActivity && !androidActivity.isFinishing()) {
+                    // Exit event was triggered as a part of a restart of the app.
+                    return;
+                }
+
+                const lastModuleRef = lastBootstrappedModule ? lastBootstrappedModule.get() : null;
+                if (lastModuleRef) {
+                    // Make sure the module is only destroyed once
+                    lastBootstrappedModule = null;
+
+                    lastModuleRef.destroy();
+                }
+
+                if (!autoCreateFrame) {
+                    rootContent = null;
+                }
+            }
+        );
         on(launchEvent, launchCallback);
+        on(exitEvent, exitCallback);
 
         applicationRun();
     }

nativescript-angular/router/ns-platform-location.ts

@@ -6,7 +6,7 @@ import { routerLog, isLogEnabled } from "../trace";
 @Injectable()
 export class NativescriptPlatformLocation extends PlatformLocation {
 
-    constructor(private locationStartegy: NSLocationStrategy) {
+    constructor(private locationStrategy: NSLocationStrategy) {
         super();
         if (isLogEnabled()) {
             routerLog("NativescriptPlatformLocation.constructor()");
@@ -18,7 +18,7 @@ export class NativescriptPlatformLocation extends PlatformLocation {
     }
 
     onPopState(fn: LocationChangeListener): void {
-        this.locationStartegy.onPopState(fn);
+        this.locationStrategy.onPopState(fn);
     }
 
     onHashChange(_fn: LocationChangeListener): void {
@@ -31,25 +31,25 @@ export class NativescriptPlatformLocation extends PlatformLocation {
         return "";
     }
     get pathname(): string {
-        return this.locationStartegy.path();
+        return this.locationStrategy.path();
     }
     set pathname(_newPath: string) {
         throw new Error("NativescriptPlatformLocation set pathname - not implemented");
     }
 
     pushState(state: any, title: string, url: string): void {
-        this.locationStartegy.pushState(state, title, url, null);
+        this.locationStrategy.pushState(state, title, url, null);
     }
 
     replaceState(state: any, title: string, url: string): void {
-        this.locationStartegy.replaceState(state, title, url, null);
+        this.locationStrategy.replaceState(state, title, url, null);
     }
 
     forward(): void {
         throw new Error("NativescriptPlatformLocation.forward() - not implemented");
     }
 
     back(): void {
-        this.locationStartegy.back();
+        this.locationStrategy.back();
     }
 }

nativescript-angular/router/page-router-outlet.ts

@@ -352,12 +352,19 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire
         // Add it to the new page
         page.content = componentView;
 
-        page.on(Page.navigatedFromEvent, (<any>global).Zone.current.wrap((args: NavigatedData) => {
+        const navigatedFromCallback = (<any>global).Zone.current.wrap((args: NavigatedData) => {
             if (args.isBackNavigation) {
                 this.locationStrategy._beginBackPageNavigation(this.frame);
                 this.locationStrategy.back(null, this.frame);
             }
-        }));
+        });
+        page.on(Page.navigatedFromEvent, navigatedFromCallback);
+        componentRef.onDestroy(() => {
+            if (page) {
+                page.off(Page.navigatedFromEvent, navigatedFromCallback);
+                page = null;
+            }
+        });
 
         const navOptions = this.locationStrategy._beginPageNavigation(this.frame);
 
@@ -367,14 +374,15 @@ export class PageRouterOutlet implements OnDestroy { // tslint:disable-line:dire
                 if (this.outlet) {
                     this.routeReuseStrategy.clearCache(this.outlet.outletKeys[0]);
                 }
-                page.off(Page.navigatedToEvent, clearCallback);
             });
 
-            page.on(Page.navigatedToEvent, clearCallback);
+            page.once(Page.navigatedToEvent, clearCallback);
         }
 
         this.frame.navigate({
-            create: () => { return page; },
+            create() {
+                return page;
+            },
             clearHistory: navOptions.clearHistory,
             animated: navOptions.animated,
             transition: navOptions.transition

nativescript-angular/router/router.module.ts

@@ -29,7 +29,7 @@ const NS_ROUTER_PROVIDERS = [
     },
     { provide: LocationStrategy, useExisting: NSLocationStrategy },
     NativescriptPlatformLocation,
-    { provide: PlatformLocation, useClass: NativescriptPlatformLocation },
+    { provide: PlatformLocation, useExisting: NativescriptPlatformLocation },
     RouterExtensions,
     NSRouteReuseStrategy,
     { provide: RouteReuseStrategy, useExisting: NSRouteReuseStrategy },