VDS/Components/Icon/ButtonIcon/ButtonIcon.swift

@@ -8,13 +8,12 @@
 import Foundation
 import UIKit
 import VDSColorTokens
-import Combine
 
 /// A button icon is an interactive element that visually communicates the action it triggers via an icon.
 /// It usually represents a supplementary or utilitarian action. A button icon can stand alone, but often
 /// exists in a group when there are several actions that can be performed.
 @objc(VDSButtonIcon)
-open class ButtonIcon: Control, Changeable, FormFieldable {
+open class ButtonIcon: Control {
     
     //--------------------------------------------------
     // MARK: - Initializers
@@ -78,7 +77,7 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
     private var badgeIndicatorCenterXConstraint: NSLayoutConstraint?
     private var badgeIndicatorCenterYConstraint: NSLayoutConstraint?
     private var currentIconName: Icon.Name? {
-        if let selectedIconName, isSelected {
+        if let selectedIconName, selectable {
             return selectedIconName
         } else {
             return iconName
@@ -145,15 +144,7 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
     open var showBadgeIndicator: Bool = false { didSet { setNeedsUpdate() } }
     
     /// If true, button will be rendered as selected, when it is selectable.
-    open var selectable: Bool = false {
+    open var selectable: Bool = false { didSet { setNeedsUpdate() } }
-        didSet {
-            //unselect
-            if !selectable && isSelected {
-                isSelected = false
-            }
-            setNeedsUpdate()
-        }
-    }
 
     /// Used to move the icon inside the button in both x and y axis.
     open var iconOffset: CGPoint = .init(x: 0, y: 0) { didSet { setNeedsUpdate() } }
@@ -161,12 +152,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
     /// Applies expand direction to Badge Indicator if shows badge indicator.
     open var expandDirection: ExpandDirection = .right { didSet { setNeedsUpdate() } }
     
-    open var onChangeSubscriber: AnyCancellable?
-    
-    open var inputId: String? { didSet { setNeedsUpdate() } }
-
-    open var value: AnyHashable? { didSet { setNeedsUpdate() } }
-    
     //--------------------------------------------------
     // MARK: - Configuration
     //--------------------------------------------------
@@ -202,7 +187,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
             $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
             $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
             $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
-            $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
         }.eraseToAnyColorable()
     }()
     
@@ -211,7 +195,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
             $0.setSurfaceColors(VDSColor.elementsPrimaryOnlight, VDSColor.elementsPrimaryOndark, forState: .normal)
             $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
             $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.paletteBlack.withAlphaComponent(0.70), forState: .disabled)
-            $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.paletteBlack.withAlphaComponent(0.70), forState: [.selected, .disabled])
         }.eraseToAnyColorable()
     }()
     
@@ -289,7 +272,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
                 $0.setSurfaceColors(VDSColor.backgroundPrimaryDark, VDSColor.backgroundPrimaryLight, forState: .normal)
                 $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
                 $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
-                $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
             }.eraseToAnyColorable()
 
         }()
@@ -304,7 +286,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
                 $0.setSurfaceColors(VDSColor.paletteGray20, VDSColor.paletteWhite, forState: .normal)
                 $0.setSurfaceColors(VDSColor.interactiveActiveOnlight, VDSColor.interactiveActiveOndark, forState: .highlighted)
                 $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: .disabled)
-                $0.setSurfaceColors(VDSColor.interactiveDisabledOnlight, VDSColor.interactiveDisabledOndark, forState: [.selected, .disabled])
             }.eraseToAnyColorable()
         }()
         var shadowColorConfiguration: AnyColorable  = {
@@ -320,17 +301,6 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------
-    /// Executed on initialization for this View.
-    open override func initialSetup() {
-        super.initialSetup()
-        onClick = { control in
-            guard control.isEnabled else { return }
-            if let selectedIconName = control.selectedIconName, control.selectable {
-                control.toggle()
-            }
-        }
-    }
-
     /// Called once when a view is initialized and is used to Setup additional UI or other constants and configurations.
     open override func setup() {
         super.setup()
@@ -465,19 +435,11 @@ open class ButtonIcon: Control, Changeable, FormFieldable {
         }
     }
     
-    /// This will change the state of the Selector and execute the actionBlock if provided.
-    open func toggle() {
-        //removed error
-        isSelected.toggle()
-        sendActions(for: .valueChanged)
-    }
-    
     //--------------------------------------------------
     // MARK: - Private Methods
     //--------------------------------------------------
     private func updateBadgeIndicator() {
         if let badgeIndicatorModel {
-            badgeIndicator.isEnabled = isEnabled
             badgeIndicator.kind = badgeIndicatorModel.kind
             badgeIndicator.fillColor = badgeIndicatorModel.fillColor
             badgeIndicator.surface = badgeIndicatorModel.surface