Merge pull request #668 from kiwicom/fix-inputcontent-label-accessibi…

…lity Update accessibility of InputContent labels
kiwicom · Aug 23, 2023 · 72cddad · 72cddad
2 parents c1ed261 + 6833f7d
commit 72cddad
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/Sources/Orbit/Support/Forms/FieldLabel.swift b/Sources/Orbit/Support/Forms/FieldLabel.swift
@@ -8,7 +8,6 @@ public struct FieldLabel: View {
     public var body: some View {
         Text(label)
             .fontWeight(.medium)
-            .accessibility(.fieldLabel)
     }
 
     /// Create Orbit form field label.
@@ -17,12 +16,6 @@ public struct FieldLabel: View {
     }
 }
 
-// MARK: - Identifiers
-public extension AccessibilityID {
-
-    static let fieldLabel = Self(rawValue: "orbit.field.label")
-}
-
 // MARK: - Previews
 struct FieldLabelPreviews: PreviewProvider {
 

diff --git a/Sources/Orbit/Support/Forms/FieldWrapper.swift b/Sources/Orbit/Support/Forms/FieldWrapper.swift
@@ -13,8 +13,9 @@ public struct FieldWrapper<Label: View, Content: View, Footer: View>: View {
     public var body: some View {
         VStack(alignment: .leading, spacing: 0) {
             label
-                // The component should expose the label as a part of the field primary input or action
+                // Component should expose label as part of content
                 .accessibility(hidden: true)
+                .accessibility(removeTraits: .isStaticText)
                 .padding(.bottom, .xxSmall)
 
             content

diff --git a/Sources/Orbit/Support/Forms/InputContent.swift b/Sources/Orbit/Support/Forms/InputContent.swift
@@ -34,6 +34,9 @@ public struct InputContent<Content: View, Prefix: View, Suffix: View>: View {
                     .padding(.leading, .small)
                     .padding(.trailing, -.xxSmall)
                     .textColor(labelColor)
+                    // Component should expose label as part of content
+                    .accessibility(hidden: true)
+                    .accessibility(removeTraits: .isStaticText)
 
                 content
             }