feat: Accessibility Identifier

Author: matusklasovity

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

@@ -108,6 +108,8 @@ extension InputFieldSampleView {
         InputField(text: $name, title: "Name", placeholder: "Jožko", hint: "Text is limited to 10 characters")
         // Override of default accessibility label
             .setAccessibilityLabel("Fill the name")
+        // Accessibility identifier for UI tests
+            .setAccessibilityIdentifier("nameTextField")
 
         // "Continue" keyboard action button
             .inputFieldTraits(returnKeyType: .continue)
@@ -125,9 +127,6 @@ extension InputFieldSampleView {
         // Focus state binding to advance focus from keyboard action button (Continue)
             .bindFocusState($focusState, to: .name)
             .disabled(!nameEnabled)
-
-        // Accessibility identifier for UI tests
-            .accessibilityIdentifier("nameTextField")
     }
 
     private var pinCodeInputField: some View {
@@ -148,6 +147,9 @@ extension InputFieldSampleView {
 
         // Setting accessibility labels for eye Button (secureField)
             .setEyeButtonAccessibilityLabel(showLabel: "Show PIN", hideLabel: "Hide PIN")
+        
+        // Accessibility identifier for UI tests
+            .setAccessibilityIdentifier("pinTextField")
 
         // Custom validation criteria closure
             .validationCriteria {
@@ -167,9 +169,6 @@ extension InputFieldSampleView {
             .validityGroup($validityGroup)
             .bindFocusState($focusState, to: .pin)
             .disabled(!passwordEnabled)
-
-        // Accessibility identifier for UI tests
-            .accessibilityIdentifier("pinTextField")
     }
 
     private var percentFormattedInputField: some View {
@@ -200,7 +199,8 @@ extension InputFieldSampleView {
             hint: nil,
             leftView: {
                 Text("+421 \(password)")
-                    .accessibilityHidden(true)
+                    .accessibilityLabel("Predvoľba")
+                    .accessibilityValue("+421 \(password)")
             },
             rightView: {
                 Button {
@@ -213,8 +213,8 @@ extension InputFieldSampleView {
                 }
             }
         )
+        .setAccessibilityIdentifier("customViewsInputField")
         .alert("Right button alert", isPresented: $showsRightAlert, actions: {})
-        .accessibilityIdentifier("customViewsInputField")
     }
 
     private var validityGroups: some View {

Sources/GRInputField/SwiftUI/InputField.swift

@@ -41,7 +41,8 @@ public struct InputField<LeftView: View, RightView: View>: UIViewRepresentable {
     private var submitAction: MainClosure?
     private var resignAction: MainClosure?
     private var editingChangedAction: MainClosure?
-    
+
+    private var accessibilityIdentifier: String?
     private var accessibilityLabel: String?
     private var accessibilityValue: String?
     private var accessibilityHint: String?
@@ -67,7 +68,8 @@ public struct InputField<LeftView: View, RightView: View>: UIViewRepresentable {
         self.criteria = { Validator(criteria: [Criterion.alwaysValid]) }
         self.leftView = leftView
         self.rightView = rightView
-        
+
+        self.accessibilityIdentifier = self.title
         self.accessibilityLabel = self.title
         self.accessibilityValue = self.text
         self.accessibilityHint = self.hint
@@ -370,6 +372,7 @@ public struct InputField<LeftView: View, RightView: View>: UIViewRepresentable {
     // MARK: - Accessibility
 
     func updateAccessibility(_ uiView: ValidableInputFieldView) {
+        uiView.accessibilityIdentifier = accessibilityIdentifier
         uiView.accessibilityLabel = accessibilityLabel
         uiView.accessibilityHint = accessibilityHint
         uiView.accessibilityValue = accessibilityValue
@@ -460,7 +463,13 @@ public extension InputField {
 // MARK: - Accessibility
 
 public extension InputField {
-    
+
+    func setAccessibilityIdentifier(_ identifier: String) -> Self {
+        var modifiedSelf = self
+        modifiedSelf.accessibilityIdentifier = identifier
+        return modifiedSelf
+    }
+
     func setAccessibilityLabel(_ label: String) -> Self {
         var modifiedSelf = self
         modifiedSelf.accessibilityLabel = label

Sources/GRInputField/UIKit/InputFieldView.swift

@@ -169,7 +169,15 @@ public class InputFieldView: UIView {
     private(set) public lazy var editingChangedPublisher = editingChangedSubject.eraseToAnyPublisher()
 
     // MARK: - Accessibility
-    
+
+    public override var accessibilityIdentifier: String? {
+        get {
+            textField.accessibilityIdentifier
+        } set {
+            textField.accessibilityIdentifier = newValue
+        }
+    }
+
     public override var accessibilityLabel: String? {
         get {
             textField.accessibilityLabel
@@ -466,6 +474,9 @@ private extension InputFieldView {
         eyeButton.accessibilityLabel = isSecure
             ? showPasswordAccessibilityLabel
             : hidePasswordAccessibilityLabel
+        eyeButton.accessibilityIdentifier = isSecure
+            ? "show"
+            : "hide"
     }
 
     func trimWhitespaceIfAllowed() {
@@ -773,16 +784,3 @@ private extension InputFieldView {
     }
 
 }
-
-// MARK: - Accessiblity
-//
-//private extension InputFieldView {
-//    
-//    func accessibilityAnnounceFailure {
-//        guard let message else { return }
-//        
-//        DispatchQueue.main.async {
-//        }
-//    }
-//    
-//}