Merge branch 'develop' into feature/headers_H1_button

MVMCoreUI.xcodeproj/project.pbxproj

@@ -116,6 +116,8 @@
 		27F9736A246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27F97369246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift */; };
 		31BE15CB23D8924D00452370 /* CheckboxLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */; };
 		31BE15CC23D8924D00452370 /* CheckboxModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31BE15CA23D8924C00452370 /* CheckboxModel.swift */; };
+		324FB6AA249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 324FB6A9249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift */; };
+		324FB6AC24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift in Sources */ = {isa = PBXBuildFile; fileRef = 324FB6AB24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift */; };
 		32F8804624765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F8804524765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift */; };
 		32F8804824765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F8804724765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift */; };
 		522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */; };
@@ -563,6 +565,8 @@
 		27F97369246750BE00CAB5C5 /* ScreenBrightnessModifierBehavior.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenBrightnessModifierBehavior.swift; sourceTree = "<group>"; };
 		31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxLabelModel.swift; sourceTree = "<group>"; };
 		31BE15CA23D8924C00452370 /* CheckboxModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CheckboxModel.swift; sourceTree = "<group>"; };
+		324FB6A9249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListBodyTextModel.swift; sourceTree = "<group>"; };
+		324FB6AB24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListBodyText.swift; sourceTree = "<group>"; };
 		32F8804524765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListAllTextAndLinksModel.swift; sourceTree = "<group>"; };
 		32F8804724765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListLeftVariableNumberedListAllTextAndLinks.swift; sourceTree = "<group>"; };
 		522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinks.swift; sourceTree = "<group>"; };
@@ -1360,6 +1364,8 @@
 				AA997251247530B100FC7472 /* ListLeftVariableIconAllTextLinks.swift */,
 				32F8804524765C6E00C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinksModel.swift */,
 				32F8804724765C8400C2ACB3 /* ListLeftVariableNumberedListAllTextAndLinks.swift */,
+				324FB6A9249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift */,
+				324FB6AB24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift */,
 			);
 			path = LeftVariable;
 			sourceTree = "<group>";
@@ -2059,6 +2065,7 @@
 			files = (
 				0A775F2624893916009EFB58 /* ThreeHeadlineBodyLink.swift in Sources */,
 				AAC6F167243332E400F295C1 /* RadioSwatchesModel.swift in Sources */,
+				324FB6AA249366F3002552C7 /* ListLeftVariableNumberedListBodyTextModel.swift in Sources */,
 				5248BFED23F12E350059236A /* ListThreeColumnPlanDataDividerModel.swift in Sources */,
 				AA0A257824766C8A00862F64 /* ListLeftVariableIconWithRightCaretBodyTextModel.swift in Sources */,
 				0A5D59C223AD2F5700EFD9E9 /* AppleGuidelinesProtocol.swift in Sources */,
@@ -2315,6 +2322,7 @@
 				BB6C6AC0242232DF005F7224 /* ListOneColumnTextWithWhitespaceDividerTallModel.swift in Sources */,
 				8DEFA95E243DAC2F000D27E5 /* ListThreeColumnDataUsageDivider.swift in Sources */,
 				D2A638FD22CA98280052ED1F /* HeadlineBody.swift in Sources */,
+				324FB6AC24936717002552C7 /* ListLeftVariableNumberedListBodyText.swift in Sources */,
 				AAA74A172410C04600080241 /* HeadersH2NoButtonsBodyText.swift in Sources */,
 				522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */,
 				AA7F32AB246C0F7900C965BA /* ListLeftVariableRadioButtonAllTextAndLinksModel.swift in Sources */,

MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift

@@ -157,9 +157,9 @@ import MVMCore
     override public init(frame: CGRect) {
         super.init(frame: frame)
         
-        accessibilityTraits = .button
         isAccessibilityElement = true
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "checkbox_action_hint")
+        accessibilityTraits = .button
         updateAccessibilityLabel()
     }
     

MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift

@@ -147,8 +147,8 @@ import UIKit
         
         addTarget(self, action: #selector(tapAction), for: .touchUpInside)
         isAccessibilityElement = true
-        accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "radio_action_hint")
+        accessibilityTraits = .button
         updateAccessibilityLabel()
     }
     

MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/BarsIndicatorView.swift

@@ -115,12 +115,12 @@ open class BarsIndicatorView: CarouselIndicator {
         
         for i in 0..<numberOfPages {
             let bar = View()
-            bar.accessibilityTraits = .button
             bar.isAccessibilityElement = true
             if let accessibleValueFormat = accessibilityValueFormat, let accessibleIndex = ordinalFormatter.string(from: NSNumber(value: i + 1)) {
                 bar.accessibilityLabel = String(format: accessibleValueFormat, accessibleIndex, numberOfPages)
             }
             bar.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
+            bar.accessibilityTraits = .button
             bar.widthAnchor.constraint(equalToConstant: BarsIndicatorView.indicatorBarWidth).isActive = true
             bar.backgroundColor = isEnabled ? (i == currentIndex ? currentIndicatorColor : indicatorColor) : disabledIndicatorColor
             let barHeight = i == currentIndex ? BarsIndicatorView.indicatorBarHeight.selected : BarsIndicatorView.indicatorBarHeight.unselected

MVMCoreUI/Atomic/Atoms/Views/Toggle.swift

@@ -215,10 +215,10 @@ public typealias ActionBlockConfirmation = () -> (Bool)
         super.setupView()
  
         isAccessibilityElement = true
-        accessibilityTraits = .button
         accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccToggleHint")
         accessibilityLabel = MVMCoreUIUtility.hardcodedString(withKey: "Toggle_buttonlabel")
-        
+        accessibilityTraits = .button
+
         heightConstraint = heightAnchor.constraint(equalToConstant: Self.containerSize.height)
         heightConstraint?.isActive = true
         

MVMCoreUI/Atomic/MoleculeObjectMapping.swift

@@ -172,6 +172,7 @@ import Foundation
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableCheckboxBodyText.self, viewModelClass: ListLeftVariableCheckboxBodyTextModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableIconAllTextLinks.self, viewModelClass: ListLeftVariableIconAllTextLinksModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableNumberedListAllTextAndLinks.self, viewModelClass: ListLeftVariableNumberedListAllTextAndLinksModel.self)
+        MoleculeObjectMapping.shared()?.register(viewClass: ListLeftVariableNumberedListBodyText.self, viewModelClass: ListLeftVariableNumberedListBodyTextModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRVWheel.self, viewModelClass: ListRVWheelModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariablePayments.self, viewModelClass: ListRightVariablePaymentsModel.self)
         MoleculeObjectMapping.shared()?.register(viewClass: ListRightVariableTotalData.self, viewModelClass: ListRightVariableTotalDataModel.self)

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift

@@ -58,10 +58,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
-        isAccessibilityElement = true
-        accessibilityTraits = button.accessibilityTraits
         accessibilityHint = button.accessibilityHint
-        updateAccessibilityLabel()
+        accessibilityTraits = button.accessibilityTraits
     }
     
     //--------------------------------------------------
@@ -100,10 +98,8 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func updateAccessibilityLabel() {
+    func getAccessibilityMessage() -> String? {
-        
         var message = ""
-        
         if let eyebrowText = eyebrow.text, !eyebrowText.isEmpty {
             message += eyebrowText + ", "
         }
@@ -120,11 +116,28 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty {
+        if let rightImageViewText = rightImageView.imageView.accessibilityLabel, !rightImageViewText.isEmpty {
             message += rightImageViewText
         }
-        
+        return message.count > 0 ? message : nil
-        accessibilityLabel = message
+    }
+    
+    func updateAccessibilityLabel() {
+        if let accessoryView = accessoryView {
+            // Both caret and button. Read all content on caret.
+            isAccessibilityElement = false
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, button]
+        } else {
+            // Make whole cell focusable if no action.
+            isAccessibilityElement = true
+            if let message = getAccessibilityMessage(),
+                let buttonTitle = button.titleLabel?.text {
+                accessibilityLabel = message + ", " + buttonTitle
+            } else {
+                accessibilityLabel = getAccessibilityMessage()
+            }
+        }
     }
     
     open override func accessibilityActivate() -> Bool {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift

@@ -58,10 +58,8 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
-        isAccessibilityElement = true
-        accessibilityTraits = button.accessibilityTraits
         accessibilityHint = button.accessibilityHint
-        updateAccessibilityLabel()
+        accessibilityTraits = button.accessibilityTraits
     }
     
     //--------------------------------------------------
@@ -100,10 +98,8 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func updateAccessibilityLabel() {
+    func getAccessibilityMessage() -> String? {
-        
         var message = ""
-        
         if let eyebrowText = eyebrow.text, !eyebrowText.isEmpty {
             message += eyebrowText + ", "
         }
@@ -120,11 +116,28 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageViewText = rightImageView.accessibilityLabel, !rightImageViewText.isEmpty {
+        if let rightImageViewText = rightImageView.imageView.accessibilityLabel, !rightImageViewText.isEmpty {
             message += rightImageViewText
         }
-        
+        return message.count > 0 ? message : nil
-        accessibilityLabel = message
+    }
+    
+    func updateAccessibilityLabel() {
+        if let accessoryView = accessoryView {
+            // Both caret and button. Read all content on caret.
+            isAccessibilityElement = false
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, button]
+        } else {
+            // Make whole cell focusable if no action.
+            isAccessibilityElement = true
+            if let message = getAccessibilityMessage(),
+                let buttonTitle = button.titleLabel?.text {
+                accessibilityLabel = message + ", " + buttonTitle
+            } else {
+                accessibilityLabel = getAccessibilityMessage()
+            }
+        }
     }
     
     open override func accessibilityActivate() -> Bool {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift

@@ -114,7 +114,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+        if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
             message += rightImageLabel
         }
         
@@ -145,8 +145,8 @@ import Foundation
             views.append(twoLinkView.leftLink)
             views.append(twoLinkView.rightLink)
             
-            if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+            if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
-                views.append(rightImage)
+                views.append(rightImage.imageView)
             }
             
             accessibilityElements = views

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift

@@ -111,7 +111,7 @@ import Foundation
             message += body2Text + ", "
         }
         
-        if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+        if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
             message += rightImageLabel
         }
         
@@ -142,8 +142,8 @@ import Foundation
             views.append(twoLinkView.leftLink)
             views.append(twoLinkView.rightLink)
             
-            if let rightImageLabel = rightImage.accessibilityLabel, !rightImageLabel.isEmpty {
+            if let rightImageLabel = rightImage.imageView.accessibilityLabel, !rightImageLabel.isEmpty {
-                views.append(rightImage)
+                views.append(rightImage.imageView)
             }
             
             accessibilityElements = views

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/FourColumn/ListFourColumnDataUsageListItem.swift

@@ -54,8 +54,6 @@ import Foundation
         arrow.pinHeightAndWidth()
         arrowAndLabel2Stack.restack()
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //-----------------------------------------------------
@@ -92,7 +90,7 @@ import Foundation
     //-----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let label1Text = label1.text, !label1Text.isEmpty {

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

@@ -49,11 +49,9 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         
-        isAccessibilityElement = true
-        checkbox.isAccessibilityElement = false
-        accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
-        // Update accessibility label on radio button state change.
+        accessibilityTraits = checkbox.accessibilityTraits
+        // Update accessibility label on checkbox state change.
         observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
         }
@@ -92,41 +90,19 @@ import Foundation
             message += checkboxLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowLabel.isEmpty {
+        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
-            message += eyebrowLabel + ", "
+            message += label
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text, !headlineLabel.isEmpty {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text, !bodyLabel.isEmpty {
-            message += bodyLabel
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        
         isAccessibilityElement = !linkShowing
-        checkbox.isAccessibilityElement = linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = message
         } else {
-            // Allow only radio button and link to be focused on.
+            // Allow only checkbox and link to be focused on.
             checkbox.accessibilityLabel = message
-            var elements: [UIView] = []
+            accessibilityElements = [checkbox, eyebrowHeadlineBodyLink.link]
-            
-            if message.count > 0 {
-                elements.append(checkbox)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
-            accessibilityElements = elements
         }
     }
     

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

@@ -49,10 +49,9 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         isAccessibilityElement = true
-        checkbox.isAccessibilityElement = false
-        accessibilityTraits = checkbox.accessibilityTraits
         accessibilityHint = checkbox.accessibilityHint
-        // Update accessibility label on radio button state change.
+        accessibilityTraits = checkbox.accessibilityTraits
+        // Update accessibility label on checkbox state change.
         observation = observe(\.checkbox.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
         }

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

@@ -42,7 +42,6 @@ import Foundation
         leftImage.imageView.contentMode = .scaleAspectFit
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -63,57 +62,37 @@ import Foundation
         return 140
     }
     
+    func getAccessibilityMessage() -> String? {
+        guard let leftImageLabel = leftImage.imageView.accessibilityLabel else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return leftImageLabel
+        }
+        return leftImageLabel + ", " + label
+    }
+    
     func updateAccessibilityLabel() {
         
-        var message = ""
-        
-        if let leftImageLabel = leftImage.accessibilityLabel {
-            message += leftImageLabel + ", "
-        }
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none        
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
-            accessibilityLabel = message
+            accessibilityLabel = getAccessibilityMessage()
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, eyebrowHeadlineBodyLink.link]
         } else {
-            // Allow only radio button and link to be focused on.
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
-            var elements: [UIView] = []
+            var elements: [Any] = []
-            
+            if let leftImageLabel = leftImage.imageView.accessibilityLabel, !leftImageLabel.isEmpty {
-            if let leftImageLabel = leftImage.accessibilityLabel, !leftImageLabel.isEmpty {
+                elements.append(leftImage.imageView)
-                elements.append(leftImage)
             }
-            
+            if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
-            if let eyeBrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyeBrowText.isEmpty {
+                elements.append(otherElements)
-                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 {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
             accessibilityElements = elements
         }
     }

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

@@ -48,8 +48,6 @@ import UIKit
         rightLabel.setContentHuggingPriority(UILayoutPriority(rawValue: 902), for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -78,10 +76,10 @@ import UIKit
     }
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
-        if let leftImageLabel = leftImage.accessibilityLabel {
+        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
             message += leftImageLabel + ", "
         }
         
@@ -94,5 +92,6 @@ import UIKit
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

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

@@ -58,10 +58,8 @@ 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()
     }
     
     //--------------------------------------------------
@@ -93,10 +91,10 @@ import Foundation
     //--------------------------------------------------
 
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
-        if let leftImageLabel = leftImage.accessibilityLabel {
+        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
             message += leftImageLabel + ", "
         }
         
@@ -113,5 +111,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

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

@@ -40,7 +40,6 @@ import Foundation
         leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //---------------------------------------------------
@@ -76,56 +75,37 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let leftLabel = leftLabel.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return leftLabel
+        }
+        return leftLabel + ", " + label
+    }
+    
     func updateAccessibilityLabel() {
-        
+
-        var message = ""
-        
-        if let leftLabel = leftLabel.text {
-            message += leftLabel + ", "
-        }
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
-            accessibilityLabel = message
+            accessibilityLabel = getAccessibilityMessage()
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, eyebrowHeadlineBodyLink.link]
         } else {
-            var elements: [UIView] = []
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
-            
+            var elements: [Any] = []
             if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
                 elements.append(leftLabel)
             }
-            
+            if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
-            if let eyeBrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyeBrowText.isEmpty {
+                elements.append(otherElements)
-                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 {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
             accessibilityElements = elements
         }
     }

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

@@ -0,0 +1,95 @@
+//
+//  ListLeftVariableNumberedListBodyText.swift
+//  MVMCoreUI
+//
+//  Created by Subhankar Acharya on 12/06/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+@objcMembers open class ListLeftVariableNumberedListBodyText: TableViewCell {
+    //--------------------------------------------------
+    // MARK: - Outlets
+    //-----------------------------------------------------
+    public let leftLabel = Label(fontStyle: .Title2XLarge)
+    public let headlineBody = HeadlineBody()
+    public var stack: Stack<StackModel>
+    
+    //--------------------------------------------------
+    // MARK: - Initializers
+    //--------------------------------------------------
+    
+    public override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        
+        stack = Stack<StackModel>.createStack(with: [(view: leftLabel, model: StackItemModel(horizontalAlignment: .fill)),
+                                                     (view: headlineBody, model: StackItemModel(horizontalAlignment: .leading))],
+                                              axis: .horizontal)
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+    }
+    
+    public required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Life Cycle
+    //--------------------------------------------------
+    override open func setupView() {
+        super.setupView()
+        leftLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+        leftLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
+        leftLabel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+        addMolecule(stack)
+        stack.restack()
+    }
+    
+    //---------------------------------------------------
+    // MARK: - Molecule
+    //---------------------------------------------------
+    
+    open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
+        super.set(with: model, delegateObject, additionalData)
+        
+        guard let model = model as? ListLeftVariableNumberedListBodyTextModel else { return }
+        leftLabel.text = String(model.number)
+        headlineBody.set(with: model.headlineBody, delegateObject, additionalData)
+        updateAccessibilityLabel()
+    }
+    
+    open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
+        return 140
+    }
+    
+    open override func reset() {
+        super.reset()
+        leftLabel.setFontStyle(.Title2XLarge)
+    }
+    
+    //--------------------------------------------------
+    // MARK: - Accessibility
+    //--------------------------------------------------
+    
+    func updateAccessibilityLabel() {
+        
+        isAccessibilityElement = true
+        
+        var message = ""
+        
+        if let leftLabel = leftLabel.text {
+            message += leftLabel + ", "
+        }
+        
+        if let headlineLabel = headlineBody.headlineLabel.text {
+            message += headlineLabel + ", "
+        }
+        
+        if let messageLabel = headlineBody.messageLabel.text {
+            message += messageLabel
+        }
+        
+        accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
+    }
+}
+

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

@@ -0,0 +1,58 @@
+//
+//  ListLeftVariableNumberedListBodyTextModel.swift
+//  MVMCoreUI
+//
+//  Created by Subhankar Acharya on 12/06/20.
+//  Copyright © 2020 Verizon Wireless. All rights reserved.
+//
+
+import Foundation
+
+public class ListLeftVariableNumberedListBodyTextModel: ListItemModel, MoleculeModelProtocol {
+    //-----------------------------------------------------
+    // MARK: - Properties
+    //-----------------------------------------------------
+    
+    public static var identifier: String = "listLVNLBdy"
+    public var number: Int
+    public var headlineBody: HeadlineBodyModel
+    
+    //-----------------------------------------------------
+    // MARK: - Initializer
+    //-----------------------------------------------------
+    
+    public init(number: Int, headlineBody: HeadlineBodyModel) {
+        self.number = number
+        self.headlineBody = headlineBody
+        super.init()
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - Keys
+    //-----------------------------------------------------
+    
+    private enum CodingKeys: String, CodingKey {
+        case moleculeName
+        case number
+        case headlineBody
+    }
+    
+    //-----------------------------------------------------
+    // MARK: - Codec
+    //-----------------------------------------------------
+    
+    required public init(from decoder: Decoder) throws {
+        let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
+        number = try typeContainer.decode(Int.self, forKey: .number)
+        headlineBody = try typeContainer.decode(HeadlineBodyModel.self, forKey: .headlineBody)
+        try super.init(from: decoder)
+    }
+    
+    public override func encode(to encoder: Encoder) throws {
+        try super.encode(to: encoder)
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(moleculeName, forKey: .moleculeName)
+        try container.encode(number, forKey: .number)
+        try container.encode(headlineBody, forKey: .headlineBody)
+    }
+}

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

@@ -89,41 +89,19 @@ import Foundation
             message += radioButtonLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
+        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
-            message += eyebrowLabel + ", "
+            message += label
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        radioButton.isAccessibilityElement = linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = message
         } else {
             // Allow only radio button and link to be focused on.
             radioButton.accessibilityLabel = message
-
+            accessibilityElements = [radioButton, eyebrowHeadlineBodyLink.link]
-            var elements: [UIView] = []
-            
-            if !message.isEmpty {
-                elements.append(radioButton)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
-            accessibilityElements = elements
         }
     }
 }

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

@@ -50,9 +50,9 @@ import UIKit
         eyebrowHeadlineBodyLink.body.textColor = .mvmOrangeAA
         eyebrowHeadlineBodyLink.headline.setFontStyle(.BoldBodySmall)
 
-        accessibilityTraits = radioButton.accessibilityTraits
         accessibilityHint = radioButton.accessibilityHint
-        
+        accessibilityTraits = radioButton.accessibilityTraits
+
         // Update accessibility label on radio button state change.
         observation = observe(\.radioButton.isSelected, options: [.new]) { [weak self] _, _ in
             self?.updateAccessibilityLabel()
@@ -103,44 +103,23 @@ import UIKit
             message += radioButtonLabel + ", "
         }
         
-        if let leftImageLabel = leftImage.accessibilityLabel {
+        if let leftImageLabel = leftImage.imageView.accessibilityLabel {
             message += leftImageLabel + ", "
         }
         
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
+        if let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() {
-            message += eyebrowLabel + ", "
+            message += label
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel
         }
         
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        radioButton.isAccessibilityElement = linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
             accessibilityLabel = message
         } else {
             // Allow only radio button and link to be focused on.
             radioButton.accessibilityLabel = message
-            var elements: [UIView] = []
+            accessibilityElements = [radioButton, eyebrowHeadlineBodyLink.link]
-            
-            if !message.isEmpty {
-                elements.append(radioButton)
-            }
-            
-            if linkShowing {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
-            accessibilityElements = elements
         }
     }
 }

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

@@ -47,9 +47,8 @@ open class ListLeftVariableRadioButtonBodyText: TableViewCell {
         
         // Make the whole cell focusable.
         isAccessibilityElement = true
-        radioButton.isAccessibilityElement = false
-        accessibilityTraits = radioButton.accessibilityTraits
         accessibilityHint = radioButton.accessibilityHint
+        accessibilityTraits = radioButton.accessibilityTraits
         updateAccessibilityLabel()
         
         // Update accessibility label on radio button state change.

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ListProgressBarThin.swift

@@ -78,8 +78,6 @@ import Foundation
         stack.restack()
         horizontalStack.restack()
         labelStack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //------------------------------------------------------
@@ -115,7 +113,7 @@ import Foundation
     //------------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftHeadlineText = leftHeadline.text {
@@ -135,5 +133,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextAllTextAndLinks.swift

@@ -43,7 +43,6 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
@@ -72,8 +71,7 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
-    func updateAccessibilityLabel() {
+    func getAccessibilityMessage() -> String? {
-        
         var message = ""
         
         if let eyebrowLabel = eyebrow.text, !eyebrowLabel.isEmpty {
@@ -91,19 +89,31 @@ import Foundation
         if let bodyLabel = body.text, !bodyLabel.isEmpty {
             message += bodyLabel
         }
-        
+        return message.count > 0 ? message : nil
+    }
+    
+    // Ensures voice over does not read "selected" after user triggers action on cell.
+    override public var accessibilityTraits: UIAccessibilityTraits {
+        get {
+            return (accessoryView != nil) ? .button : .none
+        }
+        set {}
+    }
+    
+    func updateAccessibilityLabel() {
+
         let linkShowing = link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        link.isAccessibilityElement = linkShowing
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
-            accessibilityLabel = message
+            accessibilityLabel = getAccessibilityMessage()
+        } else if let accessoryView = accessoryView {
+            // Both caret and link. Read all content on caret.
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
+            accessibilityElements = [accessoryView, link]
         } else {
-            // Allow only radio button and link to be focused on.
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
-            var elements: [UIView] = []
+            var elements: [Any] = []
-
-            
             if let eyeBrowText = eyebrow.text, !eyeBrowText.isEmpty {
                 elements.append(eyebrow)
             }
@@ -119,11 +129,7 @@ import Foundation
             if let bodyText = body.text, !bodyText.isEmpty {
                 elements.append(body)
             }
-            
+            elements.append(link)
-            if linkShowing {
-                elements.append(link)
-            }
-            
             accessibilityElements = elements
         }
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.swift

@@ -24,8 +24,6 @@ import Foundation
         super.setupView()
         
         addMolecule(headlineBody)
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?){
@@ -46,7 +44,7 @@ import Foundation
     //-----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let headlineLabel = headlineBody.headlineLabel.text {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRVWheel.swift

@@ -41,8 +41,6 @@ import Foundation
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //-------------------------------------------------
@@ -75,7 +73,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
@@ -91,5 +89,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableButtonAllTextAndLinks.swift

@@ -47,9 +47,9 @@ import Foundation
         
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
         accessibilityValue = button.accessibilityValue
         accessibilityHint = button.accessibilityHint
+        accessibilityTraits = .button
     }
     
     //-----------------------------------------------------
@@ -74,48 +74,36 @@ import Foundation
     // MARK: - Accessibility
     //----------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let buttonText = button.titleLabel?.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return buttonText
+        }
+        return label + ", " + buttonText
+    }
+    
     func updateAccessibilityLabel() {
-        
-        var message = ""
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel + ", "
-        }
-        
-        if let buttonLabel = button.accessibilityLabel {
-            message += buttonLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        
+        if !linkShowing && accessoryView == nil {
-        isAccessibilityElement = !linkShowing
+            // Make whole cell focusable if one action
-        button.isAccessibilityElement = linkShowing
+            isAccessibilityElement = true
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
+            accessibilityLabel = getAccessibilityMessage()
-        
-        if !linkShowing {
-            // Make whole cell focusable if no link.
-            accessibilityLabel = message
         } else {
-            // Allow only radio button and link to be focused on.
+            // Make buttons focusable.
-            button.accessibilityLabel = message
+            isAccessibilityElement = false
-            var elements: [UIView] = []
+            var elements: [Any] = []
-            
+            if let accessoryView = accessoryView {
-            if !message.isEmpty {
+                accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
-                elements.append(button)
+                elements.append(accessoryView)
+            } else {
+                button.accessibilityLabel = getAccessibilityMessage()
             }
-            
+            elements.append(button)
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            
             accessibilityElements = elements
         }
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePayments.swift

@@ -40,8 +40,6 @@ import Foundation
         rightImage.addSizeConstraintsForAspectRatio = true
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //----------------------------------------------------
@@ -72,17 +70,18 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
             message += leftLabelText + ", "
         }
         
-        if let rightImageText = rightImage.accessibilityLabel, !rightImageText.isEmpty {
+        if let rightImageText = rightImage.imageView.accessibilityLabel, !rightImageText.isEmpty {
             message += rightImageText
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeAllTextAndLinks.swift

@@ -67,7 +67,6 @@ import Foundation
         arrow.pinHeightAndWidth()
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
@@ -89,57 +88,36 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let rightLabelText = rightLabel.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return rightLabelText
+        }
+        return label + ", " + rightLabelText
+    }
+    
     func updateAccessibilityLabel() {
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
         isAccessibilityElement = !linkShowing
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
+        accessibilityTraits = (isAccessibilityElement && accessoryView != nil) ? .button : .none        
-        
         if !linkShowing {
             // Make whole cell focusable if no link.
-            var message = ""
+            accessibilityLabel = getAccessibilityMessage()
-            
+        } else if let accessoryView = accessoryView {
-            if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
+            // Both caret and link. Read all content on caret.
-                message += eyebrowLabel + ", "
+            accessoryView.accessibilityLabel = getAccessibilityMessage()
-            }
+            accessibilityElements = [accessoryView, eyebrowHeadlineBodyLink.link]
-            
-            if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-                message += headlineLabel + ", "
-            }
-            
-            if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-                message += bodyLabel + ", "
-            }
-            
-            if let rightLabelText = rightLabel.text {
-                message += rightLabelText
-            }
-            
-            accessibilityLabel = message
-            
         } else {
-            var elements: [UIView] = []
+            // Only link. Manually add accessibility elements to ensure they are read in the right order.
-            
+            var elements: [Any] = []
-            if let eyebrowText = eyebrowHeadlineBodyLink.eyebrow.text, !eyebrowText.isEmpty {
+            if let otherElements = eyebrowHeadlineBodyLink.getAccessibilityElements() {
-                elements.append(eyebrowHeadlineBodyLink.eyebrow)
+                elements.append(otherElements)
             }
-            
-            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 {
-                elements.append(eyebrowHeadlineBodyLink.link)
-            }
-            
             if let rightLabelText = rightLabel.text, !rightLabelText.isEmpty {
                 elements.append(rightLabel)
             }
-            
             accessibilityElements = elements
         }
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariablePriceChangeBodyText.swift

@@ -54,8 +54,6 @@ import Foundation
         addMolecule(stack)
         stack.restack()
         arrowAndRightLabelStack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -87,7 +85,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let headlineText = headlineBody.headlineLabel.text, !headlineText.isEmpty {
@@ -103,5 +101,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTextLinkAllTextAndLinks.swift

@@ -47,7 +47,6 @@ import Foundation
         
         addMolecule(stack)
         stack.restack()
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -72,52 +71,41 @@ import Foundation
     // MARK: - Accessibility
     //--------------------------------------------------
     
+    func getAccessibilityMessage() -> String? {
+        guard let linkText = link.titleLabel?.text else {
+            return eyebrowHeadlineBodyLink.getAccessibilityMessage()
+        }
+        guard let label = eyebrowHeadlineBodyLink.getAccessibilityMessage() else {
+            return linkText
+        }
+        return label + ", " + linkText
+    }
+    
     func updateAccessibilityLabel() {
-        
-        var message = ""
-        
-        if let eyebrowLabel = eyebrowHeadlineBodyLink.eyebrow.text {
-            message += eyebrowLabel + ", "
-        }
-        
-        if let headlineLabel = eyebrowHeadlineBodyLink.headline.text {
-            message += headlineLabel + ", "
-        }
-        
-        if let bodyLabel = eyebrowHeadlineBodyLink.body.text {
-            message += bodyLabel + ", "
-        }
-        
-        if let linkLabel = link.accessibilityLabel {
-            message += linkLabel
-        }
-        
         let linkShowing = eyebrowHeadlineBodyLink.link.titleLabel?.text?.count ?? 0 > 0
-        
+        accessibilityTraits = .button
-        isAccessibilityElement = !linkShowing
+        if !linkShowing && accessoryView == nil {
-        link.isAccessibilityElement = linkShowing
+            // Make whole cell focusable if one action
-        eyebrowHeadlineBodyLink.link.isAccessibilityElement = linkShowing
+            isAccessibilityElement = true
-        
+            accessibilityLabel = getAccessibilityMessage()
-        if !linkShowing {
-            // Make whole cell focusable if no link.
-            accessibilityLabel = message
         } else {
-            // Allow only radio button and link to be focused on.
+            // Make buttons focusable.
-            link.accessibilityLabel = message
+            isAccessibilityElement = false
-            var elements: [UIView] = []
+            var elements: [Any] = []
-            
+            if let accessoryView = accessoryView {
+                accessoryView.accessibilityLabel = eyebrowHeadlineBodyLink.getAccessibilityMessage()
+                elements.append(accessoryView)
+            } else {
+                link.accessibilityLabel = getAccessibilityMessage()
+            }
+            elements.append(link)
             if linkShowing {
                 elements.append(eyebrowHeadlineBodyLink.link)
             }
-            
-            if !message.isEmpty {
-                elements.append(link)
-            }
-            
             accessibilityElements = elements
         }
     }
-    
+            
     open override func accessibilityActivate() -> Bool {
         return link.accessibilityActivate()
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/RightVariable/ListRightVariableTotalData.swift

@@ -51,8 +51,6 @@ import Foundation
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -86,7 +84,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabelText = leftLabel.text, !leftLabelText.isEmpty {
@@ -98,5 +96,6 @@ import Foundation
         }
         
         accessibilityLabel = message
+        accessibilityTraits = (accessoryView != nil) ? .button : .none
     }
 }

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnDataUsage.swift

@@ -42,8 +42,6 @@ import Foundation
         super.setupView()
         addMolecule(stack)
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //--------------------------------------------------
@@ -77,7 +75,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftText = leftLabel.text, !leftText.isEmpty {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/ThreeColumn/ListThreeColumnInternationalData.swift

@@ -55,8 +55,6 @@ import Foundation
         arrow.pinHeightAndWidth()
         arrowAndLabel2Stack.restack()
         stack.restack()
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
@@ -87,7 +85,7 @@ import Foundation
     //--------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftText = leftLabel.text, !leftText.isEmpty {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnCompareChanges.swift

@@ -54,7 +54,6 @@ import Foundation
             ((molecule as? StackItem)?.view as? Stack<StackModel>)?.restack()
         }
         containingStack.restack()
-        isAccessibilityElement = false
     }
     
     //------------------------------------------------------

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDescription.swift

@@ -67,9 +67,6 @@ import Foundation
         leftHeadline.numberOfLines = 1
         rightLabel.numberOfLines = 1
         rightSubLabel.numberOfLines = 1
-        
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     //----------------------------------------------------
@@ -107,7 +104,7 @@ import Foundation
     //----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftHeadline = leftHeadline.text, !leftHeadline.isEmpty {

MVMCoreUI/Atomic/Molecules/DesignedComponents/List/TwoColumn/ListTwoColumnPriceDetails.swift

@@ -31,8 +31,6 @@ import UIKit
         containerHelper.constrainView(view)
         rightLabel.setContentCompressionResistancePriority(UILayoutPriority(rawValue: 900), for: .horizontal)
         rightLabel.setContentHuggingPriority(.defaultHigh, for: .vertical)
-        isAccessibilityElement = true
-        updateAccessibilityLabel()
     }
     
     open override func updateView(_ size: CGFloat) {
@@ -72,7 +70,7 @@ import UIKit
     //----------------------------------------------------
     
     func updateAccessibilityLabel() {
-        
+        isAccessibilityElement = true
         var message = ""
         
         if let leftLabel = leftLabel.text, !leftLabel.isEmpty {

MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift

@@ -19,7 +19,7 @@ public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProt
     public var tintColor: Color
     public var line: LineModel?
     public var alwaysShowBackButton = false
-    public var backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol)? = NavigationImageButtonModel(with: "back", action: ActionBackModel())
+    public var backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol)? = NavigationImageButtonModel(with: "nav_back", action: ActionBackModel())
     public var additionalLeftButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
     public var additionalRightButtons: [(NavigationButtonModelProtocol & MoleculeModelProtocol)]?
     
@@ -51,7 +51,7 @@ public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProt
         hidden = try typeContainer.decodeIfPresent(Bool.self, forKey: .hidden) ?? false
         backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) ?? Color(uiColor: .white)
         tintColor = try typeContainer.decodeIfPresent(Color.self, forKey: .tintColor) ?? Color(uiColor: .black)
-        line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line)
+        line = try typeContainer.decodeIfPresent(LineModel.self, forKey: .line) ?? LineModel(type: .standard)
         alwaysShowBackButton = try typeContainer.decodeIfPresent(Bool.self, forKey: .alwaysShowBackButton) ?? false
         if let backButton: (NavigationButtonModelProtocol & MoleculeModelProtocol) = try typeContainer.decodeModelIfPresent(codingKey: .backButton) {
             self.backButton = backButton

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/EyebrowHeadlineBodyLink.swift

@@ -69,4 +69,44 @@ import UIKit
     open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? {
         return 65
     }
+    
+    //--------------------------------------------------
+    // MARK: - Accessibility Helpers
+    //--------------------------------------------------
+    
+    /// Returns the labels text in one message.
+    func getAccessibilityMessage() -> String? {
+        var message = ""
+    
+        if let eyebrowLabel = eyebrow.text {
+            message += eyebrowLabel + ", "
+        }
+        
+        if let headlineLabel = headline.text {
+            message += headlineLabel + ", "
+        }
+        
+        if let bodyLabel = body.text {
+            message += bodyLabel
+        }
+        return message.count > 0 ? message : nil
+    }
+    
+    /// Returns an array of the appropriate accessibility elements.
+    func getAccessibilityElements() -> [Any]? {
+        var elements: [UIView] = []
+        if eyebrow.hasText {
+            elements.append(eyebrow)
+        }
+        if headline.hasText {
+            elements.append(headline)
+        }
+        if body.hasText {
+            elements.append(body)
+        }
+        if link.titleLabel?.text?.count ?? 0 > 0 {
+            elements.append(link)
+        }
+        return elements.count > 0 ? elements : nil
+    }
 }

MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/ThreeHeadlineBodyLink.swift

@@ -73,8 +73,8 @@ open class ThreeHeadlineBodyLink: View {
         bottomAnchor.constraint(equalTo: link.bottomAnchor).isActive = true
         
         isAccessibilityElement = true
-        accessibilityTraits = link.accessibilityTraits
         accessibilityHint = link.accessibilityHint
+        accessibilityTraits = link.accessibilityTraits
         updateAccessibilityLabel()
     }
 

MVMCoreUI/BaseClasses/TableViewCell.swift

@@ -205,8 +205,8 @@ import UIKit
         let caret = CaretView(lineWidth: 1)
         caret.translatesAutoresizingMaskIntoConstraints = true
         caret.isAccessibilityElement = true
-        caret.accessibilityTraits = .button
         caret.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "AccTabHint")
+        caret.accessibilityTraits = .button
         caret.size = .small(.vertical)
         if let size = caret.size?.dimensions() {
             caret.frame = CGRect(origin: CGPoint.zero, size: size)

MVMCoreUI/BaseControllers/ViewController.swift

@@ -163,9 +163,6 @@ import UIKit
     open func createDefaultLegacyNavigationModel() -> NavigationItemModel {
         let navigationModel = NavigationItemModel()
         navigationModel.title = pageModel?.screenHeading
-        if /*(self as? MVMCoreUITabBarPageControlViewController) != nil ||*/ manager != nil || loadObject?.requestParameters?.tabWasPressed ?? false == true {
-            navigationModel.line = LineModel(type: .none)
-        }
         return navigationModel
     }
 

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m

@@ -146,7 +146,7 @@ CGFloat const PanelAnimationDuration = 0.2;
 }
 
 - (nullable UIImage *)imageForBackButton {
-    return [MVMCoreUIUtility imageNamed:@"back"];
+    return [MVMCoreUIUtility imageNamed:@"nav_back"];
 }
 
 #pragma mark - Button Presses