Merge branch 'bugfix/atomic-tabs' into 'develop'

added 2 properties that were missed in the initial refactor

### Summary
missed 2 properties that were in VDS not in Atomic.

Co-authored-by: Matt Bruce <matt.bruce@verizon.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1088
This commit is contained in:
Pfeil, Scott Robert 2024-03-26 22:02:58 +00:00
commit c758e300f6
3 changed files with 22 additions and 1 deletions

View File

@ -63,6 +63,10 @@ import VDS
//-------------------------------------------------
open func viewModelDidUpdate() {
borderLine = viewModel.borderLine
if let minWidth = viewModel.minWidth {
self.minWidth = minWidth
}
orientation = viewModel.orientation
indicatorPosition = viewModel.indicatorPosition
overflow = viewModel.overflow

View File

@ -23,6 +23,8 @@ open class TabsModel: MoleculeModelProtocol {
open var overflow: Tabs.Overflow = .scroll
open var fillContainer: Bool = false
open var size: Tabs.Size = .medium
open var borderLine: Bool = true
open var minWidth: CGFloat?
public var backgroundColor: Color?
// Must be capped to 0...(tabs.count - 1)
@ -39,6 +41,8 @@ open class TabsModel: MoleculeModelProtocol {
case fillContainer
case overflow
case size
case borderLine
case minWidth
case style
}
@ -75,6 +79,15 @@ open class TabsModel: MoleculeModelProtocol {
if let size = try typeContainer.decodeIfPresent(VDS.Tabs.Size.self, forKey: .orientation) {
self.size = size
}
if let borderLine = try typeContainer.decodeIfPresent(Bool.self, forKey: .borderLine) {
self.borderLine = borderLine
}
if let minWidth = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .minWidth) {
self.minWidth = minWidth
}
}
open func encode(to encoder: Encoder) throws {
@ -89,7 +102,8 @@ open class TabsModel: MoleculeModelProtocol {
try container.encode(overflow, forKey: .overflow)
try container.encode(size, forKey: .size)
try container.encode(indicatorPosition, forKey: .indicatorPosition)
try container.encode(borderLine, forKey: .borderLine)
try container.encodeIfPresent(minWidth, forKey: .minWidth)
}
}

View File

@ -57,6 +57,9 @@ public class TabsListItemModel: ListItemModel, ParentMoleculeModelProtocol {
style = nil
topPadding = 8
bottomPadding = 0
if line == nil {
line = LineModel(type: .none)
}
}
//--------------------------------------------------