updated control

and subcontrols

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

VDS/Classes/Control.swift

@@ -17,7 +17,7 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab
     //--------------------------------------------------
     public var subject = PassthroughSubject<Void, Never>()
     public var subscribers = Set<AnyCancellable>()
-    open var onClickSubscriber: AnyCancellable? {
+    internal var onClickSubscriber: AnyCancellable? {
         willSet {
             if let onClickSubscriber {
                 onClickSubscriber.cancel()
@@ -27,7 +27,7 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab
             enabledHighlight = onClickSubscriber != nil
         }
     }
-    
+        
     //--------------------------------------------------
     // MARK: - Properties
     //--------------------------------------------------
@@ -109,7 +109,7 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab
         sendActions(for: .touchUpInside)
         return true
     }
-    
+     
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------

VDS/Components/Checkbox/Checkbox.swift

@@ -12,22 +12,9 @@ import VDSFormControlsTokens
 import Combine
 
 /// Checkboxes are a multi-select component through which a customer indicates a choice. If a binary choice, the component is a checkbox. If the choice has multiple options, the component is a ``CheckboxGroup``.
-@objc(VDSCheckbox)
-public class Checkbox: CheckboxBase{}
-
-@objc(VDSSoloCheckbox)
-public class SoloCheckbox: CheckboxBase{
-    public override func initialSetup() {
-        super.initialSetup()
-        onClickSubscriber = publisher(for: .touchUpInside)
-            .sink { control in
-                control.toggle()
-            }
-    }
-}
-
 @objc(VDSCheckboxBase)
-open class CheckboxBase: Control, Errorable {
+open class Checkbox: Control, Errorable, Clickable {
+    
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -76,6 +63,8 @@ open class CheckboxBase: Control, Errorable {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
+    open var onClick: ((Checkbox) -> ())? { didSet { setupOnClick() }}
+
     open var label = Label().with {
         $0.setContentCompressionResistancePriority(.required, for: .vertical)
         $0.textPosition = .left
@@ -164,6 +153,13 @@ open class CheckboxBase: Control, Errorable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
+    open override func initialSetup() {
+        super.initialSetup()
+        onClick = { control in
+            control.toggle()
+        }
+    }
+
     open override func setup() {
         super.setup()
 

VDS/Components/Checkbox/CheckboxGroup.swift

@@ -9,31 +9,24 @@ import Foundation
 import UIKit
 
 @objc(VDSCheckboxGroup)
-public class CheckboxGroup: CheckboxGroupBase<Checkbox> {
+public class CheckboxGroup: SelectorGroupHandlerBase<Checkbox> {
-    public override func didSelect(_ selectedControl: Checkbox) {
-        selectedControl.toggle()
-        if selectedControl.isSelected, showError{
-            showError.toggle()
-        }
-        valueChanged()
-    }
-}
-
-public class CheckboxGroupBase<HandlerType: CheckboxBase>: SelectorGroupHandlerBase<HandlerType> {
 
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    
+    public var selectedHandlers: [Checkbox]? {
-    public override var selectorViews: [HandlerType] {
+        let selected = selectorViews.filter{ $0.isSelected == true }
+        guard selected.count > 0 else { return nil }
+        return selected
+    }
+
+    public override var selectorViews: [Checkbox] {
         didSet {
             for selector in selectorViews {
                 if !mainStackView.arrangedSubviews.contains(selector) {
-                    selector
+                    selector.onClick = { [weak self] handler in
-                        .publisher(for: .touchUpInside)
+                        self?.didSelect(handler)
-                        .sink { [weak self] handler in
+                    }
-                            self?.didSelect(handler)
-                        }.store(in: &subscribers)
                     mainStackView.addArrangedSubview(selector)
                 }
             }
@@ -79,11 +72,13 @@ public class CheckboxGroupBase<HandlerType: CheckboxBase>: SelectorGroupHandlerB
         
         mainStackView.pinToSuperView()
     }
-    
+        
-    public var selectedHandlers: [HandlerType]? {
+    public override func didSelect(_ selectedControl: Checkbox) {
-        let selected = selectorViews.filter{ $0.isSelected == true }
+        selectedControl.toggle()
-        guard selected.count > 0 else { return nil }
+        if selectedControl.isSelected, showError{
-        return selected
+            showError.toggle()
+        }
+        valueChanged()
     }
 }
 

VDS/Components/Notification/Notification.swift

@@ -106,6 +106,8 @@ public class Notification: View {
         $0.use = .secondary
     }
     
+    open var onCloseClick: ((Notification)->())?
+    
     //--------------------------------------------------
     // MARK: - Modal Properties
     //--------------------------------------------------
@@ -163,7 +165,8 @@ public class Notification: View {
         mainStackView.addArrangedSubview(closeButton)
                 
         closeButton.publisher(for: UITapGestureRecognizer()).sink { [weak self] _ in
-            self?.didClickOnCloseButton()
+            guard let self else { return }
+            self.onCloseClick?(self)
         }.store(in: &subscribers)
         
         //labels
@@ -227,22 +230,14 @@ public class Notification: View {
         if let primaryButtonModel {
             primaryButton.text = primaryButtonModel.text
             primaryButton.surface = surface
-            primaryButton.onClickSubscriber = primaryButton
+            primaryButton.onClick = primaryButtonModel.onClick
-                .publisher(for: .touchUpInside)
-                .sink(receiveValue: { button in
-                    primaryButtonModel.onClick(button)
-            })
             buttons.append(primaryButton)
         }
         
         if let secondaryButtonModel {
             secondaryButton.text = secondaryButtonModel.text
             secondaryButton.surface = surface
-            secondaryButton.onClickSubscriber = secondaryButton
+            secondaryButton.onClick = secondaryButtonModel.onClick
-                .publisher(for: .touchUpInside)
-                .sink(receiveValue: { button in
-                    secondaryButtonModel.onClick(button)
-            })
             buttons.append(secondaryButton)
         }
         
@@ -260,9 +255,5 @@ public class Notification: View {
                 .pinTrailing()
         }
     }
-    
-    func didClickOnCloseButton() {
-        print("Notification close button clicked!!!")
-    }
 }
 

VDS/Components/RadioBox/RadioBox.swift

@@ -12,22 +12,8 @@ import VDSFormControlsTokens
 import Combine
 
 @objc(VDSRadioBox)
-public class RadioBox: RadioBoxBase{}
+open class RadioBox: Control, Clickable {
-
-@objc(VDSSoloRadioBox)
-public class SoloRadioBox: RadioBoxBase{
     
-    public override func initialSetup() {
-        super.initialSetup()
-        onClickSubscriber = publisher(for: .touchUpInside)
-            .sink { control in
-                control.toggle()
-            }
-    }
-}
-
-@objc(VDSRadioBoxBase)
-open class RadioBoxBase: Control{
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -70,6 +56,8 @@ open class RadioBoxBase: Control{
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
+    open var onClick: ((RadioBox) -> ())? { didSet { setupOnClick() }}
+
     open var textLabel = Label().with {
         $0.setContentCompressionResistancePriority(.required, for: .vertical)
         $0.textPosition = .left
@@ -138,7 +126,13 @@ open class RadioBoxBase: Control{
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-  
+    open override func initialSetup() {
+        super.initialSetup()
+        onClick = { control in
+            control.toggle()
+        }
+    }
+
     open override func setup() {
         super.setup()
 

VDS/Components/RadioBox/RadioBoxGroup.swift

@@ -9,30 +9,18 @@ import Foundation
 import UIKit
 
 @objc(VDSRadioBoxGroup)
-public class RadioBoxGroup: RadioBoxGroupBase<RadioBox> {
+public class RadioBoxGroup: SelectorGroupSelectedHandlerBase<RadioBox> {
-    
-    public override func didSelect(_ selectedControl: RadioBox) {
-        let oldSelectedControl = selectorViews.filter { $0.isSelected == true }.first
-        oldSelectedControl?.toggle()
-        selectedControl.toggle()
-        valueChanged()
-    }
-}
-
-public class RadioBoxGroupBase<HandlerType: RadioBoxBase>: SelectorGroupSelectedHandlerBase<HandlerType> {
     
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    public override var selectorViews: [HandlerType] {
+    public override var selectorViews: [RadioBox] {
         didSet {
             for selector in selectorViews {
                 if !mainStackView.arrangedSubviews.contains(selector) {
-                    selector
+                    selector.onClick = { [weak self] handler in
-                        .publisher(for: .touchUpInside)
+                        self?.didSelect(handler)
-                        .sink { [weak self] handler in
+                    }
-                            self?.didSelect(handler)
-                        }.store(in: &subscribers)
                     mainStackView.addArrangedSubview(selector)
                 }
             }
@@ -84,4 +72,11 @@ public class RadioBoxGroupBase<HandlerType: RadioBoxBase>: SelectorGroupSelected
                 }
             }.store(in: &subscribers)
     }
+    
+    open override func didSelect(_ selectedControl: RadioBox) {
+        let oldSelectedControl = selectorViews.filter { $0.isSelected == true }.first
+        oldSelectedControl?.toggle()
+        selectedControl.toggle()
+        valueChanged()
+    }
 }

VDS/Components/RadioButton/RadioButton.swift

@@ -11,30 +11,8 @@ import VDSColorTokens
 import VDSFormControlsTokens
 
 @objc(VDSRadioButton)
-public class RadioButton: RadioButtonBase {
+open class RadioButton: Control, Errorable, Clickable {
-    //for groups allows "toggle"
+    
-    open override func toggle() {
-        //removed error
-        if showError && isSelected == false {
-            showError.toggle()
-        }
-        isSelected.toggle()
-    }
-}
-
-@objc(VDSSoloRadioButton)
-public class SoloRadioButton: RadioButtonBase {
-    public override func initialSetup() {
-        super.initialSetup()
-        onClickSubscriber = publisher(for: .touchUpInside)
-            .sink { control in
-                control.toggle()
-            }
-    }
-}
-
-@objc(VDSRadioButtonBase)
-open class RadioButtonBase: Control, Errorable {
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -83,6 +61,8 @@ open class RadioButtonBase: Control, Errorable {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
+    open var onClick: ((RadioButton) -> ())? { didSet { setupOnClick() } }
+
     open var label = Label().with {
         $0.setContentCompressionResistancePriority(.required, for: .vertical)
         $0.textPosition = .left
@@ -158,7 +138,13 @@ open class RadioButtonBase: Control, Errorable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-    
+    open override func initialSetup() {
+        super.initialSetup()
+        onClick = { control in
+            control.toggle()
+        }
+    }
+
     open override func setup() {
         super.setup()
         

VDS/Components/RadioButton/RadioButtonGroup.swift

@@ -9,32 +9,18 @@ import Foundation
 import UIKit
 
 @objc(VDSRadioButtonGroup)
-public class RadioButtonGroup: RadioButtonGroupBase<RadioButton> {
+public class RadioButtonGroup: SelectorGroupSelectedHandlerBase<RadioButton> {
-    
-    public override func didSelect(_ selectedControl: RadioButton) {
-        selectedHandler?.toggle()
-        selectedControl.toggle()
-        if showError {
-            showError = false
-        }
-        valueChanged()
-    }
-}
-
-public class RadioButtonGroupBase<HandlerType: RadioButtonBase>: SelectorGroupSelectedHandlerBase<HandlerType> {
     
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    public override var selectorViews: [HandlerType] {
+    public override var selectorViews: [RadioButton] {
         didSet {
             for selector in selectorViews {
                 if !mainStackView.arrangedSubviews.contains(selector) {
-                    selector
+                    selector.onClick = { [weak self] handler in
-                        .publisher(for: .touchUpInside)
+                        self?.didSelect(handler)
-                        .sink { [weak self] handler in
+                    }
-                            self?.didSelect(handler)
-                        }.store(in: &subscribers)
                     mainStackView.addArrangedSubview(selector)
                 }
             }
@@ -81,4 +67,22 @@ public class RadioButtonGroupBase<HandlerType: RadioButtonBase>: SelectorGroupSe
         
         mainStackView.pinToSuperView()
     }
+    
+    public override func didSelect(_ selectedControl: RadioButton) {
+        if let selectedHandler {
+            updateToggle(selectedHandler)
+        }
+        updateToggle(selectedControl)
+        if showError {
+            showError = false
+        }
+        valueChanged()
+    }
+    
+    private func updateToggle(_ radioButton: RadioButton) {
+        if radioButton.showError && radioButton.isSelected == false {
+            radioButton.showError.toggle()
+        }
+        radioButton.isSelected.toggle()
+    }
 }

VDS/Components/RadioSwatch/RadioSwatch.swift

@@ -12,26 +12,7 @@ import VDSFormControlsTokens
 import Combine
 
 @objc(VDSRadioSwatch)
-public class RadioSwatch: RadioSwatchBase{
+open class RadioSwatch: Control, Clickable {
-    //for groups allows "toggle"
-    open override func toggle() {
-        isSelected.toggle()
-    }
-}
-
-@objc(VDSSoloRadioSwatch)
-public class SolorRadioSwatch: RadioSwatchBase{
-    public override func initialSetup() {
-        super.initialSetup()
-        onClickSubscriber = publisher(for: .touchUpInside)
-            .sink { control in
-                control.toggle()
-            }
-    }
-}
-
-@objc(VDSRadioSwatchBase)
-open class RadioSwatchBase: Control {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -51,6 +32,8 @@ open class RadioSwatchBase: Control {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
+    open var onClick: ((RadioSwatch) -> ())? { didSet { setupOnClick() } }
+    
     public var selectorView = UIView().with {
         $0.translatesAutoresizingMaskIntoConstraints = false
     }
@@ -78,7 +61,13 @@ open class RadioSwatchBase: Control {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
-  
+    open override func initialSetup() {
+        super.initialSetup()
+        onClick =  { control in
+            control.toggle()
+        }
+    }
+
     open override func setup() {
         super.setup()
         

VDS/Components/RadioSwatch/RadioSwatchGroup.swift

@@ -10,24 +10,12 @@ import UIKit
 import Combine
 
 @objc(VDSRadioSwatchGroup)
-public class RadioSwatchGroup: RadioSwatchGroupBase<RadioSwatch> {
+public class RadioSwatchGroup: SelectorGroupSelectedHandlerBase<RadioSwatch>, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UICollectionViewDelegate {
-    
-    public override func didSelect(selector: RadioSwatch) {        
-        selectedHandler?.toggle()
-        selector.toggle()
-        label.text = selector.text
-        didChange()
-        valueChanged()
-    }
-    
-}
-
-public class RadioSwatchGroupBase<HandlerType: RadioSwatchBase>: SelectorGroupSelectedHandlerBase<HandlerType>, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout, UICollectionViewDelegate {
 
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    public override var selectorViews: [HandlerType] {
+    public override var selectorViews: [RadioSwatch] {
         didSet {
             collectionView.reloadData()
         }
@@ -160,18 +148,20 @@ public class RadioSwatchGroupBase<HandlerType: RadioSwatchBase>: SelectorGroupSe
     public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "collectionViewCell", for: indexPath)
         let handler = selectorViews[indexPath.row]
-        handler.subscribers.forEach{ $0.cancel() }
+        handler.onClick = { [weak self] handler in
-        handler.subscribers.removeAll()
-        handler.publisher(for: .touchUpInside).sink { [weak self] handler in
             self?.didSelect(selector: handler)
-        }.store(in: &handler.subscribers)
+        }
         cell.subviews.forEach { $0.removeFromSuperview() }
         cell.addSubview(handler)
         handler.pinToSuperView()
         return cell
     }
     
-    open func didSelect(selector: HandlerType) {
+    public func didSelect(selector: RadioSwatch) {
-        fatalError("Must override didSelect")
+        selectedHandler?.toggle()
+        selector.toggle()
+        label.text = selector.text
+        didChange()
+        valueChanged()
     }
 }

VDS/Components/TileContainer/TileContainer.swift

@@ -11,7 +11,12 @@ import VDSFormControlsTokens
 import UIKit
 
 @objc(VDSTileContainer)
-open class TileContainer: Control {
+open class TileContainer: TileContainerBase, Clickable {
+    public var onClick: ((TileContainer) -> ())? { didSet { setupOnClick() } }    
+}
+
+@objc(VDSTileContainerBase)
+open class TileContainerBase: Control {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -310,13 +315,13 @@ open class TileContainer: Control {
     }
 }
 
-extension TileContainer {
+extension TileContainerBase {
     class BackgroundColorConfiguration: ObjectColorable {
-        typealias ObjectType = TileContainer
+        typealias ObjectType = TileContainerBase
         
         required init() { }
 
-        func getColor(_ object: TileContainer) -> UIColor {
+        func getColor(_ object: TileContainerBase) -> UIColor {
             switch object.color {
                 
             case .white:

VDS/Components/Tilelet/Tilelet.swift

@@ -12,7 +12,8 @@ import UIKit
 import Combine
 
 @objc(VDSTilelet)
-open class Tilelet: TileContainer {
+open class Tilelet: TileContainerBase, Clickable {
+    
     //--------------------------------------------------
     // MARK: - Enums
     //--------------------------------------------------
@@ -62,7 +63,9 @@ open class Tilelet: TileContainer {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------
-    open override var onClickSubscriber: AnyCancellable? {
+    open var onClick: ((Tilelet) -> ())? { didSet { setupOnClick() } }
+    
+    internal override var onClickSubscriber: AnyCancellable? {
         didSet {
             isAccessibilityElement = onClickSubscriber != nil
         }

VDS/Components/Toggle/Toggle.swift

@@ -18,18 +18,7 @@ import Combine
  Knob: The circular indicator that slides on the container.
  */
 @objc(VDSToggle)
-public class Toggle: ToggleBase{
+open class Toggle: Control, Clickable {
-    public override func initialSetup() {
-        super.initialSetup()
-        publisher(for: .touchUpInside)
-            .sink { control in
-                control.toggle()
-            }.store(in: &subscribers)
-    }
-}
-
-@objc(VDSToggleBase)
-open class ToggleBase: Control {
     //--------------------------------------------------
     // MARK: - Enums
     //--------------------------------------------------
@@ -64,6 +53,7 @@ open class ToggleBase: Control {
     // MARK: - Private Properties
     //--------------------------------------------------
     private var stackView = UIStackView().with {
+        $0.isUserInteractionEnabled = false
         $0.translatesAutoresizingMaskIntoConstraints = false
         $0.axis = .horizontal
         $0.distribution = .fill
@@ -81,6 +71,8 @@ open class ToggleBase: Control {
     //--------------------------------------------------
     // MARK: - Configuration Properties
     //--------------------------------------------------
+    open var onClick: ((Toggle) -> ())? { didSet { setupOnClick() } }
+    
     // Sizes are from InVision design specs.
     public let toggleSize = CGSize(width: 52, height: 24)
     public let toggleContainerSize = CGSize(width: 52, height: 44)
@@ -223,14 +215,16 @@ open class ToggleBase: Control {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
+    open override func initialSetup() {
+        super.initialSetup()
+        onClick = { control in
+            control.toggle()
+        }
+    }
+    
     open override func setup() {
         super.setup()
-        
+                
-        //add tapGesture to self
-        publisher(for: UITapGestureRecognizer()).sink { [weak self] _ in
-            self?.sendActions(for: .touchUpInside)
-        }.store(in: &subscribers)
-        
         isAccessibilityElement = true
         accessibilityTraits = .button
         addSubview(stackView)
@@ -288,7 +282,7 @@ open class ToggleBase: Control {
         toggleView.backgroundColor = toggleColorConfiguration.getColor(self)
         knobView.backgroundColor = knobColorConfiguration.getColor(self)
     }
-    
+  
     /// This will toggle the state of the Toggle and execute the actionBlock if provided.
     open func toggle() {
         isOn.toggle()