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

removed id

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-30 14:32:06 -05:00
parent d6a2ebaf95
commit 3b3ea3bece
13 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VDS/Components/Checkbox/Checkbox.swift
View File

@ -58,9 +58,6 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
public var onChange: Blocks.ActionBlock?
@Proxy(\.model.id)
open var id: UUID
//can't bind to @Proxy
open override var isSelected: Bool {
get { model.selected }

2
VDS/Components/Checkbox/CheckboxGroup.swift
View File

@ -82,7 +82,7 @@ public class CheckboxGroup: Control<DefaultCheckboxGroupModel>, SelectorGroupMod
open override func updateView(viewModel: ModelType) {
for selectorModel in viewModel.selectors {
//see if view is there for the model
if let foundSelectorView = findSelectorView(id: selectorModel.id) {
if let foundSelectorView = findSelectorView(inputId: selectorModel.inputId) {
foundSelectorView.set(with: selectorModel)
} else {

3
VDS/Components/Checkbox/CheckboxGroupModel.swift
View File

@ -7,13 +7,12 @@
import Foundation
public protocol CheckboxGroupModel: SelectorGroupModelable where SelectorModelType: CheckboxModel {
public protocol CheckboxGroupModel: SelectorGroupModelable, Errorable where SelectorModelType: CheckboxModel {
}
public struct DefaultCheckboxGroupModel: CheckboxGroupModel {
public typealias SelectorModelType = DefaultCheckboxModel
public var id: UUID = UUID()
public var inputId: String?
public var value: AnyHashable?
public var surface: Surface = .light

1
VDS/Components/Checkbox/CheckboxModel.swift
View File

@ -64,7 +64,6 @@ extension CheckboxModel {
}
public struct DefaultCheckboxModel: CheckboxModel {
public var id: UUID = UUID()
public var selected: Bool = false
public var labelText: String?

3
VDS/Components/RadioBox/RadioBox.swift
View File

@ -60,9 +60,6 @@ open class RadioBoxBase<ModelType: RadioBoxModel>: Control<ModelType>, Changable
public var onChange: Blocks.ActionBlock?
@Proxy(\.model.id)
open var id: UUID
//can't bind to @Proxy
open override var isSelected: Bool {
get { model.selected }

2
VDS/Components/RadioBox/RadioBoxGroup.swift
View File

@ -117,7 +117,7 @@ public class RadioBoxGroup: Control<DefaultRadioBoxGroupModel>, SelectorGroupSel
open override func updateView(viewModel: ModelType) {
for selectorModel in viewModel.selectors {
//see if view is there for the model
if let foundSelectorView = findSelectorView(id: selectorModel.id) {
if let foundSelectorView = findSelectorView(inputId: selectorModel.inputId) {
foundSelectorView.set(with: selectorModel)
} else {

1
VDS/Components/RadioBox/RadioBoxModel.swift
View File

@ -74,7 +74,6 @@ extension RadioBoxModel {
public struct DefaultRadioBoxModel: RadioBoxModel {
public var id: UUID = UUID()
public var selected: Bool = false
public var text: String = "Default Text"

3
VDS/Components/RadioButton/RadioButton.swift
View File

@ -57,9 +57,6 @@ open class RadioButtonBase<ModelType: RadioButtonModel>: Control<ModelType>, Cha
public var onChange: Blocks.ActionBlock?
@Proxy(\.model.id)
open var id: UUID
//can't bind to @Proxy
open override var isSelected: Bool {
get { model.selected }

4
VDS/Components/RadioButton/RadioButtonGroup.swift
View File

@ -86,7 +86,7 @@ public class RadioButtonGroup: Control<DefaultRadioButtonGroupModel>, SelectorGr
}
open override func shouldUpdateView(viewModel: ModelType) -> Bool {
let update = viewModel.selectedModel?.id != model.selectedModel?.id
let update = viewModel.selectedModel?.inputId != model.selectedModel?.inputId
|| viewModel.selectors.count != model.selectors.count
|| viewModel.hasError != model.hasError
|| viewModel.surface != model.surface
@ -97,7 +97,7 @@ public class RadioButtonGroup: Control<DefaultRadioButtonGroupModel>, SelectorGr
open override func updateView(viewModel: ModelType) {
for selectorModel in viewModel.selectors {
//see if view is there for the model
if let foundSelectorView = findSelectorView(id: selectorModel.id) {
if let foundSelectorView = findSelectorView(inputId: selectorModel.inputId) {
foundSelectorView.set(with: selectorModel)
} else {

1
VDS/Components/RadioButton/RadioButtonModel.swift
View File

@ -64,7 +64,6 @@ extension RadioButtonModel {
}
public struct DefaultRadioButtonModel: RadioButtonModel {
public var id: UUID = UUID()
public var selected: Bool = false
public var labelText: String?

1
VDS/Components/Toggle/ToggleModel.swift
View File

@ -30,7 +30,6 @@ extension ToggleModel {
}
public struct DefaultToggleModel: ToggleModel {
public var id: UUID = UUID()
public var on: Bool = false
public var showText: Bool = false
public var offText: String = "Off"

1
VDS/Protocols/FormFieldable.swift
View File

@ -8,7 +8,6 @@
import Foundation
public protocol FormFieldable {
var id: UUID { get set }
var inputId: String? { get set }
var value: AnyHashable? { get set }
}

8
VDS/Protocols/SelectorGroupModelHandlerable.swift
View File

@ -17,9 +17,9 @@ public protocol SelectorGroupModelHandlerable: ModelHandlerable, Disabling, Surf
extension SelectorGroupModelHandlerable {
public func findSelectorView(id: UUID) -> ModelHandlerType? {
public func findSelectorView(inputId: String?) -> ModelHandlerType? {
return selectorViews.first(where: { existingSelectorView in
return existingSelectorView.model.id == id
return existingSelectorView.model.inputId == inputId
})
}
@ -51,7 +51,7 @@ extension SelectorGroupModelHandlerable {
public func getCachedSelector(viewModel: ModelHandlerType.ModelType) -> ModelHandlerType.ModelType? {
if let index = model.selectors.firstIndex(where: { element in
return element.id == viewModel.id
return element.inputId == viewModel.inputId
}) {
return model.selectors[index]
} else {
@ -61,7 +61,7 @@ extension SelectorGroupModelHandlerable {
public func replace(viewModel: ModelHandlerType.ModelType){
if let index = model.selectors.firstIndex(where: { element in
return element.id == viewModel.id
return element.inputId == viewModel.inputId
}) {
model.selectors[index] = viewModel
}