changes for accessibility

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableCheckboxAllTextAndLinks.swift

@@ -102,7 +102,7 @@ import Foundation
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         
-        isAccessibilityElement = true//!linkShowing
+        isAccessibilityElement = !linkShowing
         checkbox.isAccessibilityElement = linkShowing
         eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
         
@@ -118,11 +118,20 @@ import Foundation
                 elements.append(checkbox)
             }
             
-            if eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0 {
+            if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
             
             accessibilityElements = elements
         }
     }
+    
+    override open func accessibilityActivate() -> Bool {
+        
+        if isAccessibilityElement {
+            return checkbox.accessibilityActivate()
+        }
+            
+        return false
+    }
 }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconAllTextLinks.swift

@@ -42,7 +42,6 @@ import Foundation
         leftImage.imageView.contentMode = .scaleAspectFit
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
         updateAccessibilityLabel()
     }
     
@@ -93,11 +92,22 @@ import Foundation
             accessibilityLabel = message
         } else {
             // Allow only radio button and link to be focused on.
-            accessibilityLabel = message
             var elements: [UIView] = []
             
-            if message.count > 0 {
-                elements.append(self)
+            if let leftImageLabel = leftImage.accessibilityLabel, !leftImageLabel.isEmpty {
+                elements.append(leftImage)
+            }
+            
+            if let eyeBrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyeBrowText.isEmpty {
+                elements.append(eyebrowHeadlineBodyLink.eyebrow)
+            }
+            
+            if let headlineText = eyebrowHeadlineBodyLink.headline.text, !headlineText.isEmpty {
+                elements.append(eyebrowHeadlineBodyLink.headline)
+            }
+            
+            if let bodyText = eyebrowHeadlineBodyLink.body.text, !bodyText.isEmpty {
+                elements.append(eyebrowHeadlineBodyLink.body)
             }
             
             if linkShowing {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableIconWithRightCaretBodyText.swift

@@ -45,6 +45,7 @@ import Foundation
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         rightLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         rightLabel.numberOfLines = 1
+        isAccessibilityElement = true
         addMolecule(stack)
         stack.restack()
         updateAccessibilityLabel()

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableNumberedListAllTextAndLinks.swift

@@ -46,7 +46,6 @@ import Foundation
         leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
         updateAccessibilityLabel()
     }
     
@@ -107,13 +106,22 @@ import Foundation
             // Make whole cell focusable if no link.
             accessibilityLabel = message
         } else {
-            // Allow only radio button and link to be focused on.
-            accessibilityLabel = message
-            
             var elements: [UIView] = []
             
-            if message.count > 0 {
-                elements.append(self)
+            if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
+                elements.append(leftLabel)
+            }
+            
+            if let eyeBrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyeBrowText.isEmpty {
+                elements.append(eyebrowHeadlineBodyLink.eyebrow)
+            }
+            
+            if let headlineText = eyebrowHeadlineBodyLink.headline.text, !headlineText.isEmpty {
+                elements.append(eyebrowHeadlineBodyLink.headline)
+            }
+            
+            if let bodyText = eyebrowHeadlineBodyLink.body.text, !bodyText.isEmpty {
+                elements.append(eyebrowHeadlineBodyLink.body)
             }
             
             if linkShowing {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/LeftVariable/ListLeftVariableRadioButtonAllTextAndLinks.swift

@@ -109,7 +109,7 @@ import Foundation
 
             var elements: [UIView] = []
             
-            if message.count > 0 {
+            if !message.isEmpty {
                 elements.append(radioButton)
             }