fixup! fix(router): fix angular#49457 outlet activating with old info

jancabadaj · Mar 17, 2023 · 3de42aa · 3de42aa
1 parent 19bbbe1
commit 3de42aa
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/packages/router/src/operators/activate_routes.ts b/packages/router/src/operators/activate_routes.ts
@@ -126,14 +126,13 @@ export class ActivateRoutes {
       this.deactivateRouteAndItsChildren(children[childOutlet], contexts);
     }
 
-    if (context && context.outlet) {
-      // Destroy the component
-      context.outlet.deactivate();
-      // Destroy the contexts for all the outlets that were in the component
-      context.children.onOutletDeactivated();
-    }
-
     if (context) {
+      if (context.outlet) {
+        // Destroy the component
+        context.outlet.deactivate();
+        // Destroy the contexts for all the outlets that were in the component
+        context.children.onOutletDeactivated();
+      }
       // Clear the information about the attached component on the context but keep the reference to
       // the outlet. Clear even if outlet was not yet activated to avoid activating later with old
       // info