From 7d2dacc2226af5377ec6188b3213cf0c11339733 Mon Sep 17 00:00:00 2001 From: Dimitris-Rafail Katsampas Date: Mon, 18 May 2026 01:02:21 +0300 Subject: [PATCH] Revert "fix(android): correct TabView fragment manager resolution (#11217)" This reverts commit fe51a1441a5974bf42b7593417378382b08066bb. --- packages/core/ui/tab-view/index.android.ts | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/packages/core/ui/tab-view/index.android.ts b/packages/core/ui/tab-view/index.android.ts index 03191034c0..be11df1e58 100644 --- a/packages/core/ui/tab-view/index.android.ts +++ b/packages/core/ui/tab-view/index.android.ts @@ -383,7 +383,26 @@ export class TabViewItem extends TabViewItemBase { public _getChildFragmentManager(): androidx.fragment.app.FragmentManager { const tabView = this.parent as TabView; - return (tabView)._getRootFragmentManager(); + let tabFragment = null; + const fragmentManager = tabView._getFragmentManager(); + const fragments = fragmentManager.getFragments().toArray(); + for (let i = 0; i < fragments.length; i++) { + if (fragments[i].index === this.index) { + tabFragment = fragments[i]; + break; + } + } + + // TODO: can happen in a modal tabview scenario when the modal dialog fragment is already removed + if (!tabFragment) { + if (Trace.isEnabled()) { + Trace.write(`Could not get child fragment manager for tab item with index ${this.index}`, traceCategory); + } + + return (tabView)._getRootFragmentManager(); + } + + return tabFragment.getChildFragmentManager(); } [fontSizeProperty.getDefault](): { nativeSize: number } {