Merge pull request #179 from iZettle/form-view-non-section-accessibility

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

Author: Alasdair Baxter

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.3.2
+
+- Include all views, not just sections, in the accessibility elements of a FormView.
+
 # 3.3.1
 
 - Improved the accessibility of `FormView` by making it an accessibility container comprising the visible rows from each of its visible sections.

Form/FormView.swift

@@ -42,14 +42,9 @@ public extension FormView {
 
     override var accessibilityElements: [Any]? {
         get {
-            let visibleSections = sections.filter { !$0.isHidden }
+            let visibleViews = orderedViews.filter { !$0.isHidden }
 
-            var elements: [Any] = []
-            for section in visibleSections {
-                elements.append(contentsOf: section.accessibilityElements ?? [])
-            }
-
-            return elements
+            return visibleViews
         }
 
         //swiftlint:disable:next unused_setter_value