feat: Secure InputField accessibility support

Author: MatusMistrik

GoodSwiftUI-Sample/GoodSwiftUI-Sample/Screens/InputFieldSampleView.swift

@@ -106,8 +106,8 @@ extension InputFieldSampleView {
     private var nameInputField: some View {
         // Text field
         InputField(text: $name, title: "Name", placeholder: "Jožko", hint: "Text is limited to 10 characters")
-        // Override of default accessibility
-            .overrideAccessibilityLabel("Fill the name")
+        // Override of default accessibility label
+            .setAccessibilityLabel("Fill the name")
 
         // "Continue" keyboard action button
             .inputFieldTraits(returnKeyType: .continue)
@@ -145,6 +145,9 @@ extension InputFieldSampleView {
                 numpadReturnKeyTitle: "Done",
                 isSecureTextEntry: true
             )
+        
+        // Setting accessibility labels for eye Button (secureField)
+            .setEyeButtonAccessibilityLabel(showLabel: "Show PIN", hideLabel: "Hide PIN")
 
         // Custom validation criteria closure
             .validationCriteria {

Sources/GRInputField/SwiftUI/InputField.swift

@@ -45,6 +45,8 @@ public struct InputField<LeftView: View, RightView: View>: UIViewRepresentable {
     private var accessibilityLabel: String?
     private var accessibilityValue: String?
     private var accessibilityHint: String?
+    private var showPasswordAccessibilityLabel: String?
+    private var hidePasswordAccessibilityLabel: String?
 
     // MARK: - Initialization
 
@@ -371,6 +373,8 @@ public struct InputField<LeftView: View, RightView: View>: UIViewRepresentable {
         uiView.accessibilityLabel = accessibilityLabel
         uiView.accessibilityHint = accessibilityHint
         uiView.accessibilityValue = accessibilityValue
+        uiView.showPasswordAccessibilityLabel = showPasswordAccessibilityLabel
+        uiView.hidePasswordAccessibilityLabel = hidePasswordAccessibilityLabel
     }
 
 }
@@ -457,24 +461,31 @@ public extension InputField {
 
 public extension InputField {
 
-    func overrideAccessibilityLabel(_ label: String) -> Self {
+    func setAccessibilityLabel(_ label: String) -> Self {
         var modifiedSelf = self
         modifiedSelf.accessibilityLabel = label
         return modifiedSelf
     }
 
-    func overrideAccessibilityHint(_ hint: String) -> Self {
+    func setAccessibilityHint(_ hint: String) -> Self {
         var modifiedSelf = self
         modifiedSelf.accessibilityHint = hint
         return modifiedSelf
     }
 
-    func overrideAccessibilityValue(_ value: String) -> Self {
+    func setAccessibilityValue(_ value: String) -> Self {
         var modifiedSelf = self
         modifiedSelf.accessibilityValue = value
         return modifiedSelf
     }
 
+    func setEyeButtonAccessibilityLabel(showLabel: String, hideLabel: String) -> Self {
+        var modifiedSelf = self
+        modifiedSelf.showPasswordAccessibilityLabel = showLabel
+        modifiedSelf.hidePasswordAccessibilityLabel = hideLabel
+        return modifiedSelf
+    }
+    
 }
 
 // MARK: - View focus extension

Sources/GRInputField/UIKit/InputFieldView.swift

@@ -109,7 +109,6 @@ public class InputFieldView: UIView {
         $0.translatesAutoresizingMaskIntoConstraints = false
         $0.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
         $0.setContentHuggingPriority(.defaultHigh, for: .horizontal)
-        $0.isAccessibilityElement = false
     }
 
     private let lineView = UIView().then {
@@ -135,6 +134,7 @@ public class InputFieldView: UIView {
         set {
             textField.text = newValue
             editingChangedSubject.send(newValue)
+            accessibilityValue = newValue
         }
     }
 
@@ -188,11 +188,32 @@ public class InputFieldView: UIView {
 
     public override var accessibilityValue: String? {
         get {
-            textField.accessibilityValue
+            if isSecureTextEntry {
+                return textField.isSecureTextEntry ? textField.accessibilityValue : text
+            } else {
+                return textField.accessibilityValue
+            }
         } set {
+            guard !isSecureTextEntry else { return }
+            
             textField.accessibilityValue = newValue
         }
     }
+    
+    public var showPasswordAccessibilityLabel: String? {
+        didSet {
+            guard textField.isSecureTextEntry else { return }
+            
+            eyeButton.accessibilityLabel = showPasswordAccessibilityLabel
+        }
+    }
+    public var hidePasswordAccessibilityLabel: String? {
+        didSet {
+            guard !textField.isSecureTextEntry else { return }
+            
+            eyeButton.accessibilityLabel = hidePasswordAccessibilityLabel
+        }
+    }
 
     // MARK: - Initializer
 
@@ -442,6 +463,9 @@ private extension InputFieldView {
         eyeButton.isHidden = false
         eyeButton.setImage(eyeImage, for: .normal)
         textField.isSecureTextEntry = isSecure
+        eyeButton.accessibilityLabel = isSecure
+            ? showPasswordAccessibilityLabel
+            : hidePasswordAccessibilityLabel
     }
 
     func trimWhitespaceIfAllowed() {