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

fixed migration issue in checkboxLabel to integrate the VDS.CheckboxItem

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-09-27 09:38:36 -05:00
parent 4d4765ccec
commit de33f8ffa1
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift
View File

@ -36,18 +36,12 @@ import VDS
updateCheckbox() updateCheckbox()
//primary label //primary label
labelText = viewModel.label.text labelText = viewModel.label?.text
if let attributes = viewModel.label.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) { labelTextAttributes = viewModel.label?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
labelTextAttributes = attributes
}
//secondary label //secondary label
if let subTitleModel = viewModel.subTitle { childText = viewModel.subTitle?.text
childText = subTitleModel.text childTextAttributes = viewModel.subTitle?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
if let attributes = subTitleModel.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
childTextAttributes = attributes
}
}
} }
private func performCheckboxAction(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { private func performCheckboxAction(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {

12
MVMCoreUI/Atomic/Atoms/Views/CheckboxLabelModel.swift
View File

@ -17,14 +17,16 @@ import VDS
public var backgroundColor: Color? public var backgroundColor: Color?
public var checkbox: CheckboxModel public var checkbox: CheckboxModel
public var label: LabelModel public var label: LabelModel?
public var subTitle: LabelModel? public var subTitle: LabelModel?
public var inverted: Bool? = false public var inverted: Bool? = false
public var surface: Surface { inverted ?? false ? .dark : .light } public var surface: Surface { inverted ?? false ? .dark : .light }
public var children: [MoleculeModelProtocol] { public var children: [MoleculeModelProtocol] {
guard let subTitle else { return [checkbox, label] } var values: [MoleculeModelProtocol] = [checkbox]
return [checkbox, label, subTitle] if let label { values.append(label) }
if let subTitle { values.append(subTitle) }
return values
} }
//-------------------------------------------------- //--------------------------------------------------
@ -54,8 +56,8 @@ extension Array where Element == CheckboxLabelModel {
return compactMap({ model in return compactMap({ model in
var item = CheckboxGroup.CheckboxItemModel() var item = CheckboxGroup.CheckboxItemModel()
item.inputId = model.checkbox.fieldKey item.inputId = model.checkbox.fieldKey
item.labelText = model.label.text item.labelText = model.label?.text
if let attributes = model.label.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) { if let attributes = model.label?.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) {
item.labelTextAttributes = attributes item.labelTextAttributes = attributes
} }
item.childText = model.subTitle?.text item.childText = model.subTitle?.text