Merge branch 'feature/accessibilityUpdate' into 'develop'

added some accessibilty updates

See merge request BPHV_MIPS/vds_ios!45

VDS/Components/Buttons/Button/Button.swift

@@ -118,6 +118,9 @@ open class Button: ButtonBase, Useable {
     
     open override func setup() {
         super.setup()
+        isAccessibilityElement = true
+        accessibilityTraits = .button
+
         //only 1 of the 2 widths can be on at the same time
         widthConstraint = widthAnchor.constraint(equalToConstant: 0)
         minWidthConstraint = widthAnchor.constraint(greaterThanOrEqualToConstant: size.minimumWidth)

VDS/Components/Buttons/Button/ButtonBase.swift

@@ -109,7 +109,6 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
             backgroundColor = .clear
             translatesAutoresizingMaskIntoConstraints = false
             accessibilityCustomActions = []
-            accessibilityTraits = .staticText
             setup()
             setupDidChangeEvent()
             updateView()
@@ -130,7 +129,6 @@ open class ButtonBase: UIButton, Buttonable, Handlerable, ViewProtocol, Resettab
         disabled = false
         text = nil
         accessibilityCustomActions = []
-        accessibilityTraits = .button
     }
         
     //--------------------------------------------------

VDS/Components/Buttons/ButtonGroup/ButtonGroup.swift

@@ -133,8 +133,6 @@ open class ButtonGroup: View, UICollectionViewDataSource, UICollectionViewDelega
     //--------------------------------------------------
     open override func setup() {
         super.setup()
-        isAccessibilityElement = true
-        accessibilityTraits = .button
         addSubview(collectionView)
         collectionView.pinToSuperView()
     }

VDS/Components/Buttons/TextLink/TextLink.swift

@@ -73,6 +73,8 @@ open class TextLink: ButtonBase {
     //--------------------------------------------------
     open override func setup() {
         super.setup()
+        isAccessibilityElement = true
+        accessibilityTraits = .link
 
         if let titleLabel {
             addSubview(line)
@@ -88,7 +90,8 @@ open class TextLink: ButtonBase {
         super.reset()
         size = .large        
         accessibilityCustomActions = []
-        accessibilityTraits = .staticText
+        isAccessibilityElement = true
+        accessibilityTraits = .link
     }
     
     //--------------------------------------------------

VDS/Components/Buttons/TextLinkCaret/TextLinkCaret.swift

@@ -231,6 +231,9 @@ internal class CaretView: View {
     override open func setup() {
         super.setup()
         defaultState()
+        
+        isAccessibilityElement = true
+        accessibilityTraits = .link
     }
     
     //------------------------------------------------------

VDS/Components/Checkbox/CheckboxGroup.swift

@@ -75,8 +75,6 @@ public class CheckboxGroupBase<HandlerType: CheckboxBase>: SelectorGroupHandlerB
     open override func setup() {
         super.setup()
         
-        isAccessibilityElement = true
-        accessibilityTraits = .button
         addSubview(mainStackView)
         
         mainStackView.pinToSuperView()

VDS/Components/Icon/Icon.swift

@@ -49,6 +49,9 @@ public class Icon: View {
         widthConstraint?.isActive = true
         
         backgroundColor = .clear
+        
+        isAccessibilityElement = true
+        accessibilityTraits = .image
     }
     
     open override func reset() {

VDS/Components/Label/Label.swift

@@ -109,8 +109,6 @@ public class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable
         textPosition = .left
         text = nil
         attributedText = nil
-        accessibilityCustomActions = []
-        accessibilityTraits = .staticText
         numberOfLines = 0
         backgroundColor = .clear
     }
@@ -125,9 +123,9 @@ public class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable
             font = textStyle.font
             
             if let text =  text, let font = font, let textColor = textColor {
-                //clear the arrays holding actions
                 accessibilityCustomActions = []
 
+                //clear the arrays holding actions
                 //create the primary string
                 let startingAttributes = [NSAttributedString.Key.font: font, NSAttributedString.Key.foregroundColor: textColor]
                 let mutableText = NSMutableAttributedString(string: text, attributes: startingAttributes)
@@ -139,6 +137,7 @@ public class Label: UILabel, Handlerable, ViewProtocol, Resettable, UserInfoable
                 
                 //set the attributed text
                 attributedText = mutableText
+                accessibilityLabel = text
             }
         }
     }

VDS/Components/RadioSwatch/RadioSwatchGroup.swift

@@ -82,8 +82,6 @@ public class RadioSwatchGroupBase<HandlerType: RadioSwatchBase>: SelectorGroupSe
     open override func setup() {
         super.setup()
 
-        isAccessibilityElement = true
-        accessibilityTraits = .button
         addSubview(label)
         addSubview(collectionView)
         

VDS/Components/Tilelet/Tilelet.swift

@@ -213,6 +213,9 @@ open class Tilelet: TileContainer {
         color = .black
         addContentView(stackView)
         
+        isAccessibilityElement = true
+        accessibilityTraits = .staticText
+        
         //badge
         badgeContainerView.addSubview(badge)
         badge
@@ -330,6 +333,9 @@ open class Tilelet: TileContainer {
         } else {
             removeFromSuperview(titleLockupContainerView)
         }
+        
+        accessibilityTraits = enabledHighlight ? .link : .staticText
+        accessibilityLabel = [titleModel?.text, subTitleModel?.text].compactMap({$0}).joined(separator: ", ")
     }
     
     fileprivate func updateIcons() {

VDS/Components/TitleLockup/TitleLockup.swift

@@ -203,7 +203,7 @@ open class TitleLockup: View {
         super.setup()
         
         isAccessibilityElement = true
-        accessibilityTraits = .button
+        accessibilityTraits = .staticText
         addSubview(stackView)
         
         stackView.spacing = 0.0
@@ -214,6 +214,7 @@ open class TitleLockup: View {
         
         //pin stackview to edges
         stackView.pinToSuperView()
+        
     }
     
     open override func reset() {
@@ -298,5 +299,8 @@ open class TitleLockup: View {
         eyebrowLabel.isHidden = eyebrowTextIsEmpty
         titleLabel.isHidden = titleTextIsEmpty
         subTitleLabel.isHidden = subTitleTextIsEmpty
+        
+        accessibilityLabel = [eyebrowModel?.text, titleModel?.text, subTitleModel?.text].compactMap({$0}).joined(separator: ", ")
     }
+    
 }