fix(navigation): unregister root navs when appropriate

ionic-team · Oct 5, 2017 · 2bd89fe · 2bd89fe
1 parent c38cc28
commit 2bd89fe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/components/app/app.ts b/src/components/app/app.ts
@@ -274,6 +274,13 @@ export class App {
     this._rootNavs.set(nav.id, nav);
   }
 
+  /**
+   * @hidden
+   */
+  unregisterRootNav(nav: NavigationContainer) {
+    this._rootNavs.delete(nav.id);
+  }
+
 
   getActiveNavContainers(): NavigationContainer[] {
     // for each root nav container, get it's active nav

diff --git a/src/components/tabs/tabs.ts b/src/components/tabs/tabs.ts
@@ -301,7 +301,11 @@ export class Tabs extends Ion implements AfterViewInit, RootNode, ITabs, Navigat
    */
   ngOnDestroy() {
     this._onDestroy.next();
-    this.parent.unregisterChildNav(this);
+    if (this.parent) {
+      this.parent.unregisterChildNav(this);
+    } else {
+      this._app.unregisterRootNav(this);
+    }
   }
 
   /**

diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts
@@ -1025,6 +1025,8 @@ export class NavControllerBase extends Ion implements NavController {
     // Unregister navcontroller
     if (this.parent && this.parent.unregisterChildNav) {
       this.parent.unregisterChildNav(this);
+    } else if (this._app) {
+      this._app.unregisterRootNav(this);
     }
 
     this._destroyed = true;