EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-4657 tabs: Fix detection of nav bar buttons to hide 

All course option site plugins use the same page name, so using page name to check if a page is selected caused problems. It's better to use the tab ID
main
Dani Palou 2024-09-13 14:33:02 +02:00
parent 90a356f852
commit 6290fb99af
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/components/tabs-outlet/tabs-outlet.ts
View File

@ -106,7 +106,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
this.tabSelected(tab, tabIndex); this.tabSelected(tab, tabIndex);
} }
this.showHideNavBarButtons(stackEvent.enteringView.element.tagName); this.showHideNavBarButtons();
})); }));
this.subscriptions.push(this.ionTabs.outlet.activateEvents.subscribe(() => { this.subscriptions.push(this.ionTabs.outlet.activateEvents.subscribe(() => {
this.lastActiveComponent = this.ionTabs.outlet.component; this.lastActiveComponent = this.ionTabs.outlet.component;
@ -206,17 +206,15 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
* Get all child core-navbar-buttons and show or hide depending on the page state. * Get all child core-navbar-buttons and show or hide depending on the page state.
* We need to use querySelectorAll because ContentChildren doesn't work with ng-template. * We need to use querySelectorAll because ContentChildren doesn't work with ng-template.
* https://github.com/angular/angular/issues/14842 * https://github.com/angular/angular/issues/14842
*
* @param activatedPageName Activated page name.
*/ */
protected showHideNavBarButtons(activatedPageName: string): void { protected showHideNavBarButtons(): void {
const elements = this.ionTabs.outlet.nativeEl.querySelectorAll('core-navbar-buttons'); const elements = this.ionTabs.outlet.nativeEl.querySelectorAll('core-navbar-buttons');
elements.forEach((element) => { elements.forEach((element) => {
const instance = CoreDirectivesRegistry.resolve(element, CoreNavBarButtonsComponent); const instance = CoreDirectivesRegistry.resolve(element, CoreNavBarButtonsComponent);
if (instance) { if (instance) {
const pagetagName = element.closest('.ion-page')?.tagName; const pageTabId = element.closest('.ion-page')?.id;
instance.forceHide(activatedPageName != pagetagName); instance.forceHide(this.selected !== pageTabId);
} }
}); });
} }