Merge branch 'feature/tab_bar_no_select_current' into 'develop'

tab bar can't press current tab

See merge request BPHV_MIPS/mvm_core_ui!702
This commit is contained in:
Pfeil, Scott Robert 2021-04-08 09:34:08 -04:00
commit 9fa06ed560

View File

@ -80,6 +80,7 @@
// 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 }
self.model.selectedTab = item.tag self.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)
} }
@ -95,7 +96,8 @@
public func selectTab(at index: Int) { public func selectTab(at index: Int) {
MVMCoreDispatchUtility.performBlock(onMainThread: { MVMCoreDispatchUtility.performBlock(onMainThread: {
guard let newSelectedItem = self.items?[index] else { return } guard index != self.selectedItem?.tag,
let newSelectedItem = self.items?[index] else { return }
self.selectedItem = newSelectedItem self.selectedItem = newSelectedItem
self.tabBar(self, didSelect: newSelectedItem) self.tabBar(self, didSelect: newSelectedItem)
}) })