Merge pull request #176 from iZettle/form-view-accessibility

PLT-2592 Expose the Contents of a `FormView` as Accessibility Elements

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.3.1
+
+- Improved the accessibility of `FormView` by making it an accessibility container comprising the visible rows from each of its visible sections.
+
 # 3.3.0
 
 - Added (backwards compatible) support for supplying an `accessibilityValue` to `ValueField` through `TextEditor`.

Form/FormView.swift

@@ -39,6 +39,23 @@ public class FormView: UIStackView, DynamicStylable {
 }
 
 public extension FormView {
+
+    override var accessibilityElements: [Any]? {
+        get {
+            let visibleSections = sections.filter { !$0.isHidden }
+
+            var elements: [Any] = []
+            for section in visibleSections {
+                elements.append(contentsOf: section.accessibilityElements ?? [])
+            }
+
+            return elements
+        }
+
+        //swiftlint:disable:next unused_setter_value
+        set { /* Always computed */ }
+    }
+
     var sections: [SectionView] {
         return orderedViews.compactMap { $0 as? SectionView }
     }

Form/SectionView.swift

@@ -86,6 +86,29 @@ extension SectionView: SubviewOrderable {
 }
 
 public extension SectionView {
+
+    override var accessibilityElements: [Any]? {
+        get {
+            var elements: [Any] = []
+
+            if let header = headerView {
+                elements.append(header)
+            }
+
+            let visibleRows = orderedViews.filter { !$0.isHidden }
+            elements.append(contentsOf: visibleRows)
+
+            if let footer = footerView {
+                elements.append(footer)
+            }
+
+            return elements
+        }
+
+        //swiftlint:disable:next unused_setter_value
+        set { /* Always computed */ }
+    }
+
     var headerView: UIView? {
         return header.view
     }