fix: router outlet back navigation resilience (#79)

Author: NathanWalker

apps/nativescript-demo-ng/App_Resources/Android/app.gradle

@@ -10,7 +10,7 @@ android {
     minSdkVersion 17
     targetSdkVersion 29
     generatedDensities = []
-    applicationId = "__PACKAGE__"
+    applicationId = "org.nativescript.demong"
     manifestPlaceholders = [isUnitTesting:"${unitTesting}"]
   }  
   aaptOptions {  

apps/nativescript-demo-ng/package.json

@@ -11,8 +11,8 @@
     "@nativescript-community/ui-material-bottom-navigation": "^7.0.0"
   },
   "devDependencies": {
-    "@nativescript/android": "~8.2.0",
-    "@nativescript/ios": "~8.2.0",
+    "@nativescript/android": "~8.3.0",
+    "@nativescript/ios": "~8.3.0",
     "@nativescript/unit-test-runner": "^3.0.1"
   }
 }

apps/nativescript-demo-ng/project.json

@@ -76,7 +76,9 @@
         "coverage": false
       },
       "configurations": {
-        "android": {},
+        "android": {
+          "platform": "android"
+        },
         "ios": {}
       }
     }

package.json

@@ -35,39 +35,39 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
   },
   "dependencies": {
-    "@angular/animations": "14.0.4",
-    "@angular/common": "14.0.4",
-    "@angular/compiler": "14.0.4",
-    "@angular/core": "14.0.4",
-    "@angular/forms": "14.0.4",
-    "@angular/platform-browser": "14.0.4",
-    "@angular/platform-browser-dynamic": "14.0.4",
-    "@angular/router": "14.0.4",
-    "@nativescript/core": "~8.2.0",
+    "@angular/animations": "14.1.1",
+    "@angular/common": "14.1.1",
+    "@angular/compiler": "14.1.1",
+    "@angular/core": "14.1.1",
+    "@angular/forms": "14.1.1",
+    "@angular/platform-browser": "14.1.1",
+    "@angular/platform-browser-dynamic": "14.1.1",
+    "@angular/router": "14.1.1",
+    "@nativescript/core": "~8.3.0",
     "@nativescript/theme": "~3.0.0",
     "@ngx-translate/core": "~14.0.0",
     "nativescript-ngx-fonticon": "~7.0.0",
     "rxjs": "^7.5.0",
     "zone.js": "~0.11.5"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "14.0.4",
-    "@angular-eslint/eslint-plugin": "14.0.0",
-    "@angular-eslint/eslint-plugin-template": "14.0.0",
-    "@angular-eslint/template-parser": "14.0.0",
-    "@angular/compiler-cli": "14.0.4",
+    "@angular-devkit/build-angular": "14.1.1",
+    "@angular-eslint/eslint-plugin": "14.0.2",
+    "@angular-eslint/eslint-plugin-template": "14.0.2",
+    "@angular-eslint/template-parser": "14.0.2",
+    "@angular/compiler-cli": "14.1.1",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@nativescript/types": "~8.2.0",
+    "@nativescript/types": "~8.3.0",
     "@nativescript/unit-test-runner": "^3.0.2",
     "@nativescript/webpack": "~5.0.0",
-    "@ngtools/webpack": "14.0.4",
-    "@nrwl/angular": "14.4.0",
-    "@nrwl/cli": "14.4.0",
-    "@nrwl/eslint-plugin-nx": "14.4.0",
-    "@nrwl/jest": "14.4.0",
-    "@nrwl/js": "14.4.0",
-    "@nrwl/node": "14.4.0",
-    "@nrwl/workspace": "14.4.0",
+    "@ngtools/webpack": "14.1.1",
+    "@nrwl/angular": "14.5.4",
+    "@nrwl/cli": "14.5.4",
+    "@nrwl/eslint-plugin-nx": "14.5.4",
+    "@nrwl/jest": "14.5.4",
+    "@nrwl/js": "14.5.4",
+    "@nrwl/node": "14.5.4",
+    "@nrwl/workspace": "14.5.4",
     "@nstudio/angular": "14.3.0",
     "@nstudio/nativescript": "14.3.0",
     "@nstudio/nativescript-angular": "14.3.0",
@@ -85,15 +85,15 @@
     "fs-extra": "^9.0.1",
     "husky": "~8.0.1",
     "jest": "27.5.1",
-    "karma": "6.3.20",
+    "karma": "6.4.0",
     "karma-coverage": "2.0.3",
-    "karma-jasmine": "5.0.1",
+    "karma-jasmine": "5.1.0",
     "karma-mocha-reporter": "^2.2.5",
     "karma-nativescript-launcher": "0.4.0",
     "karma-sinon": "^1.0.5",
     "lint-staged": "^13.0.0",
-    "ng-packagr": "14.0.2",
-    "nx": "14.4.0",
+    "ng-packagr": "14.1.0",
+    "nx": "14.5.4",
     "nyc": "15.1.0",
     "postcss": "^8.3.9",
     "postcss-import": "14.1.0",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/angular",
-  "version": "14.0.3",
+  "version": "14.0.4-alpha.0",
   "homepage": "https://nativescript.org/",
   "repository": {
     "type": "git",

packages/angular/src/lib/legacy/router/ns-route-reuse-strategy.ts

@@ -99,10 +99,14 @@ export class NSRouteReuseStrategy implements RouteReuseStrategy {
   shouldDetach(route: ActivatedRouteSnapshot): boolean {
     route = findTopActivatedRouteNodeForOutlet(route);
 
-    const outletKey = this.location.getRouteFullPath(route);
-    const outlet = this.location.findOutlet(outletKey, route);
+    const { outlet } = this.findValidOutletAndKey(route);
     const key = getSnapshotKey(route);
-    const isPageActivated = route[pageRouterActivatedSymbol];
+
+    let isPageActivated = false;
+    let tmp = route;
+    while (!(isPageActivated = tmp[pageRouterActivatedSymbol]) && tmp.parent) {
+      tmp = tmp.parent;
+    }
     const isBack = outlet ? outlet.isPageNavigationBack : false;
     let shouldDetach = outlet && !isBack && isPageActivated;