javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-15 19:26:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios-tabs): crash when add tabstrip in loaded event (#7743)

Browse Source
This commit is contained in:
Martin Yankov
2019-08-29 09:34:57 +03:00
committed by GitHub
parent ff6d89fc13
commit a66f2f2f47
1 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tns-core-modules/ui/tabs/tabs.ios.ts
View File

@ -82,26 +82,24 @@ class UIPageViewControllerImpl extends UIPageViewController {
public viewDidLoad(): void { public viewDidLoad(): void {
const owner = this._owner.get(); const owner = this._owner.get();
if (owner.tabStrip) { const tabBarItems = owner.tabBarItems;
const tabBarItems = owner.tabBarItems; const tabBar = MDCTabBar.alloc().initWithFrame(this.view.bounds);
const tabBar = MDCTabBar.alloc().initWithFrame(this.view.bounds);
if (tabBarItems && tabBarItems.length) { if (tabBarItems && tabBarItems.length) {
tabBar.items = NSArray.arrayWithArray(tabBarItems); 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);
} }
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 { 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); this.tabBar.frame = CGRectMake(0, tabBarTop, this.tabBar.frame.size.width, tabBarHeight);
} else {
this.tabBar.hidden = true;
} }
const subViews: NSArray<UIView> = this.view.subviews; const subViews: NSArray<UIView> = this.view.subviews;