Merge branch 'feature/Clickable' into 'develop'

updated button for onClickPublisher

See merge request BPHV_MIPS/vds_ios!51

VDS.xcodeproj/project.pbxproj

@@ -7,6 +7,10 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		445BA07829C07B3D0036A7C5 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 445BA07729C07B3D0036A7C5 /* Notification.swift */; };
+		44604AD029CE17EC00E62B51 /* NotificationTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604ACF29CE17EC00E62B51 /* NotificationTitleModel.swift */; };
+		44604AD229CE180F00E62B51 /* NotificationSubTitleModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD129CE180F00E62B51 /* NotificationSubTitleModel.swift */; };
+		44604AD429CE186A00E62B51 /* NotificationButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD329CE186A00E62B51 /* NotificationButtonModel.swift */; };
 		44604AD729CE196600E62B51 /* Line.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44604AD629CE196600E62B51 /* Line.swift */; };
 		5F21D7BF28DCEB3D003E7CD6 /* Useable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F21D7BE28DCEB3D003E7CD6 /* Useable.swift */; };
 		5FC35BE328D51405004EBEAC /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FC35BE228D51405004EBEAC /* Button.swift */; };
@@ -44,7 +48,6 @@
 		EA5E30532950DDA60082B959 /* TitleLockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E30522950DDA60082B959 /* TitleLockup.swift */; };
 		EA5E3058295105A40082B959 /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E3057295105A40082B959 /* Tilelet.swift */; };
 		EA5E305A29510F8B0082B959 /* EnumSubset.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5E305929510F8B0082B959 /* EnumSubset.swift */; };
-		EA89200228AECF2A006B9984 /* UIButton+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200128AECF2A006B9984 /* UIButton+Publisher.swift */; };
 		EA89200428AECF4B006B9984 /* UITextField+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */; };
 		EA89200628B526D6006B9984 /* CheckboxGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89200528B526D6006B9984 /* CheckboxGroup.swift */; };
 		EA89201328B568D8006B9984 /* RadioBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA89201228B568D8006B9984 /* RadioBox.swift */; };
@@ -76,7 +79,6 @@
 		EAB1D29C28A5618900DAE764 /* RadioButtonGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D29B28A5618900DAE764 /* RadioButtonGroup.swift */; };
 		EAB1D2CD28ABE76100DAE764 /* Withable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2CC28ABE76000DAE764 /* Withable.swift */; };
 		EAB1D2CF28ABEF2B00DAE764 /* Typography.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2CE28ABEF2B00DAE764 /* Typography.swift */; };
-		EAB1D2E628AE842000DAE764 /* Publisher+Bind.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2E328AE842000DAE764 /* Publisher+Bind.swift */; };
 		EAB1D2EA28AE84AA00DAE764 /* UIControlPublisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB1D2E928AE84AA00DAE764 /* UIControlPublisher.swift */; };
 		EAB5FED429267EB300998C17 /* UIView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FED329267EB300998C17 /* UIView.swift */; };
 		EAB5FEED2927E1B200998C17 /* ButtonGroupPositionLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAB5FEEC2927E1B200998C17 /* ButtonGroupPositionLayout.swift */; };
@@ -91,6 +93,7 @@
 		EAC9258C2911C9DE00091998 /* InputField.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC925872911C9DE00091998 /* InputField.swift */; };
 		EAC9258F2911C9DE00091998 /* EntryField.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAC9258B2911C9DE00091998 /* EntryField.swift */; };
 		EAD8D2C128BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAD8D2C028BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift */; };
+		EAF1FE9929D4850E00101452 /* Clickable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF1FE9829D4850E00101452 /* Clickable.swift */; };
 		EAF7F0952899861000B287F5 /* Checkbox.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F0932899861000B287F5 /* Checkbox.swift */; };
 		EAF7F09A2899B17200B287F5 /* CATransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F0992899B17200B287F5 /* CATransaction.swift */; };
 		EAF7F09E289AAEC000B287F5 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F09D289AAEC000B287F5 /* Constants.swift */; };
@@ -121,6 +124,10 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
+		445BA07729C07B3D0036A7C5 /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = "<group>"; };
+		44604ACF29CE17EC00E62B51 /* NotificationTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationTitleModel.swift; sourceTree = "<group>"; };
+		44604AD129CE180F00E62B51 /* NotificationSubTitleModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationSubTitleModel.swift; sourceTree = "<group>"; };
+		44604AD329CE186A00E62B51 /* NotificationButtonModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationButtonModel.swift; sourceTree = "<group>"; };
 		44604AD629CE196600E62B51 /* Line.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Line.swift; sourceTree = "<group>"; };
 		5F21D7BE28DCEB3D003E7CD6 /* Useable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Useable.swift; sourceTree = "<group>"; };
 		5FC35BE228D51405004EBEAC /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = "<group>"; };
@@ -159,7 +166,6 @@
 		EA5E30522950DDA60082B959 /* TitleLockup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockup.swift; sourceTree = "<group>"; };
 		EA5E3057295105A40082B959 /* Tilelet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tilelet.swift; sourceTree = "<group>"; };
 		EA5E305929510F8B0082B959 /* EnumSubset.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumSubset.swift; sourceTree = "<group>"; };
-		EA89200128AECF2A006B9984 /* UIButton+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIButton+Publisher.swift"; sourceTree = "<group>"; };
 		EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Publisher.swift"; sourceTree = "<group>"; };
 		EA89200528B526D6006B9984 /* CheckboxGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckboxGroup.swift; sourceTree = "<group>"; };
 		EA89201228B568D8006B9984 /* RadioBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioBox.swift; sourceTree = "<group>"; };
@@ -192,7 +198,6 @@
 		EAB1D29B28A5618900DAE764 /* RadioButtonGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RadioButtonGroup.swift; sourceTree = "<group>"; };
 		EAB1D2CC28ABE76000DAE764 /* Withable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Withable.swift; sourceTree = "<group>"; };
 		EAB1D2CE28ABEF2B00DAE764 /* Typography.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Typography.swift; sourceTree = "<group>"; };
-		EAB1D2E328AE842000DAE764 /* Publisher+Bind.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Publisher+Bind.swift"; sourceTree = "<group>"; };
 		EAB1D2E928AE84AA00DAE764 /* UIControlPublisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIControlPublisher.swift; sourceTree = "<group>"; };
 		EAB5FED329267EB300998C17 /* UIView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIView.swift; sourceTree = "<group>"; };
 		EAB5FEEC2927E1B200998C17 /* ButtonGroupPositionLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ButtonGroupPositionLayout.swift; sourceTree = "<group>"; };
@@ -206,6 +211,7 @@
 		EAC925872911C9DE00091998 /* InputField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InputField.swift; sourceTree = "<group>"; };
 		EAC9258B2911C9DE00091998 /* EntryField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EntryField.swift; sourceTree = "<group>"; };
 		EAD8D2C028BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIGestureRecognizer+Publisher.swift"; sourceTree = "<group>"; };
+		EAF1FE9829D4850E00101452 /* Clickable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Clickable.swift; sourceTree = "<group>"; };
 		EAF7F0932899861000B287F5 /* Checkbox.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Checkbox.swift; sourceTree = "<group>"; };
 		EAF7F0992899B17200B287F5 /* CATransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CATransaction.swift; sourceTree = "<group>"; };
 		EAF7F09D289AAEC000B287F5 /* Constants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
@@ -247,6 +253,17 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		445BA07629C07ABA0036A7C5 /* Notification */ = {
+			isa = PBXGroup;
+			children = (
+				445BA07729C07B3D0036A7C5 /* Notification.swift */,
+				44604ACF29CE17EC00E62B51 /* NotificationTitleModel.swift */,
+				44604AD129CE180F00E62B51 /* NotificationSubTitleModel.swift */,
+				44604AD329CE186A00E62B51 /* NotificationButtonModel.swift */,
+			);
+			path = Notification;
+			sourceTree = "<group>";
+		};
 		44604AD529CE195300E62B51 /* Line */ = {
 			isa = PBXGroup;
 			children = (
@@ -357,11 +374,12 @@
 				EA0FC2BE2912D18200DF80B4 /* Buttons */,
 				EAF7F092289985E200B287F5 /* Checkbox */,
 				EA985BF3296C609E00F2FF2E /* Icon */,
-				EA1F265F28B945070033E859 /* RadioSwatch */,
 				EA3362412892EF700071C351 /* Label */,
 				44604AD529CE195300E62B51 /* Line */,
+				445BA07629C07ABA0036A7C5 /* Notification */,
 				EA89200B28B530F0006B9984 /* RadioBox */,
 				EAF7F11428A1470D00B287F5 /* RadioButton */,
+				EA1F265F28B945070033E859 /* RadioSwatch */,
 				EAC925852911C9DE00091998 /* TextFields */,
 				EA5E304A294CBDBB0082B959 /* TileContainer */,
 				EA5E3056295105930082B959 /* Tilelet */,
@@ -400,6 +418,7 @@
 			isa = PBXGroup;
 			children = (
 				EA4DB2FC28D3D0CA00103EE3 /* AnyEquatable.swift */,
+				EAF1FE9829D4850E00101452 /* Clickable.swift */,
 				EAA5EEDF28F49DB3003B3210 /* Colorable.swift */,
 				EA3361A9288B25E40071C351 /* Disabling.swift */,
 				EA5E305929510F8B0082B959 /* EnumSubset.swift */,
@@ -557,8 +576,6 @@
 		EAB1D2E228AE842000DAE764 /* Publishers */ = {
 			isa = PBXGroup;
 			children = (
-				EAB1D2E328AE842000DAE764 /* Publisher+Bind.swift */,
-				EA89200128AECF2A006B9984 /* UIButton+Publisher.swift */,
 				EAB1D2E928AE84AA00DAE764 /* UIControlPublisher.swift */,
 				EA89200328AECF4B006B9984 /* UITextField+Publisher.swift */,
 				EAD8D2C028BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift */,
@@ -758,6 +775,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				445BA07829C07B3D0036A7C5 /* Notification.swift in Sources */,
 				EAF7F0B5289C126F00B287F5 /* UILabel.swift in Sources */,
 				EA5E304C294CBDD00082B959 /* TileContainer.swift in Sources */,
 				EAF7F0A6289B0CE000B287F5 /* Resetable.swift in Sources */,
@@ -774,6 +792,7 @@
 				EA33622E2891EA3C0071C351 /* DispatchQueue+Once.swift in Sources */,
 				EA4DB2FD28D3D0CA00103EE3 /* AnyEquatable.swift in Sources */,
 				EAA5EEB728ECC03A003B3210 /* ToolTipLabelAttribute.swift in Sources */,
+				44604AD029CE17EC00E62B51 /* NotificationTitleModel.swift in Sources */,
 				EA5E305A29510F8B0082B959 /* EnumSubset.swift in Sources */,
 				EA985BF7296C665E00F2FF2E /* IconName.swift in Sources */,
 				EAF7F0AF289B144C00B287F5 /* UnderlineLabelAttribute.swift in Sources */,
@@ -800,6 +819,7 @@
 				EAF7F13328A2A16500B287F5 /* AttachmentLabelAttributeModel.swift in Sources */,
 				EA0FC2C62914222900DF80B4 /* ButtonGroup.swift in Sources */,
 				EA89200628B526D6006B9984 /* CheckboxGroup.swift in Sources */,
+				44604AD429CE186A00E62B51 /* NotificationButtonModel.swift in Sources */,
 				EAD8D2C128BFDE8B006EB6A6 /* UIGestureRecognizer+Publisher.swift in Sources */,
 				EAF7F0B9289C139800B287F5 /* ColorConfiguration.swift in Sources */,
 				EA3361BD288B2C760071C351 /* TypeAlias.swift in Sources */,
@@ -807,6 +827,8 @@
 				EAF7F09A2899B17200B287F5 /* CATransaction.swift in Sources */,
 				EAF7F0A2289AFB3900B287F5 /* Errorable.swift in Sources */,
 				EA985C7D297DAED300F2FF2E /* Primitive.swift in Sources */,
+				EAF1FE9929D4850E00101452 /* Clickable.swift in Sources */,
+				44604AD229CE180F00E62B51 /* NotificationSubTitleModel.swift in Sources */,
 				EAB5FEF829393A7200998C17 /* ButtonGroupConstants.swift in Sources */,
 				EA3361AF288B26310071C351 /* FormFieldable.swift in Sources */,
 				44604AD729CE196600E62B51 /* Line.swift in Sources */,
@@ -817,7 +839,6 @@
 				EA985C1D296CD13600F2FF2E /* BundleManager.swift in Sources */,
 				EA1F266528B945070033E859 /* RadioSwatch.swift in Sources */,
 				EA4DB18528CA967F00103EE3 /* SelectorGroupHandlerBase.swift in Sources */,
-				EA89200228AECF2A006B9984 /* UIButton+Publisher.swift in Sources */,
 				EAF7F0AB289B13FD00B287F5 /* TextStyleLabelAttribute.swift in Sources */,
 				EAB1D29C28A5618900DAE764 /* RadioButtonGroup.swift in Sources */,
 				EA985BE629688F6A00F2FF2E /* TileletBadgeModel.swift in Sources */,
@@ -826,7 +847,6 @@
 				EA5E30532950DDA60082B959 /* TitleLockup.swift in Sources */,
 				EAA5EEB528ECBFB4003B3210 /* ImageLabelAttribute.swift in Sources */,
 				EAB5FF0129424ACB00998C17 /* UIControl.swift in Sources */,
-				EAB1D2E628AE842000DAE764 /* Publisher+Bind.swift in Sources */,
 				EA985BF5296C60C000F2FF2E /* Icon.swift in Sources */,
 				EA3361AA288B25E40071C351 /* Disabling.swift in Sources */,
 				EA3361B6288B2A410071C351 /* Control.swift in Sources */,

VDS/Classes/Control.swift

@@ -10,22 +10,19 @@ import UIKit
 import Combine
 
 @objc(VDSControl)
-open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoable {
+open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoable, Clickable {
 
     //--------------------------------------------------
     // MARK: - Combine Properties
     //--------------------------------------------------
     public var subject = PassthroughSubject<Void, Never>()
     public var subscribers = Set<AnyCancellable>()
-    open var onClickSubscriber: AnyCancellable? {
+    public var onClickSubscriber: AnyCancellable? {
         willSet {
             if let onClickSubscriber {
                 onClickSubscriber.cancel()
             }
         }
-        didSet {
-            enabledHighlight = onClickSubscriber != nil
-        }
     }
         
     //--------------------------------------------------
@@ -41,12 +38,12 @@ open class Control: UIControl, Handlerable, ViewProtocol, Resettable, UserInfoab
         
     open override var isSelected: Bool { didSet { didChange() } }
     
-    internal var enabledHighlight: Bool = false
+    public var touchUpInsideCount: Int = 0
     
     var isHighlightAnimating = false
     open override var isHighlighted: Bool {
         didSet {
-            if isHighlightAnimating == false && enabledHighlight {
+            if isHighlightAnimating == false && touchUpInsideCount > 0 {
                 isHighlightAnimating = true
                 UIView.animate(withDuration: 0.1, animations: { [weak self] in
                     self?.updateView()

VDS/Components/Buttons/Button/ButtonBase.swift

@@ -18,7 +18,8 @@ public protocol Buttonable: UIControl, Surfaceable, Disabling {
 }
 
 @objc(VDSButtonBase)
-open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettable, UserInfoable {
+open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettable, UserInfoable, Clickable {
+    
     //--------------------------------------------------
     // MARK: - Configuration Properties
     //--------------------------------------------------
@@ -29,6 +30,13 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
     //--------------------------------------------------
     public var subject = PassthroughSubject<Void, Never>()
     public var subscribers = Set<AnyCancellable>()
+    public var onClickSubscriber: AnyCancellable? {
+        willSet {
+            if let onClickSubscriber {
+                onClickSubscriber.cancel()
+            }
+        }
+    }
 
     //--------------------------------------------------
     // MARK: - Private Properties
@@ -50,10 +58,13 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
     
     open var userInfo = [String: Primitive]()
 
-    var isHighlightAnimating = false
+    public var touchUpInsideCount: Int = 0
+    
+    internal var isHighlightAnimating = false
+    
     open override var isHighlighted: Bool {
         didSet {
-            if isHighlightAnimating == false {
+            if isHighlightAnimating == false && touchUpInsideCount > 0 {
                 isHighlightAnimating = true
                 UIView.animate(withDuration: 0.1, animations: { [weak self] in
                     self?.updateView()
@@ -227,4 +238,3 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
     }
 
 }
-

VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift

@@ -172,9 +172,7 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega
         cell.subviews.forEach { $0.removeFromSuperview() }
         cell.addSubview(button)
         cell.buttonable = button
-        button.pinLeading()
+        button.pinToSuperView()
-        button.pinTrailing()
-        button.centerYAnchor.constraint(equalTo: cell.centerYAnchor).isActive = true
         return cell
     }
     

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 {
+    
     //--------------------------------------------------
     // MARK: - Initializers
     //--------------------------------------------------
@@ -164,6 +151,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]? {
+        let selected = selectorViews.filter{ $0.isSelected == true }
+        guard selected.count > 0 else { return nil }
+        return selected
+    }
 
-    public override var selectorViews: [HandlerType] {
+    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)
                 }
             }
@@ -80,10 +73,12 @@ 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

@@ -0,0 +1,267 @@
+//
+//  Notification.swift
+//  VDS
+//
+//  Created by Nadigadda, Sumanth on 14/03/23.
+//
+
+import Foundation
+import UIKit
+import VDSColorTokens
+import Combine
+
+@objc(VDSNotification)
+/// A VDS Component that will render a view with information
+public class Notification: View {
+        
+    //--------------------------------------------------
+    // MARK: - Enums
+    //--------------------------------------------------
+    
+    public enum NotificationStyle: String, CaseIterable {
+        case info, success, warning, error
+        
+        func styleIconName() -> Icon.Name {
+            switch self {
+            case .info:
+                return .infoBold
+            case .success:
+                return .checkmarkAltBold
+            case .warning:
+                return .warningBold
+            case .error:
+                return .errorBold
+            }
+        }
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Private Properties
+    //--------------------------------------------------
+    
+    private var mainStackView = UIStackView().with {
+        $0.translatesAutoresizingMaskIntoConstraints = false
+        $0.alignment = .top
+        $0.axis = .horizontal
+        $0.spacing = VDSLayout.Spacing.space2X.value
+    }
+    
+    private var labelsView = UIStackView().with {
+        $0.translatesAutoresizingMaskIntoConstraints = false
+        $0.alignment = .top
+        $0.axis = .vertical
+    }
+    
+    private var edgeSpacing: CGFloat {
+        return UIDevice.isIPad ? VDSLayout.Spacing.space5X.value : VDSLayout.Spacing.space4X.value
+    }
+    
+    private var minViewHeight: CGFloat {
+        return UIDevice.isIPad ? VDSLayout.Spacing.space16X.value : VDSLayout.Spacing.space12X.value
+    }
+    
+    private var minContentHeight: CGFloat {
+        return UIDevice.isIPad ? VDSLayout.Spacing.space5X.value : VDSLayout.Spacing.space4X.value
+    }
+    
+    //--------------------------------------------------
+    // MARK: - View Properties
+    //--------------------------------------------------
+    
+    open var typeIcon = Icon().with {
+        $0.name = .infoBold
+    }
+    
+    open var closeButton = Icon().with {
+        $0.name = .close
+    }
+    
+    open var titleLabel = Label().with {
+        $0.textStyle = .boldBodyLarge
+    }
+    
+    open var subTitleLabel = Label().with {
+        $0.textStyle = .bodyLarge
+    }
+    
+    open var buttonsView = ButtonGroup().with {
+        $0.buttonPosition = .left
+    }
+    
+    //Text
+    open var titleText: String = "" { didSet{didChange()}}
+    
+    open var subTitleText: String? { didSet{didChange()}}
+
+    #warning("will need to think about this one, probably create a model that has 2 props - text, onClick = (Button) -> () so we are not accessing the button directly.  The only reason why I leave it open is for things like accessibility, but not for setting properties outside of this class.  More or less follow how Tilelet is working, look at that, below is a temp fix until we can discuss with the guys")
+    //Buttons
+    open var primaryButtonModel: ButtonModel? { didSet{didChange()}}
+    open var primaryButton =  Button().with {
+        $0.size = .small
+        $0.use = .secondary
+    }
+    
+    open var secondaryButtonModel: ButtonModel? { didSet{didChange()}}
+    open var secondaryButton =  Button().with {
+        $0.size = .small
+        $0.use = .secondary
+    }
+    
+    open var onCloseClick: ((Notification)->())? {
+        didSet {
+            if let onCloseClick {
+                onCloseSubscriber = closeButton
+                    .publisher(for: UITapGestureRecognizer())
+                    .sink { _ in
+                        onCloseClick(self)
+                    }
+            } else {
+                onCloseSubscriber = nil
+            }
+        }
+    }
+    internal var onCloseSubscriber: AnyCancellable?
+    //--------------------------------------------------
+    // MARK: - Modal Properties
+    //--------------------------------------------------
+    
+    open var type: NotificationStyle = .info { didSet{didChange()}}
+    
+    //--------------------------------------------------
+    // MARK: - Configuration
+    //--------------------------------------------------
+    private var backgroundColorConfiguration: AnyColorable = {
+        let config = KeyedColorConfiguration<Notification, NotificationStyle>(keyPath: \.type)
+        config.setSurfaceColors(VDSColor.feedbackInformationBackgroundOnlight, VDSColor.feedbackInformationBackgroundOndark, forKey: .info)
+        config.setSurfaceColors(VDSColor.feedbackWarningBackgroundOnlight, VDSColor.feedbackWarningBackgroundOndark, forKey: .warning)
+        config.setSurfaceColors(VDSColor.feedbackSuccessBackgroundOnlight, VDSColor.feedbackSuccessBackgroundOndark, forKey: .success)
+        config.setSurfaceColors(VDSColor.feedbackErrorBackgroundOnlight, VDSColor.feedbackErrorBackgroundOndark, forKey: .error)
+        return config.eraseToAnyColorable()
+    }()
+    
+    private var textColorConfig = ViewColorConfiguration().with {
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: false)
+        $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forDisabled: true)
+    }
+ 
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    required public init() {
+        super.init(frame: .zero)
+    }
+    
+    public override init(frame: CGRect) {
+        super.init(frame: .zero)
+    }
+    
+    public required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Lifecycle
+    //--------------------------------------------------
+    
+    open override func setup() {
+        super.setup()
+        addSubview(mainStackView)
+        mainStackView.pinToSuperView(.init(top: edgeSpacing, left: edgeSpacing, bottom: edgeSpacing, right: edgeSpacing))
+        
+        NSLayoutConstraint.activate([
+            heightAnchor.constraint(greaterThanOrEqualToConstant: minViewHeight),
+            mainStackView.heightAnchor.constraint(greaterThanOrEqualToConstant: minContentHeight)
+        ])
+        
+        mainStackView.addArrangedSubview(typeIcon)
+        mainStackView.addArrangedSubview(labelsView)
+        mainStackView.addArrangedSubview(closeButton)
+                    
+        //labels
+        titleLabel.textColorConfiguration = textColorConfig.eraseToAnyColorable()
+        subTitleLabel.textColorConfiguration = textColorConfig.eraseToAnyColorable()
+    }
+    
+    open override func reset() {
+        super.reset()
+        
+        titleLabel.reset()
+        subTitleLabel.reset()
+        buttonsView.reset()
+        primaryButton.reset()
+        secondaryButton.reset()
+        
+        type = .info
+        typeIcon.name = .infoBold
+        closeButton.name = .close
+    }
+    
+    //--------------------------------------------------
+    // MARK: - State
+    //--------------------------------------------------
+    open override func updateView() {
+        backgroundColor = backgroundColorConfiguration.getColor(self)
+        updateIcons()
+        updateLabels()
+        updateButtons()
+    }
+    
+    private func updateIcons() {
+        let iconColor = surface == .dark ? Icon.Color.white : Icon.Color.black
+        typeIcon.name = type.styleIconName()
+        typeIcon.color = iconColor
+        closeButton.color = iconColor
+    }
+    
+    private func updateLabels() {
+        titleLabel.surface = surface
+        subTitleLabel.surface = surface
+        
+        if !titleText.isEmpty {
+            titleLabel.text = titleText
+            labelsView.addArrangedSubview(titleLabel)
+        } else {
+            titleLabel.removeFromSuperview()
+        }
+        
+        if let subTitleText {
+            subTitleLabel.text = subTitleText
+            labelsView.addArrangedSubview(subTitleLabel)
+        } else {
+            subTitleLabel.removeFromSuperview()
+        }
+
+    }
+    
+    private func updateButtons() {
+        var buttons: [Button] = []
+        if let primaryButtonModel {
+            primaryButton.text = primaryButtonModel.text
+            primaryButton.surface = surface
+            primaryButton.onClick = primaryButtonModel.onClick
+            buttons.append(primaryButton)
+        }
+        
+        if let secondaryButtonModel {
+            secondaryButton.text = secondaryButtonModel.text
+            secondaryButton.surface = surface
+            secondaryButton.onClick = secondaryButtonModel.onClick
+            buttons.append(secondaryButton)
+        }
+        
+        if buttons.isEmpty {
+            labelsView.setCustomSpacing(0, after: subTitleLabel)
+            buttonsView.removeFromSuperview()
+        } else {
+            labelsView.setCustomSpacing(VDSLayout.Spacing.space3X.value, after: subTitleLabel)
+            ///This below doesn't work
+            buttonsView.buttons = buttons
+            labelsView.addArrangedSubview(buttonsView)
+            
+            buttonsView
+                .pinLeading()
+                .pinTrailing()
+        }
+    }
+}
+

VDS/Components/Notification/NotificationButtonModel.swift

@@ -0,0 +1,19 @@
+//
+//  NotificationButtonModel.swift
+//  VDS
+//
+//  Created by Nadigadda, Sumanth on 24/03/23.
+//
+
+import Foundation
+
+extension Notification {
+    public struct ButtonModel {
+        public var text: String
+        public var onClick: (Button) -> ()
+        public init(text: String, onClick: @escaping (Button) -> Void) {
+            self.text = text
+            self.onClick = onClick
+        }
+    }
+}

VDS/Components/Notification/NotificationSubTitleModel.swift

@@ -0,0 +1,26 @@
+//
+//  NotificationSubTitleModel.swift
+//  VDS
+//
+//  Created by Nadigadda, Sumanth on 24/03/23.
+//
+
+import Foundation
+
+extension Notification {
+    public struct SubTitleModel {
+        public var text: String
+        public var textAttributes: [any LabelAttributeModel]?
+        public var textStyle: TextStyle = .bodySmall
+        public var numberOfLines: Int
+        
+        public init(text: String,
+                    textColor: Use = .primary,
+                    textAttributes: [any LabelAttributeModel]? = nil,
+                    numberOfLines: Int = 0) {
+            self.text = text
+            self.textAttributes = textAttributes
+            self.numberOfLines = numberOfLines
+        }
+    }
+}

VDS/Components/Notification/NotificationTitleModel.swift

@@ -0,0 +1,25 @@
+//
+//  NotificationTitleModel.swift
+//  VDS
+//
+//  Created by Nadigadda, Sumanth on 24/03/23.
+//
+
+import Foundation
+
+extension Notification {
+    public struct TitleModel {
+        public var text: String
+        public var textAttributes: [any LabelAttributeModel]?
+        public var textStyle: TextStyle = .boldBodySmall
+        public var numberOfLines: Int
+        
+        public init(text: String,
+                    textAttributes: [any LabelAttributeModel]? = nil,
+                    numberOfLines: Int = 0) {
+            self.text = text
+            self.textAttributes = textAttributes
+            self.numberOfLines = numberOfLines
+        }
+    }
+}

VDS/Components/RadioBox/RadioBox.swift

@@ -12,22 +12,8 @@ import VDSFormControlsTokens
 import Combine
 
 @objc(VDSRadioBox)
-public class RadioBox: RadioBoxBase{}
+open class RadioBox: Control {
     
-@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
     //--------------------------------------------------
@@ -138,6 +124,12 @@ 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 {
-    //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
     //--------------------------------------------------
@@ -158,6 +136,12 @@ open class RadioButtonBase: Control, Errorable {
     //--------------------------------------------------
     // MARK: - Lifecycle
     //--------------------------------------------------
+    open override func initialSetup() {
+        super.initialSetup()
+        onClick = { control in
+            control.toggle()
+        }
+    }
 
     open override func setup() {
         super.setup()
@@ -335,8 +319,8 @@ open class RadioButtonBase: Control, Errorable {
             self.shapeLayer = nil
         }
         
-        let bounds = selectorView.bounds
+        let bounds = radioButtonSize
-        let length = max(bounds.size.height, bounds.size.width)
+        let length = max(bounds.height, bounds.width)
         guard length > 0.0, shapeLayer == nil else { return }
         
         //get the colors
@@ -346,7 +330,7 @@ open class RadioButtonBase: Control, Errorable {
         
         selectorView.backgroundColor = backgroundColor
         selectorView.layer.borderColor = borderColor.cgColor
-        selectorView.layer.cornerRadius = selectorView.bounds.width * 0.5
+        selectorView.layer.cornerRadius = bounds.width * 0.5
         selectorView.layer.borderWidth = VDSFormControls.widthBorder
         
         if shapeLayer == nil {
@@ -357,7 +341,7 @@ open class RadioButtonBase: Control, Errorable {
                                                          height: radioButtonSelectedSize.height))
             let shapeLayer = CAShapeLayer()
             self.shapeLayer = shapeLayer
-            shapeLayer.frame = bounds
+            shapeLayer.frame = selectorView.bounds
             layer.addSublayer(shapeLayer)
             shapeLayer.fillColor = radioSelectedColor.cgColor
             shapeLayer.path = bezierPath.cgPath

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 {
-    //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
@@ -78,6 +59,12 @@ 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/TextFields/EntryField/EntryField.swift

@@ -172,7 +172,6 @@ open class EntryField: Control {
     open override func setup() {
         super.setup()
                 
-        enabledHighlight = false 
         isAccessibilityElement = true
         accessibilityTraits = .button
         addSubview(stackView)

VDS/Components/Tilelet/Tilelet.swift

@@ -13,6 +13,7 @@ import Combine
 
 @objc(VDSTilelet)
 open class Tilelet: TileContainer {
+    
     //--------------------------------------------------
     // MARK: - Enums
     //--------------------------------------------------
@@ -62,7 +63,7 @@ open class Tilelet: TileContainer {
     //--------------------------------------------------
     // MARK: - Public Properties
     //--------------------------------------------------    
-    open override var onClickSubscriber: AnyCancellable? {
+    public 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 {
-    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
@@ -223,14 +213,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)

VDS/Protocols/Clickable.swift

@@ -0,0 +1,39 @@
+//
+//  Clickable.swift
+//  VDS
+//
+//  Created by Matt Bruce on 3/29/23.
+//
+
+import Foundation
+import UIKit
+import Combine
+
+public protocol Clickable: Handlerable where Self: UIControl {
+    var touchUpInsideCount: Int { get set }
+    var onClickSubscriber: AnyCancellable? { get set }
+}
+
+extension Clickable {
+    public func addEvent(event: UIControl.Event, block: @escaping (Self)->()) {
+        publisher(for: event)
+            .sink(receiveValue: { c in
+                block(c)
+            }).store(in: &subscribers)
+    }
+
+    public var onClick: ((Self) -> ())? {
+        get { return nil }
+        set {
+            if let newValue {
+                onClickSubscriber = publisher(for: .touchUpInside)
+                    .sink { c in
+                        newValue(c)
+                    }
+            } else {
+                onClickSubscriber?.cancel()
+                onClickSubscriber = nil
+            }
+        }
+    }
+}

VDS/Publishers/Publisher+Bind.swift

@@ -1,24 +0,0 @@
-//
-//  Publisher+Bind.swift
-//  VDS
-//
-//  Created by Matt Bruce on 8/18/22.
-//
-
-import Foundation
-import Combine
-
-public typealias Binding = Subscriber
-
-public extension Publisher where Failure == Never {
-    func bind<B: Binding>(subscriber: B) -> AnyCancellable
-        where B.Failure == Never, B.Input == Output {
-            
-            handleEvents(receiveSubscription: { subscription in
-                subscriber.receive(subscription: subscription)
-            })
-                .sink { value in
-                    _ = subscriber.receive(value)
-            }
-    }
-}

VDS/Publishers/UIButton+Publisher.swift

@@ -1,17 +0,0 @@
-//
-//  Button+Publisher.swift
-//  VDS
-//
-//  Created by Matt Bruce on 8/18/22.
-//
-
-import Foundation
-import UIKit
-import Combine
-
-extension UIButton {
-    public var tapPublisher: AnyPublisher<UIButton, Never> {
-        publisher(for: .touchUpInside)
-            .eraseToAnyPublisher()
-    }
-}

VDS/Publishers/UIControlPublisher.swift

@@ -21,10 +21,9 @@ public final class UIControlSubscription<SubscriberType: Subscriber, Control: UI
         self.event = event
         
         //allow highlight for VDS.Controls on "onClick" events
-        if let c = control as? VDS.Control, event == .touchUpInside {
+        if let c = control as? Clickable, event == .touchUpInside {
-            c.enabledHighlight = true
+            c.touchUpInsideCount += 1
         }
-        
         control.addTarget(self, action: #selector(eventHandler), for: event)
     }
 
@@ -39,8 +38,8 @@ public final class UIControlSubscription<SubscriberType: Subscriber, Control: UI
     
     deinit {
         //remove highlight for VDS.Controls on "onClick" events
-        if let c = control as? VDS.Control, event == .touchUpInside {
+        if let c = control as? Clickable, event == .touchUpInside, c.touchUpInsideCount > 0 {
-            c.enabledHighlight = false
+            c.touchUpInsideCount -= 1
         }
     }