@volo/ngx-lepton-x.core 5.0.0-rc.1 → 5.0.0-rc.2

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

@@ -1552,9 +1552,8 @@ class NavbarRoutesComponent {
             if (!items?.length || !url) {
                 return items;
             }
-            const updated = [...items];
             this.fixNavbarItems(url, items);
-            return updated;
+            return items;
         });
         this.routerItem = input();
         this.routeClick = new EventEmitter();
@@ -1615,14 +1614,37 @@ class NavbarRoutesComponent {
     fixNavbarItems(currentUrl, items) {
         items.forEach((item) => {
             const { link, children } = item;
+            const itemUrl = link?.split('?')[0];
             if (children?.length) {
                 this.fixNavbarItems(currentUrl, children);
-                const hasActiveChild = children.some((child) => child.selected || child.expanded || child.link === currentUrl);
-                item.expanded ||= hasActiveChild || link === currentUrl;
+                const hasActiveDescendant = this.hasActiveDescendant(children, currentUrl);
+                const isInActiveChain = hasActiveDescendant || itemUrl === currentUrl;
+                if (isInActiveChain) {
+                    item.expanded = true;
+                }
+                else {
+                    const hasExpandedChildren = children.some(child => child.expanded);
+                    if (!hasExpandedChildren) {
+                        item.expanded = false;
+                    }
+                }
+                item.selected = false;
             }
             else {
-                item.selected = link === currentUrl;
+                item.selected = itemUrl === currentUrl;
+            }
+        });
+    }
+    hasActiveDescendant(items, currentUrl) {
+        return items.some((item) => {
+            const itemUrl = item.link?.split('?')[0];
+            if (item.selected || itemUrl === currentUrl) {
+                return true;
+            }
+            if (item.children?.length) {
+                return this.hasActiveDescendant(item.children, currentUrl);
             }
+            return false;
         });
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.0.7", ngImport: i0, type: NavbarRoutesComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }