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

removed selected inputId

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-09-08 14:35:09 -05:00
parent 81ed479c87
commit 2148014664
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
VDS/Components/RadioSwatch/RadioSwatchGroup.swift
View File

@ -27,7 +27,7 @@ public class RadioSwatchGroup: RadioSwatchGroupBase<DefaultRadioSwatchGroupModel
label.text = newSelectedModel.text
replace(viewModel: newSelectedModel)
selectedInputId = newSelectedModel.inputId
sendActions(for: .valueChanged)
}
}
@ -37,22 +37,8 @@ public class RadioSwatchGroupBase<GroupModelType: RadioSwatchGroupModel, ModelHa
//--------------------------------------------------
// MARK: - Public Properties
//--------------------------------------------------
@Proxy(\.model.selectedInputId)
public var selectedInputId: String? {
didSet {
sendActions(for: .valueChanged)
}
}
public var selectedModel: ModelHandlerType.ModelType? {
guard let selectedInputId else { return nil }
if let index = model.selectors.firstIndex(where: { element in
return element.inputId == selectedInputId
}) {
return model.selectors[index]
} else {
return nil
}
return model.selectedModel
}
public var onChange: Blocks.ActionBlock?

1
VDS/Components/RadioSwatch/RadioSwatchGroupModel.swift
View File

@ -28,7 +28,6 @@ public struct DefaultRadioSwatchGroupModel: RadioSwatchGroupModel {
public var surface: Surface = .light
public var disabled: Bool = false
public var selectors: [SelectorModelType]
public var selectedInputId: String?
public init() { selectors = [] }
public init(selectors: [SelectorModelType]){
self.selectors = selectors

4
VDS/Protocols/SelectorGroupModelable.swift
View File

@ -15,15 +15,13 @@ public protocol SelectorGroupModelable: Modelable, FormFieldable {
///MARK: Groups that allow single selections
public protocol SelectorGroupSelectedModelable: SelectorGroupModelable {
var selectedInputId: String? { get set }
var selectedModel: SelectorModelType? { get }
}
extension SelectorGroupSelectedModelable {
public var selectedModel: SelectorModelType? {
guard let selectedInputId else { return nil }
if let index = selectors.firstIndex(where: { element in
return element.inputId == selectedInputId
return element.selected == true
}) {
return selectors[index]
} else {