CXTDT-560823 – TextArea – Accessibility Labels/Error/ReadyOnly/Disabled.

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

VDS/Components/DatePicker/DatePicker.swift

@@ -147,12 +147,7 @@ open class DatePicker: EntryFieldBase, DatePickerViewControllerDelegate, UIPopov
     
     open override func updateAccessibility() {
         super.updateAccessibility()
-        let label = "Date Picker, \(isReadOnly ? ", read only" : "")"
+        fieldStackView.accessibilityLabel = "Date Picker, \(accessibilityLabelText)"
-        if let errorText, showError {
-            fieldStackView.accessibilityLabel = "\(label) ,error, \(errorText)"
-        } else {
-            fieldStackView.accessibilityLabel = label
-        }
         fieldStackView.accessibilityHint = isReadOnly || !isEnabled ? "" : "Double tap to open."
         fieldStackView.accessibilityValue = value
     }

VDS/Components/DropdownSelect/DropdownSelect.swift

@@ -278,12 +278,7 @@ open class DropdownSelect: EntryFieldBase {
     
     open override func updateAccessibility() {
         super.updateAccessibility()
-        let label = "Dropdown Select, \(isReadOnly ? ", read only" : "")"
+        fieldStackView.accessibilityLabel = "Dropdown Select, \(accessibilityLabelText)"
-        if let errorText, showError {
-            fieldStackView.accessibilityLabel = "\(label) ,error, \(errorText)"
-        } else {
-            fieldStackView.accessibilityLabel = label
-        }
         fieldStackView.accessibilityHint = isReadOnly || !isEnabled ? "" : "Double tap to open."
         fieldStackView.accessibilityValue = value
     }

VDS/Components/TextFields/EntryFieldBase.swift

@@ -241,6 +241,23 @@ open class EntryFieldBase: Control, Changeable, FormFieldInternalValidatable {
         
     open var rules = [AnyRule<String>]()
 
+    open var accessibilityLabelText: String {
+        var accessibilityLabels = [String]()
+        if let text = titleLabel.text {
+            accessibilityLabels.append(text)
+        }
+        if isReadOnly {
+            accessibilityLabels.append("read only")
+        }
+        if !isEnabled {
+            accessibilityLabels.append("dimmed")
+        }
+        if let errorText, showError {
+            accessibilityLabels.append("error, \(errorText)")
+        }
+        return accessibilityLabels.joined(separator: ", ")
+    }
+    
     //--------------------------------------------------
     // MARK: - Overrides
     //--------------------------------------------------

VDS/Components/TextFields/InputField/InputField.swift

@@ -225,15 +225,10 @@ open class InputField: EntryFieldBase {
         textField.isUserInteractionEnabled = isEnabled && !isReadOnly
         textField.textColor = textFieldTextColorConfiguration.getColor(self)
     }
-    
+        
     open override func updateAccessibility() {
         super.updateAccessibility()
-        let label = "\(isReadOnly ? "read only" : "")"
+        textField.accessibilityLabel = accessibilityLabelText
-        if let errorText, showError {
-            textField.accessibilityLabel = "\(label) ,error, \(errorText)"
-        } else {
-            textField.accessibilityLabel = label
-        }
         textField.accessibilityHint = isReadOnly || !isEnabled ? "" : "Double tap to open."
     }
     

VDS/Components/TextFields/TextArea/TextArea.swift

@@ -195,12 +195,7 @@ open class TextArea: EntryFieldBase {
     
     open override func updateAccessibility() {
         super.updateAccessibility()
-        let label = "\(isReadOnly ? "read only" : "")"
+        textView.accessibilityLabel = accessibilityLabelText
-        if let errorText, showError {
-            textView.accessibilityLabel = "\(label) ,error, \(errorText)"
-        } else {
-            textView.accessibilityLabel = label
-        }
         textView.accessibilityHint = isReadOnly || !isEnabled ? "" : "Double tap to open."
     }
     

VDS/SupportingFiles/ReleaseNotes.txt

@@ -3,6 +3,7 @@
 - CXTDT-565087 - Input Field - Text - OnDark colors
 - CXTDT-565112 - Input Field - Credit Card icons
 - CXTDT-565117 - Input Field - Overflow not clipped
+- CXTDT-560823 – TextArea – Accessibility Labels/Error/ReadyOnly/Disabled
 
 1.0.65
 ----------------