Skip to content

Commit df209b4

Browse files
Merge pull request #4174 from dpalou/MOBILE-4657
MOBILE-4657 tabs: Fix detection of nav bar buttons to hide
2 parents 90a356f + 6290fb9 commit df209b4

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/core/components/tabs-outlet/tabs-outlet.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
106106
this.tabSelected(tab, tabIndex);
107107
}
108108

109-
this.showHideNavBarButtons(stackEvent.enteringView.element.tagName);
109+
this.showHideNavBarButtons();
110110
}));
111111
this.subscriptions.push(this.ionTabs.outlet.activateEvents.subscribe(() => {
112112
this.lastActiveComponent = this.ionTabs.outlet.component;
@@ -206,17 +206,15 @@ export class CoreTabsOutletComponent extends CoreTabsBaseComponent<CoreTabsOutle
206206
* Get all child core-navbar-buttons and show or hide depending on the page state.
207207
* We need to use querySelectorAll because ContentChildren doesn't work with ng-template.
208208
* https://github.com/angular/angular/issues/14842
209-
*
210-
* @param activatedPageName Activated page name.
211209
*/
212-
protected showHideNavBarButtons(activatedPageName: string): void {
210+
protected showHideNavBarButtons(): void {
213211
const elements = this.ionTabs.outlet.nativeEl.querySelectorAll('core-navbar-buttons');
214212
elements.forEach((element) => {
215213
const instance = CoreDirectivesRegistry.resolve(element, CoreNavBarButtonsComponent);
216214

217215
if (instance) {
218-
const pagetagName = element.closest('.ion-page')?.tagName;
219-
instance.forceHide(activatedPageName != pagetagName);
216+
const pageTabId = element.closest('.ion-page')?.id;
217+
instance.forceHide(this.selected !== pageTabId);
220218
}
221219
});
222220
}

0 commit comments

Comments
 (0)