Revert "Fix AccessibilityContainer behaviour when it contains a UICollectionView" (#551)

This reverts commit 24b5aa0.

Author: meherkasam-square

BlueprintUICommonControls/Sources/AccessibilityContainer.swift

@@ -62,7 +62,6 @@ public struct AccessibilityContainer: Element {
             config[\.accessibilityValue] = value
             config[\.accessibilityIdentifier] = identifier
             config[\.accessibilityContainerType] = containerType.UIKitContainerType
-            config[\.layoutDirection] = context.environment.layoutDirection
         }
     }
 }
@@ -107,43 +106,25 @@ extension Element {
 
 extension AccessibilityContainer {
     private final class AccessibilityContainerView: UIView {
-        var layoutDirection: Environment.LayoutDirection = .leftToRight
-
         override var accessibilityElements: [Any]? {
-            get { accessibilityElements(layoutDirection: layoutDirection) }
+            get { recursiveAccessibleSubviews() }
             set { fatalError("This property is not settable") }
         }
     }
 }
 
 extension UIView {
-    func accessibilityElements(layoutDirection: Environment.LayoutDirection) -> [NSObject] {
-        recursiveAccessibilityElements().sorted(by: AccessibilityElement.frameSort(direction: layoutDirection))
-    }
-
-    private func recursiveAccessibilityElements() -> [NSObject] {
-        subviews.flatMap { subview -> [NSObject] in
+    func recursiveAccessibleSubviews() -> [Any] {
+        subviews.flatMap { subview -> [Any] in
             if subview.accessibilityElementsHidden || subview.isHidden {
                 return []
-            }
-
-            // UICollectionView is a special case because it uses virtualization to only show a subset of its elements.
-            // By doing this, we outsource the logic of specifying the accessibility elements to the collection view itself.
-            // If we did not do this, we would only make the visible cells accessible, and it would prevent the user from
-            // scrolling/swiping to cells outside the visible area.
-            if let collectionView = subview as? UICollectionView {
-                return [collectionView]
-            }
-
-            if let accessibilityElements = subview.accessibilityElements {
-                return accessibilityElements.compactMap { $0 as? NSObject }
-            }
-
-            if subview.isAccessibilityElement {
+            } else if let accessibilityElements = subview.accessibilityElements {
+                return accessibilityElements
+            } else if subview.isAccessibilityElement {
                 return [subview]
+            } else {
+                return subview.recursiveAccessibleSubviews()
             }
-
-            return subview.recursiveAccessibilityElements()
         }
     }
 }

BlueprintUICommonControls/Sources/AccessibilityElement.swift

@@ -202,29 +202,3 @@ extension Element {
         )
     }
 }
-
-extension AccessibilityElement {
-    public static func frameSort(direction: Environment.LayoutDirection) -> (NSObject, NSObject) -> Bool {
-        {
-            let first = $0.accessibilityFrame
-            let second = $1.accessibilityFrame
-
-            // Derived through experimentation, this mimics the default sorting for UIKit.
-            // If frames differ by more than 8 points the top most element is preferred.
-            let verticalThreshold = 8.0
-            let verticalDelta = abs(first.minY - second.minY)
-            if verticalDelta > verticalThreshold {
-                return first.minY < second.minY
-            }
-
-            // Prefer the leading element.
-            switch direction {
-            case .leftToRight:
-                return first.minX < second.minX
-
-            case .rightToLeft:
-                return first.maxX > second.maxX
-            }
-        }
-    }
-}

BlueprintUICommonControls/Tests/Sources/AccessibilityContainerTests.swift

@@ -16,7 +16,7 @@ class AccessibilityContainerTests: XCTestCase {
         let outerContainerView = UIView()
         outerContainerView.addSubview(innerContainerView)
 
-        let accessibleSubviews = outerContainerView.accessibilityElements(layoutDirection: .leftToRight) as! [UIView]
+        let accessibleSubviews = outerContainerView.recursiveAccessibleSubviews() as! [UIView]
 
         XCTAssertEqual(accessibleSubviews.count, 2)
         XCTAssertTrue(accessibleSubviews.contains(where: { $0 === viewA }))
@@ -34,7 +34,7 @@ class AccessibilityContainerTests: XCTestCase {
         let containerView = UIView()
         containerView.addSubview(wrapperView)
 
-        let accessibleSubviews = containerView.accessibilityElements(layoutDirection: .leftToRight) as! [UIView]
+        let accessibleSubviews = containerView.recursiveAccessibleSubviews() as! [UIView]
 
         XCTAssertEqual(accessibleSubviews[0], accessibleView)
     }
@@ -53,7 +53,7 @@ class AccessibilityContainerTests: XCTestCase {
         outerContainerView.addSubview(accessibleView)
         outerContainerView.addSubview(innerContainerView)
 
-        let accessibleSubviews = outerContainerView.accessibilityElements(layoutDirection: .leftToRight) as! [UIView]
+        let accessibleSubviews = outerContainerView.recursiveAccessibleSubviews() as! [UIView]
 
         XCTAssertEqual(accessibleSubviews.count, 2)
         XCTAssertTrue(accessibleSubviews.contains(where: { $0 === viewA }))
@@ -81,7 +81,7 @@ class AccessibilityContainerTests: XCTestCase {
         outerContainerView.addSubview(accessibleView)
         outerContainerView.addSubview(innerContainerView)
 
-        let accessibleSubviews = outerContainerView.accessibilityElements(layoutDirection: .leftToRight) as! [UIView]
+        let accessibleSubviews = outerContainerView.recursiveAccessibleSubviews() as! [UIView]
 
         XCTAssertEqual(accessibleSubviews.count, 2)
         XCTAssertFalse(accessibleSubviews.contains(where: { $0 === undiscoveredViewA }))
@@ -100,7 +100,7 @@ class AccessibilityContainerTests: XCTestCase {
         let containerView = UIView()
         containerView.addSubview(wrapperView)
 
-        let accessibleSubviews = containerView.accessibilityElements(layoutDirection: .leftToRight) as! [UIView]
+        let accessibleSubviews = containerView.recursiveAccessibleSubviews() as! [UIView]
 
         XCTAssertNil(accessibleSubviews.first)
     }
@@ -117,7 +117,7 @@ class AccessibilityContainerTests: XCTestCase {
         let containerView = UIView()
         containerView.addSubview(wrapperView)
 
-        let accessibleSubviews = containerView.accessibilityElements(layoutDirection: .leftToRight) as! [UIView]
+        let accessibleSubviews = containerView.recursiveAccessibleSubviews() as! [UIView]
 
         XCTAssertNil(accessibleSubviews.first)
     }

BlueprintUICommonControls/UITests/AccessibilityContainerTests.swift

@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Removed `AnimationAttributes.duration`.
 
 ### Changed
+- Reverted the change titled "Fixed `AccessibilityContainer` to better handle the accessibility ordering for a `UICollectionView` inside it (such as a `Listable` instance.)" pending further investigation.
 
 ### Deprecated
 

BlueprintUICommonControls/UITests/UITestHost/AppDelegate.swift

@@ -29,13 +29,9 @@ let project = Project(
             sources: ["Tutorials/Tutorial 2 (Completed)/**"]
         ),
         .app(
-            name: "BlueprintUI_TestHost",
+            name: "UITestHost",
             sources: ["../BlueprintUI/UITests/UITestHost/**"]
         ),
-        .app(
-            name: "BlueprintUICommonControls_TestHost",
-            sources: ["../BlueprintUICommonControls/UITests/UITestHost/**"]
-        ),
 
         // These tests are duplicates of the test definitions in the root Package.swift, but Tuist
         // does not currently support creating targets for tests in SwiftPM dependencies. See
@@ -52,17 +48,7 @@ let project = Project(
             bundleId: "$(inherited).UITests",
             deploymentTargets: .iOS("15.0"),
             sources: ["../BlueprintUI/Tests/Extensions/**", "../BlueprintUI/UITests/**"],
-            dependencies: [.target(name: "BlueprintUI_TestHost")]
-        ),
-
-        .target(
-            name: "BlueprintUICommonControls_UITests",
-            destinations: .iOS,
-            product: .uiTests,
-            bundleId: "$(inherited).UITests",
-            deploymentTargets: .iOS("15.0"),
-            sources: ["../BlueprintUI/Tests/Extensions/**", "../BlueprintUICommonControls/UITests/**"],
-            dependencies: [.target(name: "BlueprintUICommonControls_TestHost")]
+            dependencies: [.target(name: "UITestHost")]
         ),
 
         .unitTest(
@@ -82,7 +68,6 @@ let project = Project(
                     "BlueprintUI-Tests",
                     "BlueprintUICommonControls-Tests",
                     "BlueprintUI_UITests",
-                    "BlueprintUICommonControls_UITests",
                 ]
             )
         ),