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

Merge branch 'hotfix/checkbox-isSelected' into 'release/20_1_0'

Browse Source 
HotFix Checkbox/CheckboxLabel

### Summary
reverted to old code so that if isSelected is set manually, the form will validate.

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

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1163
This commit is contained in:
Hedden, Kyle Matthew 2024-08-02 19:49:04 +00:00
commit 5eca67fe0f
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift
View File

@ -38,6 +38,13 @@ import VDS
}
}
override open var isSelected: Bool {
didSet {
viewModel?.selected = isSelected
_ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
}
}
//--------------------------------------------------
// MARK: - Initializers
//--------------------------------------------------
@ -66,16 +73,6 @@ import VDS
isSelected = isChecked
}
open override func setup() {
super.setup()
publisher(for: .valueChanged)
.sink { [weak self] control in
guard let self, isEnabled else { return }
viewModel?.selected = isSelected
_ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
}.store(in: &subscribers)
}
//--------------------------------------------------
// MARK: - Actions
//--------------------------------------------------
@ -136,8 +133,11 @@ import VDS
//properties
isEnabled = viewModel.enabled && !viewModel.readOnly
isAnimated = viewModel.animated
isSelected = viewModel.selected
//call super here to go around the didSet
//in this class
super.isSelected = viewModel.selected
//events
viewModel.updateUI = {
MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in

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

@ -19,22 +19,14 @@ import VDS
var fieldKey: String?
var fieldValue: JSONValue?
var groupName: String?
//--------------------------------------------------
// MARK: - Life Cycle
//--------------------------------------------------
open override func setup() {
super.setup()
publisher(for: .valueChanged)
.sink { [weak self] control in
guard let self, isEnabled else { return }
viewModel?.checkbox.selected = isSelected
_ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
}.store(in: &subscribers)
override open var isSelected: Bool {
didSet {
viewModel?.checkbox.selected = isSelected
_ = FormValidator.validate(delegate: delegateObject?.formHolderDelegate)
}
}
//--------------------------------------------------
// MARK: - Atomic
//--------------------------------------------------
@ -73,8 +65,11 @@ import VDS
//properties
isAnimated = viewModel.checkbox.animated
isEnabled = viewModel.checkbox.enabled && !viewModel.checkbox.readOnly
isSelected = viewModel.checkbox.selected
//call super here to go around the didSet
//in this class
super.isSelected = viewModel.checkbox.selected
//events
viewModel.checkbox.updateUI = {
MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in