Retrieve lazy loaded child routes when getting modal routes in modal …

…navigation service
kirbydesign · Feb 18, 2025 · 62ec904 · 62ec904
1 parent 13ac3c6
commit 62ec904
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/apps/cookbook/src/app/app.routes.ts b/apps/cookbook/src/app/app.routes.ts
@@ -6,7 +6,6 @@ import { HomeComponent } from './home/home.component';
 import { IntroComponent } from './intro/intro.component';
 import { ExtensionsLandingPageComponent } from './extensions/extensions-landing-page.component';
 import { LocalizationComponent } from './localization/localization.component';
-import { ExamplesRoutingModule } from './examples/examples-routing.module';
 
 export const routes: Routes = [
   {
@@ -70,7 +69,6 @@ export const routes: Routes = [
   },
   {
     path: 'examples',
-    loadChildren: () =>
-      import('./examples/examples-routing.module').then((m) => m.ExamplesRoutingModule),
+    loadChildren: () => import('./examples/examples.routes').then((m) => m.EXAMPLE_ROUTES),
   },
 ];
diff --git a/libs/designsystem/modal/src/modal-navigation.service.ts b/libs/designsystem/modal/src/modal-navigation.service.ts
@@ -37,6 +37,8 @@ export class ModalNavigationService {
     moduleRootRoutePath?: string
   ): Promise<string[]> {
     const flattenedRoutes: Routes = [].concat(...routeConfig);
+    await this.addLazyLoadedChildRoutes(flattenedRoutes);
+
     let modalRoutes: string[] = [];
     const moduleRootPaths = await this.getModuleRootPath(flattenedRoutes, moduleRootRoutePath);
     if (moduleRootPaths) {
@@ -45,6 +47,25 @@ export class ModalNavigationService {
     return modalRoutes;
   }
 
+  private async addLazyLoadedChildRoutes(flattenedRoutes: Routes) {
+    for (const route of flattenedRoutes) {
+      const lazyLoadedRoutes = await this.getLazyLoadedChildRoutes(route);
+      if (lazyLoadedRoutes.length) {
+        flattenedRoutes.push(...lazyLoadedRoutes);
+      }
+    }
+  }
+
+  private async getLazyLoadedChildRoutes(route: Route): Promise<Route[]> {
+    if (route?.loadChildren) {
+      const lazyLoadedChildren = await route.loadChildren();
+      if (Array.isArray(lazyLoadedChildren)) {
+        return lazyLoadedChildren;
+      }
+    }
+    return [];
+  }
+
   private async getModuleRootPath(routes: Routes, moduleRootRoutePath?: string): Promise<string[]> {
     if (moduleRootRoutePath) {
       const trimmedPaths = moduleRootRoutePath