Fix ASTextNode2 accessibilityElementCount

TextureGroup · May 31, 2019 · 9f6394f · 9f6394f
1 parent 0a57392
commit 9f6394f
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 8 deletions.
diff --git a/Source/ASTextNode2.mm b/Source/ASTextNode2.mm
@@ -356,6 +356,15 @@ static void ASUpdateAccessibilityFrame(ASTextNodeAccessiblityElement *accessibil
   return containerNode;
 }
 
+- (NSInteger)accessibilityElementCount
+{
+  if (ASActivateExperimentalFeature(ASExperimentalTextNode2A11YContainer)) {
+    return self.accessibilityElements.count;
+  }
+
+  return [super accessibilityElementCount];
+}
+
 /// Overwrite accessibilityElementAtIndex: so we can update the element's accessibilityFrame when it is requested.
 - (id)accessibilityElementAtIndex:(NSInteger)index
 {
@@ -416,16 +425,16 @@ - (NSArray *)accessibilityElements
 }
 
 - (void)setIsAccessibilityElement:(BOOL)isAccessibilityElement
-  {
-    if (ASActivateExperimentalFeature(ASExperimentalTextNode2A11YContainer)) {
-      // Instead of relying on labels accessibility, We implement UIAccessibilityContainer and
-      // handle accessibility with ASTextNode2
-      return;
-    }
+{
+  if (ASActivateExperimentalFeature(ASExperimentalTextNode2A11YContainer)) {
+    // Instead of relying on labels accessibility, We implement UIAccessibilityContainer and
+    // handle accessibility with ASTextNode2
+    return;
+  }
 
-    [super setIsAccessibilityElement:isAccessibilityElement];
+  [super setIsAccessibilityElement:isAccessibilityElement];
 
-  }
+}
 
 - (BOOL)isAccessibilityElement {
   if (ASActivateExperimentalFeature(ASExperimentalTextNode2A11YContainer)) {

diff --git a/Tests/ASTextNode2Tests.mm b/Tests/ASTextNode2Tests.mm
@@ -304,4 +304,48 @@ - (void)testAccessibilityExposeA11YLinksWithExperiments
   XCTAssertTrue([[accessibilityElements[1] accessibilityLabel] isEqualToString:link], @"Second accessibility element should be the link");
 }
 
+- (void)testAccessibilityNonLayerbackedNodesOperationInNonContainer
+{
+  ASDisplayNode *contianer = [[ASDisplayNode alloc] init];
+  contianer.frame = CGRectMake(50, 50, 200, 600);
+  contianer.backgroundColor = [UIColor grayColor];
+  // Do any additional setup after loading the view, typically from a nib.
+  ASTextNode2 *text1 = [[ASTextNode2 alloc] init];
+  text1.attributedText = [[NSAttributedString alloc] initWithString:@"hello"];
+  text1.frame = CGRectMake(50, 100, 200, 200);
+  [contianer addSubnode:text1];
+  [contianer layoutIfNeeded];
+  [contianer.layer displayIfNeeded];
+  NSArray<UIAccessibilityElement *> *elements = contianer.view.accessibilityElements;
+  XCTAssertTrue(elements.count == 1);
+  XCTAssertTrue([[elements.firstObject accessibilityLabel] isEqualToString:@"hello"]);
+  ASTextNode2 *text2 = [[ASTextNode2 alloc] init];
+  text2.attributedText = [[NSAttributedString alloc] initWithString:@"world"];
+  text2.frame = CGRectMake(50, 300, 200, 200);
+  [contianer addSubnode:text2];
+  [contianer layoutIfNeeded];
+  [contianer.layer displayIfNeeded];
+  NSArray<UIAccessibilityElement *> *updatedElements = contianer.view.accessibilityElements;
+  XCTAssertTrue(updatedElements.count == 2);
+  XCTAssertTrue([[updatedElements.firstObject accessibilityLabel] isEqualToString:@"hello"]);
+  XCTAssertTrue([[updatedElements.lastObject accessibilityLabel] isEqualToString:@"world"]);
+  ASTextNode2 *text3 = [[ASTextNode2 alloc] init];
+  text3.attributedText = [[NSAttributedString alloc] initWithString:@"!!!!"];
+  text3.frame = CGRectMake(50, 400, 200, 100);
+  [text2 addSubnode:text3];
+  [contianer layoutIfNeeded];
+  [contianer.layer displayIfNeeded];
+  NSArray<UIAccessibilityElement *> *updatedElements2 = contianer.view.accessibilityElements;
+  //text3 won't be read out cause it's overshadowed by text2
+  XCTAssertTrue(updatedElements2.count == 2);
+  XCTAssertTrue([[updatedElements2.firstObject accessibilityLabel] isEqualToString:@"hello"]);
+  XCTAssertTrue([[updatedElements2.lastObject accessibilityLabel] isEqualToString:@"world"]);
+}
+
+- (void)testAccessibilityNonLayerbackedNodesOperationInNonContainerWithExperiment
+{
+  [self setUpEnablingExperiments];
+  [self testAccessibilityNonLayerbackedNodesOperationInNonContainer];
+}
+
 @end