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

fix(ios/bottom-navigation): move TabStrip items event emitting to selectedIndex changed handler (#8160)

Browse Source
This commit is contained in:
Yurii Cherniavskyi
2020-01-10 10:49:32 +02:00
committed by Vasil Trifonov
parent d65a2db83a
commit 8550c3293d
1 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
nativescript-core/ui/bottom-navigation/bottom-navigation.ios.ts
View File

@ -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);
}
@ -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);
}