refactor: clean up reuse tag (#576)

ngx-rocket · Jan 12, 2021 · 58c32a7 · 58c32a7
1 parent f42e6f2
commit 58c32a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/generators/app/templates/src/app/@core/route-reusable-strategy.ts b/generators/app/templates/src/app/@core/route-reusable-strategy.ts
@@ -23,12 +23,12 @@ export class RouteReusableStrategy extends RouteReuseStrategy {
     return null;
   }
 
-  public shouldReuseRoute(curr: ActivatedRouteSnapshot, future: ActivatedRouteSnapshot): boolean {
+  public shouldReuseRoute(future: ActivatedRouteSnapshot, curr: ActivatedRouteSnapshot): boolean {
     // Reuse the route if the RouteConfig is the same, or if both routes use the
     // same component, because the latter can have different RouteConfigs.
     return future.routeConfig === curr.routeConfig ||
-      (!!future.routeConfig?.component &&
-        future.routeConfig?.component === curr.routeConfig?.component);
+      (future.routeConfig?.component &&
+      future.routeConfig?.component === curr.routeConfig?.component);
   }
 
 }
diff --git a/generators/app/templates/src/app/shell/_shell.service.ts b/generators/app/templates/src/app/shell/_shell.service.ts
@@ -21,10 +21,8 @@ export class Shell {
       component: ShellComponent,
       children: routes,
 <% if (props.auth) { -%>
-      canActivate: [AuthenticationGuard],
+      canActivate: [AuthenticationGuard]
 <% } -%>
-      // Reuse ShellComponent instance when navigating between child views
-      data: { reuse: true }
     };
   }
 }