fix: move takeUntil

brandonroberts · Jun 17, 2020 · 17cd7ff · 17cd7ff
1 parent 84f3619
commit 17cd7ff
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/projects/router/src/lib/router.component.ts b/projects/router/src/lib/router.component.ts
@@ -55,22 +55,22 @@ export class RouterComponent {
     combineLatest(this.routes$.pipe(debounceTime(1)), this.router.url$)
       .pipe(
         distinctUntilChanged(),
-        takeUntil(this.destroy$),
         tap(([routes, url]: [Route[], string]) => {
           let routeToRender = null;
           for (const route of routes) {
             routeToRender = this.findRouteMatch(route, url);
-
+            
             if (routeToRender) {
               this.setRoute(url, route);
               break;
             }
           }
-
+          
           if (!routeToRender) {
             this.setActiveRoute({ route: null, params: {} });
           }
-        })
+        }),
+        takeUntil(this.destroy$)
       )
       .subscribe();
   }