Merge pull request #237 from bartoszj/master

Fixed `fa11y` command on iOS 10 and higher
facebook · Mar 14, 2018 · 8312a63 · 8312a63
2 parents fa0d4e7 + 854e8c7
commit 8312a63
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/commands/FBAccessibilityCommands.py b/commands/FBAccessibilityCommands.py
@@ -67,7 +67,11 @@ def accessibilityGrepHierarchy(self, view, needle):
     #if we don't have any accessibility string - we should have some children
     if int(a11yLabel.GetValue(), 16) == 0:
       #We call private method that gives back all visible accessibility children for view
-      accessibilityElements = fb.evaluateObjectExpression('[[[UIApplication sharedApplication] keyWindow] _accessibilityElementsInContainer:0 topLevel:%s includeKB:0]' % view)
+      # iOS 10 and higher
+      if fb.evaluateBooleanExpression('[UIView respondsToSelector:@selector(_accessibilityElementsAndContainersDescendingFromViews:options:sorted:)]'):
+        accessibilityElements = fb.evaluateObjectExpression('[UIView _accessibilityElementsAndContainersDescendingFromViews:@[(id)%s] options:0 sorted:NO]' % view)
+      else:
+        accessibilityElements = fb.evaluateObjectExpression('[[[UIApplication sharedApplication] keyWindow] _accessibilityElementsInContainer:0 topLevel:%s includeKB:0]' % view)
       accessibilityElementsCount = fb.evaluateIntegerExpression('[%s count]' % accessibilityElements)
       for index in range(0, accessibilityElementsCount):
         subview = fb.evaluateObjectExpression('[%s objectAtIndex:%i]' % (accessibilityElements, index))