chore: refactor

Author: farfromrefug

src/core-tabs/tab-content-item/index.android.ts

@@ -1,16 +1,12 @@
-// Types
+import { GridLayout, View } from '@nativescript/core';
 import { TabContentItem as TabContentItemDefinition } from '.';
-import { TabNavigationBase } from '../tab-navigation-base';
-import { GridLayout, Trace, View } from '@nativescript/core';
-// Requires
-import { TabContentItemBase, traceCategory } from './tab-content-item-common';
+import { TabContentItemBase } from './tab-content-item-common';
 
 export * from './tab-content-item-common';
 
 export class TabContentItem extends TabContentItemBase {
     public nativeViewProtected: org.nativescript.widgets.GridLayout;
     public tabItemSpec: com.nativescript.material.core.TabItemSpec;
-    public index: number;
 
     get _hasFragments(): boolean {
         return true;
@@ -40,35 +36,4 @@ export class TabContentItem extends TabContentItemBase {
         super.disposeNativeView();
         (this as TabContentItemDefinition).canBeLoaded = false;
     }
-
-    public _getChildFragmentManager(): androidx.fragment.app.FragmentManager {
-        const tabView = this.parent as TabNavigationBase;
-        let tabFragment = null;
-        const fragmentManager = tabView._getFragmentManager();
-
-        if (typeof this.index === 'undefined') {
-            Trace.write('Current TabContentItem index is not set', traceCategory, Trace.messageType.error);
-        }
-
-        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);
-            // }
-
-            // TODO: fix d.ts in view module
-            //@ts-ignore
-            return tabView._getRootFragmentManager();
-        }
-
-        return tabFragment.getChildFragmentManager();
-    }
 }

src/core-tabs/tab-content-item/index.d.ts

@@ -8,4 +8,6 @@ export class TabContentItem extends ContentView {
      * @private
      */
     canBeLoaded?: boolean;
+
+    public index: number;
 }

src/core-tabs/tab-content-item/index.ios.ts

@@ -4,7 +4,7 @@ import { TabContentItemBase } from './tab-content-item-common';
 export * from './tab-content-item-common';
 
 export class TabContentItem extends TabContentItemBase {
-    // tslint:disable-next-line
+    // used to store native value
     private __controller: UIViewController;
 
     public setViewController(controller: UIViewController, nativeView: UIView) {

src/core-tabs/tab-content-item/tab-content-item-common.ts

@@ -1,25 +1,20 @@
 // Types
 import { AddChildFromBuilder, CSSType, ContentView, View, ViewBase } from '@nativescript/core';
 import { TabContentItem as TabContentItemDefinition } from '.';
-import { TabNavigationBase } from '../tab-navigation-base';
-
-export const traceCategory = 'TabView';
 
 @CSSType('MDTabContentItem')
 export abstract class TabContentItemBase extends ContentView implements TabContentItemDefinition, AddChildFromBuilder {
+    public index: number;
     public eachChild(callback: (child: View) => boolean) {
         if (this.content) {
             callback(this.content);
         }
     }
 
     public loadView(view: ViewBase): void {
-        const tabView = this.parent as TabNavigationBase;
-        if (tabView && tabView.items) {
-            // Don't load items until their fragments are instantiated.
-            if ((this as TabContentItemDefinition).canBeLoaded) {
-                super.loadView(view);
-            }
+        // Don't load items until their fragments are instantiated.
+        if ((this as TabContentItemDefinition).canBeLoaded) {
+            super.loadView(view);
         }
     }
 }

src/core-tabs/tab-navigation/index.ios.ts

@@ -1030,7 +1030,7 @@ export abstract class TabNavigation<
     [itemsProperty.setNative](value: TabContentItem[]) {
         if (value) {
             value.forEach((item: TabContentItem, i) => {
-                (item as any).index = i;
+                item.index = i;
             });
         }
         this.setViewControllers(value);