fix: lazy loaded route will not load a destroyed module instance, cre…

…ates new one instead (angular#24962)
kewde · Jul 19, 2018 · a78f4b9 · a78f4b9
1 parent d76531d
commit a78f4b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/packages/core/src/linker/ng_module_factory.ts b/packages/core/src/linker/ng_module_factory.ts
@@ -42,6 +42,11 @@ export abstract class NgModuleRef<T> {
    */
   abstract destroy(): void;
 
+  /**
+   * Returns whether the module has been destroyed.
+   */
+  abstract get destroyed(): boolean;
+
   /**
    * Allows to register a callback that will be called when the module is destroyed.
    */

diff --git a/packages/core/src/view/refs.ts b/packages/core/src/view/refs.ts
@@ -520,5 +520,7 @@ class NgModuleRef_ implements NgModuleData, InternalNgModuleRef<any> {
     this._destroyListeners.forEach((listener) => listener());
   }
 
+  get destroyed() { return this._destroyed }
+
   onDestroy(callback: () => void): void { this._destroyListeners.push(callback); }
 }
diff --git a/packages/router/src/apply_redirects.ts b/packages/router/src/apply_redirects.ts
@@ -290,7 +290,7 @@ class ApplyRedirects {
 
     if (route.loadChildren) {
       // lazy children belong to the loaded module
-      if (route._loadedConfig !== undefined) {
+      if (route._loadedConfig !== undefined && !route._loadedConfig.module.destroyed) {
         return of (route._loadedConfig);
       }