Skip to content

fix(ios/bottom-navigation): Changing tabs programatically messes up styles #8160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vtrifonov merged 6 commits into from
Jan 10, 2020
Merged

fix(ios/bottom-navigation): Changing tabs programatically messes up styles #8160

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8c4b3b
fix(ios/bottom-navigation): move TabStrip items event emitting to sel…
ycherniavskyi Dec 3, 2019
4a22c41
Merge branch 'master' into fix-changing-tabs-programatically-messes-u…
dtopuzov Dec 13, 2019
75497b4
Merge branch 'master' into fix-changing-tabs-programatically-messes-u…
dtopuzov Dec 13, 2019
ad7a954
Merge branch 'master' into fix-changing-tabs-programatically-messes-u…
dtopuzov Jan 6, 2020
c368916
Merge branch 'master' into fix-changing-tabs-programatically-messes-u…
dtopuzov Jan 9, 2020
c730359
Merge branch 'master' into fix-changing-tabs-programatically-messes-u…
vtrifonov Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 11 additions & 17 deletions nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,6 @@ class UITabBarControllerDelegateImpl extends NSObject implements UITabBarControl

const owner = this._owner.get();
if (owner) {
if (tabBarController.viewControllers) {
const position = tabBarController.viewControllers.indexOfObject(viewController);
if (position !== NSNotFound) {
const prevPosition = owner.selectedIndex;
const tabStripItems = owner.tabStrip && owner.tabStrip.items;
if (tabStripItems) {
if (tabStripItems[position]) {
tabStripItems[position]._emit(TabStripItem.selectEvent);
}

if (tabStripItems[prevPosition]) {
tabStripItems[prevPosition]._emit(TabStripItem.unselectEvent);
}
}
}
}

owner._onViewControllerShown(viewController);
}

Expand Down Expand Up @@ -358,6 +341,17 @@ export class BottomNavigation extends TabNavigationBase {
newItem.loadView(newItem.content);
}

const tabStripItems = this.tabStrip && this.tabStrip.items;
if (tabStripItems) {
if (tabStripItems[newIndex]) {
tabStripItems[newIndex]._emit(TabStripItem.selectEvent);
}

if (tabStripItems[oldIndex]) {
tabStripItems[oldIndex]._emit(TabStripItem.unselectEvent);
}
}

super.onSelectedIndexChanged(oldIndex, newIndex);
}

Expand Down