@volo/ngx-lepton-x.core 5.0.1 → 5.0.3

package/fesm2022/volo-ngx-lepton-x.core.mjs

@@ -3,6 +3,7 @@ import { inject, ViewContainerRef, TemplateRef, Input, Directive, NgModule, Inje
 import { CommonModule, isPlatformBrowser, DOCUMENT as DOCUMENT$1, Location, NgClass, NgTemplateOutlet, AsyncPipe, NgComponentOutlet } from '@angular/common';
 import { of, from, Observable, EMPTY, BehaviorSubject, Subject, fromEvent, Subscription, combineLatest, map as map$1 } from 'rxjs';
 import { Router, NavigationEnd, RouterLink, RouterModule } from '@angular/router';
+import { LOGO_URL_TOKEN, LOGO_APP_NAME_TOKEN } from '@abp/ng.theme.shared';
 import { map, distinctUntilChanged, filter, take, switchMap, distinctUntilKeyChanged, startWith, tap } from 'rxjs/operators';
 import { RoutesService as RoutesService$1, LocalizationService, LocalizationPipe } from '@abp/ng.core';
 import { toSignal } from '@angular/core/rxjs-interop';
@@ -823,9 +824,6 @@ function createWindowProvider(windowObj) {
     };
 }
 
-const LOGO_URL_TOKEN = new InjectionToken('LOGO_URL_TOKEN');
-const LOGO_APP_NAME_TOKEN = new InjectionToken('LOGO_APP_NAME_TOKEN');
-
 var LpxLogoFeatureKind;
 (function (LpxLogoFeatureKind) {
     LpxLogoFeatureKind[LpxLogoFeatureKind["Options"] = 0] = "Options";
@@ -1182,6 +1180,9 @@ class NavbarService {
         this.menuItems = inject(LPX_MENU_ITEMS);
         this.store = new DataStore(this.addContainerLinks(this.menuItems));
         this.navbarItems$ = this.store.sliceState((state) => state);
+        // Source reference to navbar items, used for checking item existence
+        // without being affected by potential future transformations of navbarItems$
+        this.sourceNavbarItems$ = this.navbarItems$;
         this.groupedNavbarItems$ = this.store
             .sliceState((state) => state)
             .pipe(map((items) => {
@@ -1202,28 +1203,31 @@ class NavbarService {
     setNavbarItems(...menuItems) {
         this.store.set([...this.addContainerLinks(menuItems)]);
     }
-    // TODO: muhammed: refactor this method to be readable
     addChildren(id, ...menuItems) {
         const parent = this.findById(id, this.store.state);
         const update = (items, location, link = '') => {
-            const i = location.shift();
+            const [currentIndex, ...remainingPath] = location;
             return items.reduce((acc, item, index) => {
-                return [
-                    ...acc,
-                    ...(index === i
-                        ? [
-                            {
-                                ...item,
-                                children: !location.length
-                                    ? [
-                                        ...(item.children || []),
-                                        ...this.addContainerLinks(menuItems, `${link}/${item.containerLink}`),
-                                    ]
-                                    : update(item.children || [], location, `${link}/${item.containerLink}`),
-                            },
-                        ]
-                        : [item]),
-                ];
+                if (index === currentIndex) {
+                    const containerLink = item.containerLink || '';
+                    const childLink = `${link}/${containerLink}`;
+                    const isTargetParent = remainingPath.length === 0;
+                    let updatedChildren = update(item.children || [], remainingPath, childLink);
+                    if (isTargetParent) {
+                        updatedChildren = [
+                            ...(item.children || []),
+                            ...this.addContainerLinks(menuItems, childLink),
+                        ];
+                    }
+                    return [
+                        ...acc,
+                        {
+                            ...item,
+                            children: updatedChildren,
+                        },
+                    ];
+                }
+                return [...acc, item];
             }, []);
         };
         const updated = update(this.store.state, parent.location);
@@ -1687,7 +1691,7 @@ class NavbarComponent {
         this.injector = inject(Injector);
         this.didResized = false;
         this.initialHover = false;
-        this.showFilterMenu$ = this.service.navbarItems$.pipe(map$1((items) => !!items.length));
+        this.showFilterMenu$ = this.service.sourceNavbarItems$.pipe(map$1((items) => !!items.length));
         this.contentBefore = this.flatContents(CONTENT_BEFORE_ROUTES);
         this.contentAfter = this.flatContents(CONTENT_AFTER_ROUTES);
     }