Merge branch 'mbruce/bugfixes' into 'develop'

refactored out canHighlight and added shouldHighlight to be able to override

See merge request BPHV_MIPS/vds_ios!111

VDS/BaseClasses/Control.swift

@@ -60,25 +60,21 @@ open class Control: UIControl, ViewProtocol, UserInfoable, Clickable {
     /// Whether the Control is selected or not.
     open override var isSelected: Bool { didSet { setNeedsUpdate() } }
 
-    /// Whether the Control can handle the isHighlighted state.
-    open var canHighlight: Bool = true
+    /// State of animating isHighlight.
+    public var isHighlighting = false
     
-    var isHighlightAnimating = false
+    /// Whether the Control should handle the isHighlighted state.
+    open var shouldHighlight: Bool { isHighlighting == false && onClickSubscriber != nil }
     
     /// Whether the Control is highlighted or not.
     open override var isHighlighted: Bool {
         didSet {
-            if canHighlight && isHighlightAnimating == false && onClickSubscriber != nil {
-                isHighlightAnimating = true
+            if shouldHighlight {
+                isHighlighting = true
                 UIView.animate(withDuration: 0.1, animations: { [weak self] in
                     self?.setNeedsUpdate()
-                }) { [weak self] _ in
-                    //you update the view since this is typically a quick change
-                    UIView.animate(withDuration: 0.1, animations: { [weak self] in
-                        self?.setNeedsUpdate()
-                        self?.isHighlightAnimating = false
-                    })
-                }
+                    self?.isHighlighting = false
+                })
             }
         }
     }

VDS/Components/Tabs/Tab.swift

@@ -86,6 +86,8 @@ extension Tabs {
         ///Minimum width for the tab
         open var minWidth: CGFloat = 44.0  { didSet { setNeedsUpdate() } }
         
+        open override var shouldHighlight: Bool { false }
+        
         //--------------------------------------------------
         // MARK: - Configuration
         //--------------------------------------------------
@@ -128,9 +130,7 @@ extension Tabs {
         /// 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()
-            
-            canHighlight = false
-            
+                        
             addLayoutGuide(layoutGuide)
             addSubview(label)
             accessibilityTraits = .button

VDS/Components/Toggle/Toggle.swift

@@ -165,6 +165,8 @@ open class Toggle: Control, Changeable, FormFieldable {
             return toggleContainerSize
         }
     }
+    
+    open override var shouldHighlight: Bool { false }
 
     //--------------------------------------------------
     // MARK: - Overrides
@@ -181,7 +183,6 @@ open class Toggle: Control, Changeable, FormFieldable {
     open override func setup() {
         super.setup()
         
-        canHighlight = false 
         isAccessibilityElement = true
         accessibilityTraits = .button
         addSubview(label)