fix: tab item child fm retrieval

manoldonev · manoldonev · commit 737f394e5bc4 · 2018-10-08T16:20:58.000+03:00
diff --git a/tns-core-modules/ui/core/view/view.android.ts b/tns-core-modules/ui/core/view/view.android.ts
@@ -273,7 +273,7 @@ export class View extends ViewCommon {
         let manager = this._manager;
         if (!manager) {
             let view: View = this;
-            let frameOrTabFound = false;
+            let frameOrTabViewItemFound = false;
             while (view) {
                 // when interacting with nested fragments instead of using getSupportFragmentManager 
                 // we must always use getChildFragmentManager instead;
@@ -292,12 +292,12 @@ export class View extends ViewCommon {
                 // - frame1 -> tabview (tabview uses frame1 CHILD fm)
                 // - frame1 -> tabview -> frame2 (tabview uses frame1 CHILD fm; frame2 uses tabview item CHILD fm)
                 if (view._hasFragments) {
-                    if (frameOrTabFound) {
+                    if (frameOrTabViewItemFound) {
                         manager = view._getChildFragmentManager();
                         break;
                     }
 
-                    frameOrTabFound = true;
+                    frameOrTabViewItemFound = true;
                 }
 
                 // the case is needed because _dialogFragment is on View
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -260,6 +260,10 @@ export class TabViewItem extends TabViewItemBase {
     public index: number;
     private _defaultTransformationMethod: android.text.method.TransformationMethod;
 
+    get _hasFragments(): boolean {
+        return true;
+    }
+
     public initNativeView(): void {
         super.initNativeView();
         if (this.nativeViewProtected) {
@@ -297,6 +301,23 @@ export class TabViewItem extends TabViewItemBase {
         }
     }
 
+    public _getChildFragmentManager(): android.support.v4.app.FragmentManager {
+        const tabView = this.parent as TabView;
+        let tabFragment = null;
+        for (let fragment of tabView._getFragmentManager().getFragments().toArray()) {
+            if (fragment.index === this.index) {
+                tabFragment = fragment;
+                break;
+            }
+        }
+
+        if (!tabFragment) {
+            throw new Error(`Could not get child fragment manager for tab item with index ${this.index}`);
+        }
+
+        return tabFragment.getChildFragmentManager();
+    }
+
     [fontSizeProperty.getDefault](): { nativeSize: number } {
         return { nativeSize: this.nativeViewProtected.getTextSize() };
     }
@@ -361,21 +382,6 @@ export class TabView extends TabViewBase {
         tabs.push(new WeakRef(this));
     }
 
-    get _hasFragments(): boolean {
-        return true;
-    }
-
-    public _getChildFragmentManager(): android.support.v4.app.FragmentManager {
-        if (this._pagerAdapter) {
-            const fragment: android.support.v4.app.Fragment = (<any>this._pagerAdapter).mCurrentPrimaryItem;
-            if (fragment && fragment.isAdded()) {
-                return fragment.getChildFragmentManager();
-            }
-        }
-
-        return null;
-    }
-
     public onItemsChanged(oldItems: TabViewItem[], newItems: TabViewItem[]): void {
         super.onItemsChanged(oldItems, newItems);
 
