From a66f2f2f47456da99e39ae777af210fc13ea5431 Mon Sep 17 00:00:00 2001
From: Martin Yankov <m.i.yankov@gmail.com>
Date: Thu, 29 Aug 2019 09:34:57 +0300
Subject: [PATCH] fix(ios-tabs): crash when add tabstrip in loaded event
 (#7743)

---
 tns-core-modules/ui/tabs/tabs.ios.ts | 36 ++++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tns-core-modules/ui/tabs/tabs.ios.ts b/tns-core-modules/ui/tabs/tabs.ios.ts
index 1b6cb35b1..7b56a9226 100644
--- a/tns-core-modules/ui/tabs/tabs.ios.ts
+++ b/tns-core-modules/ui/tabs/tabs.ios.ts
@@ -82,26 +82,24 @@ class UIPageViewControllerImpl extends UIPageViewController {
     public viewDidLoad(): void {
         const owner = this._owner.get();
 
-        if (owner.tabStrip) {
-            const tabBarItems = owner.tabBarItems;
-            const tabBar = MDCTabBar.alloc().initWithFrame(this.view.bounds);
+        const tabBarItems = owner.tabBarItems;
+        const tabBar = MDCTabBar.alloc().initWithFrame(this.view.bounds);
 
-            if (tabBarItems && tabBarItems.length) {
-                tabBar.items = NSArray.arrayWithArray(tabBarItems);
-            }
-
-            tabBar.delegate = this.tabBarDelegate = MDCTabBarDelegateImpl.initWithOwner(new WeakRef(owner));
-            tabBar.tintColor = UIColor.blueColor;
-            tabBar.barTintColor = UIColor.whiteColor;
-            tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Normal);
-            tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Selected);
-            tabBar.autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleBottomMargin;
-            tabBar.alignment = MDCTabBarAlignment.Leading;
-            tabBar.sizeToFit();
-
-            this.tabBar = tabBar;
-            this.view.addSubview(tabBar);
+        if (tabBarItems && tabBarItems.length) {
+            tabBar.items = NSArray.arrayWithArray(tabBarItems);
         }
+
+        tabBar.delegate = this.tabBarDelegate = MDCTabBarDelegateImpl.initWithOwner(new WeakRef(owner));
+        tabBar.tintColor = UIColor.blueColor;
+        tabBar.barTintColor = UIColor.whiteColor;
+        tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Normal);
+        tabBar.setTitleColorForState(UIColor.blackColor, MDCTabBarItemState.Selected);
+        tabBar.autoresizingMask = UIViewAutoresizing.FlexibleWidth | UIViewAutoresizing.FlexibleBottomMargin;
+        tabBar.alignment = MDCTabBarAlignment.Leading;
+        tabBar.sizeToFit();
+
+        this.tabBar = tabBar;
+        this.view.addSubview(tabBar);
     }
 
     public viewWillAppear(animated: boolean): void {
@@ -159,6 +157,8 @@ class UIPageViewControllerImpl extends UIPageViewController {
             }
 
             this.tabBar.frame = CGRectMake(0, tabBarTop, this.tabBar.frame.size.width, tabBarHeight);
+        } else {
+            this.tabBar.hidden = true;
         }
 
         const subViews: NSArray<UIView> = this.view.subviews;