fix: Update keyboard lookup logic (#460)

appium · Jan 25, 2021 · 54c73ff · 54c73ff
1 parent b14aaab
commit 54c73ff
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/WebDriverAgentLib/Utilities/FBKeyboard.m b/WebDriverAgentLib/Utilities/FBKeyboard.m
@@ -58,8 +58,12 @@ + (BOOL)waitUntilVisibleForApplication:(XCUIApplication *)app timeout:(NSTimeInt
       return NO;
     }
 
-    NSPredicate *keySearchPredicate = [NSPredicate predicateWithFormat:@"label.length > 0"];
-    XCUIElement *firstKey = [app.keyboard.keys matchingPredicate:keySearchPredicate].firstMatch;
+    NSPredicate *keySearchPredicate = [NSPredicate predicateWithBlock:^BOOL(XCElementSnapshot *snapshot,
+                                                                            NSDictionary *bindings) {
+      return snapshot.label.length > 0;
+    }];
+    XCUIElement *firstKey = [[app.keyboard descendantsMatchingType:XCUIElementTypeKey]
+                             matchingPredicate:keySearchPredicate].allElementsBoundByIndex.firstObject;
     return firstKey.exists
       && (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"13.0") ? firstKey.hittable : firstKey.fb_isVisible);
   };