mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/tab_bar_no_select_current' into 'develop'

Browse Source 
bug fix

See merge request BPHV_MIPS/mvm_core_ui!704
This commit is contained in:
Pfeil, Scott Robert 2021-04-09 10:01:17 -04:00
commit fb380dc1eb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift
View File

@ -80,8 +80,8 @@
// MARK: - UITabBarDelegate // MARK: - UITabBarDelegate
public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) { public func tabBar(_ tabBar: UITabBar, didSelect item: UITabBarItem) {
guard item.tag != tabBar.selectedItem?.tag else { return } guard model.selectedTab != tabBar.selectedItem?.tag else { return }
self.model.selectedTab = item.tag model.selectedTab = item.tag
Button.performButtonAction(with: model.tabs[item.tag].action, button: item, delegateObject: delegateObject, additionalData: nil) Button.performButtonAction(with: model.tabs[item.tag].action, button: item, delegateObject: delegateObject, additionalData: nil)
} }
@ -96,8 +96,7 @@
public func selectTab(at index: Int) { public func selectTab(at index: Int) {
MVMCoreDispatchUtility.performBlock(onMainThread: { MVMCoreDispatchUtility.performBlock(onMainThread: {
guard index != self.selectedItem?.tag, guard let newSelectedItem = self.items?[index] else { return }
let newSelectedItem = self.items?[index] else { return }
self.selectedItem = newSelectedItem self.selectedItem = newSelectedItem
self.tabBar(self, didSelect: newSelectedItem) self.tabBar(self, didSelect: newSelectedItem)
}) })