Fix A11Y for horizontal collection nodes in Texture (#1217)

* Fix A11Y for horizontal collection nodes in Texture.

Collections have their own handling in UIKit that we shouldn't mess with. As such no nodes that contain CollectionNodes should ever be treated as AccessibilityContainers.

* Update braces

Source/ASCollectionView.mm

@@ -2390,4 +2390,12 @@ - (void)setPrefetchingEnabled:(BOOL)prefetchingEnabled
   return;
 }
 
+#pragma mark - Accessibility overrides
+
+- (NSArray *)accessibilityElements
+{
+  [self waitUntilAllUpdatesAreCommitted];
+  return [super accessibilityElements];
+}
+
 @end

Source/ASTableView.mm

@@ -1969,4 +1969,12 @@ - (void)didMoveToSuperview
   }
 }
 
+#pragma mark - Accessibility overrides
+
+- (NSArray *)accessibilityElements
+{
+  [self waitUntilAllUpdatesAreCommitted];
+  return [super accessibilityElements];
+}
+
 @end

Source/Details/_ASDisplayViewAccessiblity.mm

@@ -11,10 +11,12 @@
 
 #import <AsyncDisplayKit/_ASDisplayView.h>
 #import <AsyncDisplayKit/ASAvailability.h>
+#import <AsyncDisplayKit/ASCollectionNode.h>
 #import <AsyncDisplayKit/ASDisplayNodeExtras.h>
 #import <AsyncDisplayKit/ASDisplayNode+FrameworkPrivate.h>
 #import <AsyncDisplayKit/ASDisplayNode+Beta.h>
 #import <AsyncDisplayKit/ASDisplayNodeInternal.h>
+#import <AsyncDisplayKit/ASTableNode.h>
 
 #import <queue>
 
@@ -208,7 +210,13 @@ static void CollectAccessibilityElementsForView(UIView *view, NSMutableArray *el
 
   ASDisplayNode *node = view.asyncdisplaykit_node;
 
-  if (node.isAccessibilityContainer) {
+  BOOL anySubNodeIsCollection = (nil != ASDisplayNodeFindFirstNode(node,
+      ^BOOL(ASDisplayNode *nodeToCheck) {
+    return ASDynamicCast(nodeToCheck, ASCollectionNode) != nil ||
+           ASDynamicCast(nodeToCheck, ASTableNode) != nil;
+  }));
+
+  if (node.isAccessibilityContainer && !anySubNodeIsCollection) {
     CollectAccessibilityElementsForContainer(node, view, elements);
     return;
   }