refactor(router): determine if a route (and its subtree) should be re…

…attached until detached route retrieving
angular · May 4, 2019 · ae081b9 · ae081b9
1 parent 7d6f488
commit ae081b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/router/src/create_router_state.ts b/packages/router/src/create_router_state.ts
@@ -31,9 +31,9 @@ function createNode(
 
     // retrieve an activated route that is used to be displayed, but is not currently displayed
   } else {
-    const detachedRouteHandle =
-        <DetachedRouteHandleInternal>routeReuseStrategy.retrieve(curr.value);
-    if (detachedRouteHandle) {
+    if (routeReuseStrategy.shouldAttach(curr.value)) {
+      const detachedRouteHandle =
+          <DetachedRouteHandleInternal>routeReuseStrategy.retrieve(curr.value);
       const tree: TreeNode<ActivatedRoute> = detachedRouteHandle.route;
       setFutureSnapshotsOfActivatedRoutes(curr, tree);
       return tree;

diff --git a/packages/router/test/create_router_state.spec.ts b/packages/router/test/create_router_state.spec.ts
@@ -94,20 +94,20 @@ describe('create router state', () => {
       {path: 'a', component: ComponentA}, {path: 'b', component: ComponentB, outlet: 'left'},
       {path: 'c', component: ComponentC, outlet: 'left'}
     ];
-    spyOn(reuseStrategy, 'retrieve').and.callThrough();
+    spyOn(reuseStrategy, 'shouldAttach').and.callThrough();
 
     const prevState =
         createRouterState(reuseStrategy, createState(config, 'a(left:b)'), emptyState());
     advanceState(prevState);
 
     // Expect 2 calls as the baseline setup
-    expect(reuseStrategy.retrieve).toHaveBeenCalledTimes(2);
+    expect(reuseStrategy.shouldAttach).toHaveBeenCalledTimes(2);
 
     // This call should produce a reused activated route
     const state = createRouterState(reuseStrategy, createState(config, 'a(left:c)'), prevState);
 
     // Verify the retrieve method has been called one more time
-    expect(reuseStrategy.retrieve).toHaveBeenCalledTimes(3);
+    expect(reuseStrategy.shouldAttach).toHaveBeenCalledTimes(3);
   });
 });