@resolveio/client-lib-core 1.3.1 → 1.3.3
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/esm2020/lib/widgets/navbar-module/navbar-module.component.mjs +4 -7
- package/fesm2015/resolveio-client-lib-core.mjs +3 -6
- package/fesm2015/resolveio-client-lib-core.mjs.map +1 -1
- package/fesm2020/resolveio-client-lib-core.mjs +3 -6
- package/fesm2020/resolveio-client-lib-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -4803,20 +4803,20 @@ class NavbarModuleComponent extends BaseComponent {
|
|
|
4803
4803
|
this.routerEvents$.push(this._services._router.events
|
|
4804
4804
|
//.filter(event => event instanceof NavigationEnd)
|
|
4805
4805
|
.subscribe((event) => {
|
|
4806
|
-
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute) {
|
|
4806
|
+
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute || !this.selectedTab) {
|
|
4807
4807
|
this.selectTabFromRouter();
|
|
4808
4808
|
}
|
|
4809
4809
|
}));
|
|
4810
4810
|
this.routerEvents$.push(this._services._router.events
|
|
4811
4811
|
//.filter(event => event instanceof NavigationCancel)
|
|
4812
4812
|
.subscribe((event) => {
|
|
4813
|
-
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute) {
|
|
4813
|
+
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute || !this.selectedTab) {
|
|
4814
4814
|
this.selectTabFromRouter();
|
|
4815
4815
|
}
|
|
4816
4816
|
}));
|
|
4817
4817
|
this.routerEvents$.push(this._services._app.navbarModuleData.subscribe(data => {
|
|
4818
4818
|
this.menuData = data;
|
|
4819
|
-
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute) {
|
|
4819
|
+
if (this._services._router.url.replace(/\/[a-f0-9]{24}$/, '').replace(/\?.+$/, '') !== this.currentRoute || !this.selectedTab) {
|
|
4820
4820
|
this.selectTabFromRouter();
|
|
4821
4821
|
}
|
|
4822
4822
|
}));
|
|
@@ -4844,9 +4844,6 @@ class NavbarModuleComponent extends BaseComponent {
|
|
|
4844
4844
|
break;
|
|
4845
4845
|
}
|
|
4846
4846
|
}
|
|
4847
|
-
if (this.selectedTab === null) {
|
|
4848
|
-
this.selectedTab = this.menuData.tabs[0];
|
|
4849
|
-
}
|
|
4850
4847
|
}
|
|
4851
4848
|
}
|
|
4852
4849
|
}
|