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

Merge branch 'release/11_1_2' into 'develop'

Browse Source 
release/11_1_2 hotfix merge

Co-authored-by: Pfeil, Scott Robert <scott.pfeil3@verizonwireless.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1028
This commit is contained in:
Hedden, Kyle Matthew 2023-11-27 15:10:51 +00:00
commit 3e5d4fe71f
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,20 +82,18 @@ import VDSColorTokens
} }
// MARK: - TabBarProtocol // MARK: - TabBarProtocol
@MainActor
public func highlightTab(at index: Int) { public func highlightTab(at index: Int) {
MVMCoreDispatchUtility.performBlock(onMainThread: { guard let newSelectedItem = items?[index] else { return }
guard let newSelectedItem = self.items?[index] else { return } tabModel.selectedTab = index
self.tabModel.selectedTab = index selectedItem = newSelectedItem
self.selectedItem = newSelectedItem
})
} }
@MainActor
public func selectTab(at index: Int) { public func selectTab(at index: Int) {
MVMCoreDispatchUtility.performBlock(onMainThread: { guard let newSelectedItem = items?[index] else { return }
guard let newSelectedItem = self.items?[index] else { return } selectedItem = newSelectedItem
self.selectedItem = newSelectedItem tabBar(self, didSelect: newSelectedItem)
self.tabBar(self, didSelect: newSelectedItem)
})
} }
public func currentTabIndex() -> Int { tabModel.selectedTab } public func currentTabIndex() -> Int { tabModel.selectedTab }

4
MVMCoreUI/Atomic/Protocols/TabBarProtocol.swift
View File

@ -13,10 +13,10 @@ import Foundation
var delegateObject: MVMCoreUIDelegateObject? { get set } var delegateObject: MVMCoreUIDelegateObject? { get set }
/// Should visually select the given tab index. /// Should visually select the given tab index.
@objc func highlightTab(at index: Int) @MainActor func highlightTab(at index: Int)
/// Should select the tab index. As if the user selected it. /// Should select the tab index. As if the user selected it.
@objc func selectTab(at index: Int) @MainActor func selectTab(at index: Int)
/// Returns the current tab /// Returns the current tab
@objc func currentTabIndex() -> Int @objc func currentTabIndex() -> Int