ryzen-ui 0.2.3 → 0.2.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/fesm2022/ryzen-ui.mjs
CHANGED
|
@@ -2125,17 +2125,17 @@ class SidebarComponent {
|
|
|
2125
2125
|
itemClick = output();
|
|
2126
2126
|
logout = output();
|
|
2127
2127
|
_expanded = signal(new Set(), ...(ngDevMode ? [{ debugName: "_expanded" }] : []));
|
|
2128
|
-
_currentUrl = signal(this._router.url, ...(ngDevMode ? [{ debugName: "_currentUrl" }] : []));
|
|
2128
|
+
_currentUrl = signal(this._router.url.split('?')[0].split('#')[0], ...(ngDevMode ? [{ debugName: "_currentUrl" }] : []));
|
|
2129
2129
|
_activeId = computed(() => {
|
|
2130
2130
|
if (this.activeId() !== null)
|
|
2131
2131
|
return this.activeId();
|
|
2132
2132
|
const url = this._currentUrl();
|
|
2133
2133
|
for (const item of this.items()) {
|
|
2134
|
-
if (item.route &&
|
|
2134
|
+
if (item.route && url === item.route)
|
|
2135
2135
|
return item.id;
|
|
2136
2136
|
if (item.children) {
|
|
2137
2137
|
for (const child of item.children) {
|
|
2138
|
-
if (child.route &&
|
|
2138
|
+
if (child.route && url === child.route)
|
|
2139
2139
|
return child.id;
|
|
2140
2140
|
}
|
|
2141
2141
|
}
|
|
@@ -2149,7 +2149,7 @@ class SidebarComponent {
|
|
|
2149
2149
|
constructor() {
|
|
2150
2150
|
this._router.events
|
|
2151
2151
|
.pipe(filter(e => e instanceof NavigationEnd), takeUntilDestroyed(this._destroyRef))
|
|
2152
|
-
.subscribe(() => this._currentUrl.set(this._router.url));
|
|
2152
|
+
.subscribe(() => this._currentUrl.set(this._router.url.split('?')[0].split('#')[0]));
|
|
2153
2153
|
}
|
|
2154
2154
|
_isActive(id) { return this._activeId() === id; }
|
|
2155
2155
|
_isExpanded(id) { return this._expanded().has(id); }
|