Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
db018ac32b
commit
036d9462a8
@ -7,7 +7,7 @@
|
||||
|
||||
import Foundation
|
||||
import UIKit
|
||||
|
||||
import Combine
|
||||
|
||||
public protocol SelectorGroupModel<SelectorType>: Modelable, FormFieldable {
|
||||
associatedtype SelectorType: SelectorModel
|
||||
@ -32,19 +32,19 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
|
||||
public var selectorViews: [SelectorHandlerType] = []
|
||||
public var selectedModel: SelectorType?
|
||||
public var onChange: Blocks.ActionBlock?
|
||||
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Private Properties
|
||||
//--------------------------------------------------
|
||||
private var mainStackView: UIStackView = {
|
||||
let stackView = UIStackView()
|
||||
let stackView = UIStackView()
|
||||
stackView.translatesAutoresizingMaskIntoConstraints = false
|
||||
stackView.alignment = .top
|
||||
stackView.axis = .vertical
|
||||
stackView.spacing = 10
|
||||
return stackView
|
||||
}()
|
||||
|
||||
|
||||
//--------------------------------------------------
|
||||
// MARK: - Overrides
|
||||
//--------------------------------------------------
|
||||
@ -58,7 +58,7 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
|
||||
model.selectors = selectors
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
override public var surface: Surface {
|
||||
didSet {
|
||||
let selectors = model.selectors.compactMap { existing in
|
||||
@ -69,29 +69,29 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
|
||||
model.selectors = selectors
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
open override func setup() {
|
||||
super.setup()
|
||||
|
||||
|
||||
isAccessibilityElement = true
|
||||
accessibilityTraits = .button
|
||||
addSubview(mainStackView)
|
||||
|
||||
|
||||
mainStackView.topAnchor.constraint(equalTo: topAnchor).isActive = true
|
||||
mainStackView.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
|
||||
mainStackView.trailingAnchor.constraint(equalTo: trailingAnchor).isActive = true
|
||||
mainStackView.bottomAnchor.constraint(equalTo: bottomAnchor).isActive = true
|
||||
}
|
||||
|
||||
|
||||
open override func shouldUpdateView(viewModel: ModelType) -> Bool {
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
open override func updateView(viewModel: ModelType) {
|
||||
print("Selector Group update:")
|
||||
func findSelectorView(inputId: String) -> SelectorHandlerType? {
|
||||
return selectorViews.first(where: { existingSelectorView in
|
||||
return existingSelectorView.model.inputId == inputId
|
||||
return existingSelectorView.model.inputId == inputId
|
||||
})
|
||||
}
|
||||
|
||||
@ -109,8 +109,8 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
|
||||
self?.didSelect(selected: model)
|
||||
}.store(in: &cancellables)
|
||||
|
||||
//add model update to the subscribers
|
||||
newSelectorView.$model.sink { [weak self] model in
|
||||
//should replace
|
||||
if let cached = self?.getCachedSelector(viewModel: model), newSelectorView.shouldUpdateView(viewModel: cached) {
|
||||
self?.replace(viewModel: model)
|
||||
}
|
||||
@ -122,7 +122,7 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public func getCachedSelector(viewModel: SelectorType) -> SelectorType? {
|
||||
if let index = model.selectors.firstIndex(where: { element in
|
||||
return element.id == viewModel.id
|
||||
@ -142,4 +142,5 @@ open class SelectorGroup<SelectorType, SelectorGroupType: SelectorGroupModel<Sel
|
||||
}
|
||||
|
||||
open func didSelect(selected: SelectorType) { }
|
||||
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user