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

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

Browse Source 
release/11_1_4 hotfix merge

Co-authored-by: Pfeil, Scott Robert <scott.pfeil3@verizonwireless.com>
Co-authored-by: Sumanth Nadigadda <sumanth.nadigadda@verizon.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1032
This commit is contained in:
Hedden, Kyle Matthew 2023-12-05 14:42:29 +00:00
commit 9ec376ffa9
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,16 +84,22 @@ import VDSColorTokens
// MARK: - TabBarProtocol // MARK: - TabBarProtocol
@MainActor @MainActor
public func highlightTab(at index: Int) { public func highlightTab(at index: Int) {
guard let newSelectedItem = items?[index] else { return } guard let items = items, index >= 0, index < items.count else {
MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, messageToLog: "Invalid tab index \(index). \(items?.count ?? 0) tabs available .", code: 0, domain: ErrorDomainSystem, location: #function)!)
return
}
tabModel.selectedTab = index tabModel.selectedTab = index
selectedItem = newSelectedItem selectedItem = items[index]
} }
@MainActor @MainActor
public func selectTab(at index: Int) { public func selectTab(at index: Int) {
guard let newSelectedItem = items?[index] else { return } guard let items = items, index >= 0, index < items.count else {
selectedItem = newSelectedItem MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, messageToLog: "Invalid tab index \(index). \(items?.count ?? 0) tabs available.", code: 0, domain: ErrorDomainSystem, location: #function)!)
tabBar(self, didSelect: newSelectedItem) return
}
selectedItem = items[index]
tabBar(self, didSelect: items[index])
} }
public func currentTabIndex() -> Int { tabModel.selectedTab } public func currentTabIndex() -> Int { tabModel.selectedTab }

6
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift
View File

@ -88,15 +88,15 @@
var message = "" var message = ""
if let eyebrowLabel = eyebrow.text { if let eyebrowLabel = eyebrow.accessibilityLabel ?? eyebrow.text {
message += eyebrowLabel + ", " message += eyebrowLabel + ", "
} }
if let headlineLabel = headline.text { if let headlineLabel = headline.accessibilityLabel ?? headline.text {
message += headlineLabel + ", " message += headlineLabel + ", "
} }
if let bodyLabel = body.text { if let bodyLabel = body.accessibilityLabel ?? body.text {
message += bodyLabel message += bodyLabel
} }