fix for error
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
eeabdba54c
commit
c498c1ded3
@ -88,7 +88,7 @@ open class SelectorBase<ModelType: SelectorModel>: Control<ModelType>, Changable
|
|||||||
open var childText: String?
|
open var childText: String?
|
||||||
|
|
||||||
@Proxy(\.model.hasError)
|
@Proxy(\.model.hasError)
|
||||||
open var showError: Bool
|
open var hasError: Bool
|
||||||
|
|
||||||
@Proxy(\.model.errorText)
|
@Proxy(\.model.errorText)
|
||||||
open var errorText: String?
|
open var errorText: String?
|
||||||
@ -261,6 +261,10 @@ open class SelectorBase<ModelType: SelectorModel>: Control<ModelType>, Changable
|
|||||||
|
|
||||||
/// This will checkbox the state of the Checkbox and execute the actionBlock if provided.
|
/// This will checkbox the state of the Checkbox and execute the actionBlock if provided.
|
||||||
@objc open func toggleAndAction() {
|
@objc open func toggleAndAction() {
|
||||||
|
//removed error
|
||||||
|
if hasError && isSelected == false {
|
||||||
|
hasError.toggle()
|
||||||
|
}
|
||||||
isSelected.toggle()
|
isSelected.toggle()
|
||||||
onChange?()
|
onChange?()
|
||||||
}
|
}
|
||||||
@ -286,12 +290,13 @@ open class SelectorBase<ModelType: SelectorModel>: Control<ModelType>, Changable
|
|||||||
/// Follow the SwiftUI View paradigm
|
/// Follow the SwiftUI View paradigm
|
||||||
/// - Parameter viewModel: state
|
/// - Parameter viewModel: state
|
||||||
open override func shouldUpdateView(viewModel: ModelType) -> Bool {
|
open override func shouldUpdateView(viewModel: ModelType) -> Bool {
|
||||||
return viewModel.selected != model.selected
|
let update = viewModel.selected != model.selected
|
||||||
|| viewModel.labelText != model.labelText
|
|| viewModel.labelText != model.labelText
|
||||||
|| viewModel.childText != model.childText
|
|| viewModel.childText != model.childText
|
||||||
|| viewModel.hasError != model.hasError
|
|| viewModel.hasError != model.hasError
|
||||||
|| viewModel.surface != model.surface
|
|| viewModel.surface != model.surface
|
||||||
|| viewModel.disabled != model.disabled
|
|| viewModel.disabled != model.disabled
|
||||||
|
return update
|
||||||
}
|
}
|
||||||
|
|
||||||
open override func updateView(viewModel: ModelType) {
|
open override func updateView(viewModel: ModelType) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user