appium-webdriveragent 4.7.0 → 4.8.0

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -9,7 +9,6 @@
 
 #import "XCUIApplication+FBHelpers.h"
 
-#import "XCElementSnapshot.h"
 #import "FBElementTypeTransformer.h"
 #import "FBKeyboard.h"
 #import "FBLogger.h"
@@ -18,11 +17,11 @@
 #import "FBActiveAppDetectionPoint.h"
 #import "FBXCodeCompatibility.h"
 #import "FBXPath.h"
+#import "FBXCAccessibilityElement.h"
 #import "FBXCTestDaemonsProxy.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCAXClientProxy.h"
 #import "FBXMLGenerationOptions.h"
-#import "XCAccessibilityElement.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCUIDevice+FBHelpers.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBIsVisible.h"
@@ -41,11 +40,11 @@ static NSString* const FBUnknownBundleId = @"unknown";
 - (BOOL)fb_waitForAppElement:(NSTimeInterval)timeout
 {
   __block BOOL canDetectAxElement = YES;
-  int currentProcessIdentifier = self.accessibilityElement.processIdentifier;
+  int currentProcessIdentifier = [self.accessibilityElement processIdentifier];
   BOOL result = [[[FBRunLoopSpinner new]
            timeout:timeout]
           spinUntilTrue:^BOOL{
-    XCAccessibilityElement *currentAppElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
+    id<FBXCAccessibilityElement> currentAppElement = FBActiveAppDetectionPoint.sharedInstance.axElement;
     canDetectAxElement = nil != currentAppElement;
     if (!canDetectAxElement) {
       return YES;
@@ -57,11 +56,11 @@ static NSString* const FBUnknownBundleId = @"unknown";
     : [self waitForExistenceWithTimeout:timeout];
 }
 
-+ (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<XCAccessibilityElement *> *)axElements
++ (NSArray<NSDictionary<NSString *, id> *> *)fb_appsInfoWithAxElements:(NSArray<id<FBXCAccessibilityElement>> *)axElements
 {
   NSMutableArray<NSDictionary<NSString *, id> *> *result = [NSMutableArray array];
   id<XCTestManager_ManagerInterface> proxy = [FBXCTestDaemonsProxy testRunnerProxy];
-  for (XCAccessibilityElement *axElement in axElements) {
+  for (id<FBXCAccessibilityElement> axElement in axElements) {
     NSMutableDictionary<NSString *, id> *appInfo = [NSMutableDictionary dictionary];
     pid_t pid = axElement.processIdentifier;
     appInfo[@"pid"] = @(pid);
@@ -100,7 +99,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
 
 - (NSDictionary *)fb_tree
 {
-  XCElementSnapshot *snapshot = self.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
     ? self.lastSnapshot
     : [self fb_snapshotWithAllAttributesAndMaxDepth:nil];
   return [self.class dictionaryForElement:snapshot recursive:YES];
@@ -108,27 +107,28 @@ static NSString* const FBUnknownBundleId = @"unknown";
 
 - (NSDictionary *)fb_accessibilityTree
 {
-  XCElementSnapshot *snapshot = self.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
     ? self.lastSnapshot
     : [self fb_snapshotWithAllAttributesAndMaxDepth:nil];
   return [self.class accessibilityInfoForElement:snapshot];
 }
 
-+ (NSDictionary *)dictionaryForElement:(XCElementSnapshot *)snapshot recursive:(BOOL)recursive
++ (NSDictionary *)dictionaryForElement:(id<FBXCElementSnapshot>)snapshot recursive:(BOOL)recursive
 {
   NSMutableDictionary *info = [[NSMutableDictionary alloc] init];
   info[@"type"] = [FBElementTypeTransformer shortStringWithElementType:snapshot.elementType];
   info[@"rawIdentifier"] = FBValueOrNull([snapshot.identifier isEqual:@""] ? nil : snapshot.identifier);
-  info[@"name"] = FBValueOrNull(snapshot.wdName);
-  info[@"value"] = FBValueOrNull(snapshot.wdValue);
-  info[@"label"] = FBValueOrNull(snapshot.wdLabel);
-  info[@"rect"] = snapshot.wdRect;
-  info[@"frame"] = NSStringFromCGRect(snapshot.wdFrame);
-  info[@"isEnabled"] = [@([snapshot isWDEnabled]) stringValue];
-  info[@"isVisible"] = [@([snapshot isWDVisible]) stringValue];
-  info[@"isAccessible"] = [@([snapshot isWDAccessible]) stringValue];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  info[@"name"] = FBValueOrNull(wrappedSnapshot.wdName);
+  info[@"value"] = FBValueOrNull(wrappedSnapshot.wdValue);
+  info[@"label"] = FBValueOrNull(wrappedSnapshot.wdLabel);
+  info[@"rect"] = wrappedSnapshot.wdRect;
+  info[@"frame"] = NSStringFromCGRect(wrappedSnapshot.wdFrame);
+  info[@"isEnabled"] = [@([wrappedSnapshot isWDEnabled]) stringValue];
+  info[@"isVisible"] = [@([wrappedSnapshot isWDVisible]) stringValue];
+  info[@"isAccessible"] = [@([wrappedSnapshot isWDAccessible]) stringValue];
 #if TARGET_OS_TV
-  info[@"isFocused"] = [@([snapshot isWDFocused]) stringValue];
+  info[@"isFocused"] = [@([wrappedSnapshot isWDFocused]) stringValue];
 #endif
 
   if (!recursive) {
@@ -138,28 +138,29 @@ static NSString* const FBUnknownBundleId = @"unknown";
   NSArray *childElements = snapshot.children;
   if ([childElements count]) {
     info[@"children"] = [[NSMutableArray alloc] init];
-    for (XCElementSnapshot *childSnapshot in childElements) {
+    for (id<FBXCElementSnapshot> childSnapshot in childElements) {
       [info[@"children"] addObject:[self dictionaryForElement:childSnapshot recursive:YES]];
     }
   }
   return info;
 }
 
-+ (NSDictionary *)accessibilityInfoForElement:(XCElementSnapshot *)snapshot
++ (NSDictionary *)accessibilityInfoForElement:(id<FBXCElementSnapshot>)snapshot
 {
-  BOOL isAccessible = [snapshot isWDAccessible];
-  BOOL isVisible = [snapshot isWDVisible];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+  BOOL isAccessible = [wrappedSnapshot isWDAccessible];
+  BOOL isVisible = [wrappedSnapshot isWDVisible];
 
   NSMutableDictionary *info = [[NSMutableDictionary alloc] init];
 
   if (isAccessible) {
     if (isVisible) {
-      info[@"value"] = FBValueOrNull(snapshot.wdValue);
-      info[@"label"] = FBValueOrNull(snapshot.wdLabel);
+      info[@"value"] = FBValueOrNull(wrappedSnapshot.wdValue);
+      info[@"label"] = FBValueOrNull(wrappedSnapshot.wdLabel);
     }
   } else {
     NSMutableArray *children = [[NSMutableArray alloc] init];
-    for (XCElementSnapshot *childSnapshot in snapshot.children) {
+    for (id<FBXCElementSnapshot> childSnapshot in snapshot.children) {
       NSDictionary *childInfo = [self accessibilityInfoForElement:childSnapshot];
       if ([childInfo count]) {
         [children addObject: childInfo];
@@ -172,7 +173,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   if ([info count]) {
     info[@"type"] = [FBElementTypeTransformer shortStringWithElementType:snapshot.elementType];
     info[@"rawIdentifier"] = FBValueOrNull([snapshot.identifier isEqual:@""] ? nil : snapshot.identifier);
-    info[@"name"] = FBValueOrNull(snapshot.wdName);
+    info[@"name"] = FBValueOrNull(wrappedSnapshot.wdName);
   } else {
     return nil;
   }
@@ -243,7 +244,7 @@ static NSString* const FBUnknownBundleId = @"unknown";
   };
 
   if (nil != keyNames && keyNames.count > 0) {
-    NSPredicate *searchPredicate = [NSPredicate predicateWithBlock:^BOOL(XCElementSnapshot *snapshot, NSDictionary *bindings) {
+    NSPredicate *searchPredicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
       if (snapshot.elementType != XCUIElementTypeKey && snapshot.elementType != XCUIElementTypeButton) {
         return NO;
       }

package/WebDriverAgentLib/Categories/XCUIApplicationProcess+FBQuiescence.m

@@ -40,6 +40,9 @@ static void swizzledWaitForQuiescenceIncludingAnimationsIdle(id self, SEL _cmd,
 
 @implementation XCUIApplicationProcess (FBQuiescence)
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
 + (void)load
 {
   Method waitForQuiescenceIncludingAnimationsIdleMethod = class_getInstanceMethod(self.class, @selector(waitForQuiescenceIncludingAnimationsIdle:));
@@ -51,6 +54,8 @@ static void swizzledWaitForQuiescenceIncludingAnimationsIdle(id self, SEL _cmd,
   }
 }
 
+#pragma clang diagnostic pop
+
 static char XCUIAPPLICATIONPROCESS_SHOULD_WAIT_FOR_QUIESCENCE;
 
 @dynamic fb_shouldWaitForQuiescence;

package/WebDriverAgentLib/Categories/XCUICoordinate+FBFix.m

@@ -11,7 +11,6 @@
 
 #import "XCUICoordinate.h"
 #import "XCUIElement+FBUtilities.h"
-#import "XCElementSnapshot+FBHitPoint.h"
 
 # if !TARGET_OS_TV
 @implementation XCUICoordinate (FBFix)

package/WebDriverAgentLib/Categories/XCUIDevice+FBHelpers.m

@@ -19,9 +19,9 @@
 #import "FBMacros.h"
 #import "FBMathUtils.h"
 #import "FBScreenshot.h"
+#import "FBXCDeviceEvent.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIDevice.h"
-#import "XCDeviceEvent.h"
 
 static const NSTimeInterval FBHomeButtonCoolOffTime = 1.;
 static const NSTimeInterval FBScreenLockTimeout = 5.;
@@ -30,11 +30,16 @@ static const NSTimeInterval FBScreenLockTimeout = 5.;
 
 static bool fb_isLocked;
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wobjc-load-method"
+
 + (void)load
 {
   [self fb_registerAppforDetectLockState];
 }
 
+#pragma clang diagnostic pop
+
 + (void)fb_registerAppforDetectLockState
 {
   int notify_token;
@@ -303,10 +308,8 @@ static bool fb_isLocked;
                             duration:(NSTimeInterval)duration
                                error:(NSError **)error
 {
-  XCDeviceEvent *event = [XCDeviceEvent deviceEventWithPage:page
-                                                      usage:usage
-                                                   duration:duration];
-  return [self performDeviceEvent:event error:error];
+  id<FBXCDeviceEvent> event = FBCreateXCDeviceEvent(page, usage, duration, error);
+  return nil == event ? NO : [self performDeviceEvent:event error:error];
 }
 
 - (BOOL)fb_setAppearance:(FBUIInterfaceAppearance)appearance error:(NSError **)error

package/WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.h

@@ -7,8 +7,8 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <WebDriverAgentLib/XCElementSnapshot.h>
 #import <WebDriverAgentLib/XCUIElement.h>
+#import "FBXCElementSnapshotWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
-@interface XCElementSnapshot (FBAccessibility)
+@interface FBXCElementSnapshotWrapper (FBAccessibility)
 
 /*! Whether or not the element in snapshot is accessible */
 @property (atomic, readonly) BOOL fb_isAccessibilityElement;

package/WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.m

@@ -10,21 +10,22 @@
 #import "XCUIElement+FBAccessibility.h"
 
 #import "FBConfiguration.h"
-#import "XCElementSnapshot+FBHelpers.h"
 #import "XCTestPrivateSymbols.h"
 #import "XCUIElement+FBUtilities.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 
 @implementation XCUIElement (FBAccessibility)
 
 - (BOOL)fb_isAccessibilityElement
 {
-  return [self fb_snapshotWithAttributes:@[FB_XCAXAIsElementAttributeName]
-                                maxDepth:@1].fb_isAccessibilityElement;
+  id<FBXCElementSnapshot> snapshot = [self fb_snapshotWithAttributes:@[FB_XCAXAIsElementAttributeName]
+                                                            maxDepth:@1];
+  return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_isAccessibilityElement;
 }
 
 @end
 
-@implementation XCElementSnapshot (FBAccessibility)
+@implementation FBXCElementSnapshotWrapper (FBAccessibility)
 
 - (BOOL)fb_isAccessibilityElement
 {

package/WebDriverAgentLib/Categories/XCUIElement+FBCaching.m

@@ -11,6 +11,7 @@
 
 #import <objc/runtime.h>
 
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBUID.h"
@@ -46,8 +47,8 @@ static char XCUIELEMENT_CACHE_ID_KEY;
   if ([self isKindOfClass:XCUIApplication.class]) {
     uid = self.fb_uid;
   } else {
-    XCElementSnapshot *snapshot = self.fb_cachedSnapshot ?: self.fb_takeSnapshot;
-    uid = snapshot.wdUID;
+    id<FBXCElementSnapshot> snapshot = self.fb_cachedSnapshot ?: self.fb_takeSnapshot;
+    uid = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdUID;
   }
 
   objc_setAssociatedObject(self, &XCUIELEMENT_CACHE_ID_KEY, uid, OBJC_ASSOCIATION_RETAIN_NONATOMIC);

package/WebDriverAgentLib/Categories/XCUIElement+FBFind.m

@@ -12,10 +12,8 @@
 
 #import "FBMacros.h"
 #import "FBElementTypeTransformer.h"
-#import "FBPredicate.h"
 #import "NSPredicate+FBFormat.h"
-#import "XCElementSnapshot.h"
-#import "XCElementSnapshot+FBHelpers.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBUtilities.h"
@@ -37,7 +35,7 @@
   return matchedElement ? @[matchedElement] : @[];
 }
 
-- (XCElementSnapshot *)fb_cachedSnapshotWithQuery:(XCUIElementQuery *)query
+- (id<FBXCElementSnapshot>)fb_cachedSnapshotWithQuery:(XCUIElementQuery *)query
 {
   return [self isKindOfClass:XCUIApplication.class] ? query.rootElementSnapshot : self.fb_cachedSnapshot;
 }
@@ -51,7 +49,7 @@
   XCUIElementQuery *query = [self.fb_query descendantsMatchingType:type];
   NSMutableArray *result = [NSMutableArray array];
   [result addObjectsFromArray:[self.class fb_extractMatchingElementsFromQuery:query shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch]];
-  XCElementSnapshot *cachedSnapshot = [self fb_cachedSnapshotWithQuery:query];
+  id<FBXCElementSnapshot> cachedSnapshot = [self fb_cachedSnapshotWithQuery:query];
   if (type == XCUIElementTypeAny || cachedSnapshot.elementType == type) {
     if (shouldReturnAfterFirstMatch || result.count == 0) {
       return @[self];
@@ -73,7 +71,9 @@
   return elements;
 }
 
-- (void)descendantsWithProperty:(NSString *)property value:(NSString *)value partial:(BOOL)partialSearch results:(NSMutableArray<XCUIElement *> *)results
+- (void)descendantsWithProperty:(NSString *)property value:(NSString *)value
+                        partial:(BOOL)partialSearch
+                        results:(NSMutableArray<XCUIElement *> *)results
 {
   if (partialSearch) {
     NSString *text = [self fb_valueForWDAttributeName:property];
@@ -88,12 +88,12 @@
   }
 
   property = [FBElementUtils wdAttributeNameForAttributeName:property];
-  value = [value stringByReplacingOccurrencesOfString:@"'" withString:@"\\'"];
-  NSString *operation = partialSearch ?
-  [NSString stringWithFormat:@"%@ like '*%@*'", property, value] :
-  [NSString stringWithFormat:@"%@ == '%@'", property, value];
-
-  NSPredicate *predicate = [FBPredicate predicateWithFormat:operation];
+  NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot,
+                                                                 NSDictionary<NSString *,id> * _Nullable bindings) {
+    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+    NSString *propertyValue = [NSString stringWithFormat:@"%@", [wrappedSnapshot fb_valueForWDAttributeName:property]];
+    return partialSearch ? [value containsString:propertyValue] : [value isEqualToString:propertyValue];
+  }];
   XCUIElementQuery *query = [[self.fb_query descendantsMatchingType:XCUIElementTypeAny] matchingPredicate:predicate];
   NSArray *childElements = query.fb_allMatches;
   [results addObjectsFromArray:childElements];
@@ -105,12 +105,12 @@
 - (NSArray<XCUIElement *> *)fb_descendantsMatchingPredicate:(NSPredicate *)predicate
                                 shouldReturnAfterFirstMatch:(BOOL)shouldReturnAfterFirstMatch
 {
-  NSPredicate *formattedPredicate = [NSPredicate fb_formatSearchPredicate:predicate];
+  NSPredicate *formattedPredicate = [NSPredicate fb_snapshotBlockPredicateWithPredicate:predicate];
   XCUIElementQuery *query = [[self.fb_query descendantsMatchingType:XCUIElementTypeAny] matchingPredicate:formattedPredicate];
   NSMutableArray<XCUIElement *> *result = [NSMutableArray array];
   [result addObjectsFromArray:[self.class fb_extractMatchingElementsFromQuery:query
                                                   shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch]];
-  XCElementSnapshot *cachedSnapshot = [self fb_cachedSnapshotWithQuery:query];
+  id<FBXCElementSnapshot> cachedSnapshot = [self fb_cachedSnapshotWithQuery:query];
   // Include self element into predicate search
   if ([formattedPredicate evaluateWithObject:cachedSnapshot]) {
     if (shouldReturnAfterFirstMatch || result.count == 0) {
@@ -129,16 +129,16 @@
 {
   // XPath will try to match elements only class name, so requesting elements by XCUIElementTypeAny will not work. We should use '*' instead.
   xpathQuery = [xpathQuery stringByReplacingOccurrencesOfString:@"XCUIElementTypeAny" withString:@"*"];
-  NSArray<XCElementSnapshot *> *matchingSnapshots = [FBXPath matchesWithRootElement:self forQuery:xpathQuery];
+  NSArray<id<FBXCElementSnapshot>> *matchingSnapshots = [FBXPath matchesWithRootElement:self forQuery:xpathQuery];
   if (0 == [matchingSnapshots count]) {
     return @[];
   }
   if (shouldReturnAfterFirstMatch) {
-    XCElementSnapshot *snapshot = matchingSnapshots.firstObject;
+    id<FBXCElementSnapshot> snapshot = matchingSnapshots.firstObject;
     matchingSnapshots = @[snapshot];
   }
   return [self fb_filterDescendantsWithSnapshots:matchingSnapshots
-                                         selfUID:self.lastSnapshot.wdUID
+                                         selfUID:[FBXCElementSnapshotWrapper ensureWrapped:self.lastSnapshot].wdUID
                                     onlyChildren:NO];
 }
 
@@ -148,7 +148,11 @@
 - (NSArray<XCUIElement *> *)fb_descendantsMatchingIdentifier:(NSString *)accessibilityId
                                  shouldReturnAfterFirstMatch:(BOOL)shouldReturnAfterFirstMatch
 {
-  NSPredicate *predicate = [FBPredicate predicateWithFormat:@"name == %@", accessibilityId];
+  NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot,
+                                                                 NSDictionary<NSString *,id> * _Nullable bindings) {
+    FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
+    return [wrappedSnapshot.wdName isEqualToString:accessibilityId];
+  }];
   return [self fb_descendantsMatchingPredicate:predicate
                    shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];
 }

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.h

@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <WebDriverAgentLib/XCElementSnapshot.h>
-#import <WebDriverAgentLib/XCUIElement.h>
+#import "FBXCElementSnapshotWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -20,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
-@interface XCElementSnapshot (FBIsVisible)
+@interface FBXCElementSnapshotWrapper (FBIsVisible)
 
 /*! Whether or not the element is visible */
 @property (atomic, readonly) BOOL fb_isVisible;

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.m

@@ -14,10 +14,9 @@
 #import "FBMathUtils.h"
 #import "FBActiveAppDetectionPoint.h"
 #import "FBSession.h"
+#import "FBXCAccessibilityElement.h"
 #import "FBXCodeCompatibility.h"
-#import "XCAccessibilityElement+FBComparison.h"
-#import "XCElementSnapshot+FBHelpers.h"
-#import "XCElementSnapshot+FBHitPoint.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBUID.h"
 #import "XCTestPrivateSymbols.h"
@@ -26,13 +25,14 @@
 
 - (BOOL)fb_isVisible
 {
-  return [self fb_snapshotWithAttributes:@[FB_XCAXAIsVisibleAttributeName]
-                                maxDepth:@1].fb_isVisible;
+  id<FBXCElementSnapshot> snapshot = [self fb_snapshotWithAttributes:@[FB_XCAXAIsVisibleAttributeName]
+                                                            maxDepth:@1];
+  return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_isVisible;
 }
 
 @end
 
-@implementation XCElementSnapshot (FBIsVisible)
+@implementation FBXCElementSnapshotWrapper (FBIsVisible)
 
 - (NSString *)fb_uniqId
 {
@@ -57,7 +57,7 @@
 }
 
 - (BOOL)fb_cacheVisibilityWithValue:(BOOL)isVisible
-                       forAncestors:(nullable NSArray<XCElementSnapshot *> *)ancestors
+                       forAncestors:(nullable NSArray<id<FBXCElementSnapshot>> *)ancestors
 {
   NSMutableDictionary *cache = FBSession.activeSession.elementsVisibilityCache;
   if (nil == cache) {
@@ -72,8 +72,8 @@
   [destination setObject:visibleObj forKey:self.fb_uniqId];
   if (isVisible && nil != ancestors) {
     // if an element is visible then all its ancestors must be visible as well
-    for (XCElementSnapshot *ancestor in ancestors) {
-      NSString *ancestorId = ancestor.fb_uniqId;
+    for (id<FBXCElementSnapshot> ancestor in ancestors) {
+      NSString *ancestorId = [FBXCElementSnapshotWrapper ensureWrapped:ancestor].fb_uniqId;
       if (nil == [destination objectForKey:ancestorId]) {
         [destination setObject:visibleObj forKey:ancestorId];
       }
@@ -82,17 +82,17 @@
   return isVisible;
 }
 
-- (CGRect)fb_frameInContainer:(XCElementSnapshot *)container
+- (CGRect)fb_frameInContainer:(id<FBXCElementSnapshot>)container
         hierarchyIntersection:(nullable NSValue *)intersectionRectange
 {
   CGRect currentRectangle = nil == intersectionRectange ? self.frame : [intersectionRectange CGRectValue];
-  XCElementSnapshot *parent = self.parent;
+  id<FBXCElementSnapshot> parent = self.parent;
   CGRect parentFrame = parent.frame;
   CGRect containerFrame = container.frame;
   if (CGSizeEqualToSize(parentFrame.size, CGSizeZero) &&
       CGPointEqualToPoint(parentFrame.origin, CGPointZero)) {
     // Special case (or XCTest bug). Shift the origin and return immediately after shift
-    XCElementSnapshot *nextParent = parent.parent;
+    id<FBXCElementSnapshot> nextParent = parent.parent;
     BOOL isGrandparent = YES;
     while (nextParent && nextParent != container) {
       CGRect nextParentFrame = nextParent.frame;
@@ -133,18 +133,19 @@
   if (CGRectIsEmpty(intersectionWithParent) || parent == container) {
     return intersectionWithParent;
   }
-  return [parent fb_frameInContainer:container hierarchyIntersection:[NSValue valueWithCGRect:intersectionWithParent]];
+  return [[FBXCElementSnapshotWrapper ensureWrapped:parent] fb_frameInContainer:container
+                                                          hierarchyIntersection:[NSValue valueWithCGRect:intersectionWithParent]];
 }
 
 - (BOOL)fb_hasAnyVisibleLeafs
 {
-  NSArray<XCElementSnapshot *> *children = self.children;
+  NSArray<id<FBXCElementSnapshot>> *children = self.children;
   if (0 == children.count) {
     return self.fb_isVisible;
   }
 
-  for (XCElementSnapshot *child in children) {
-    if (child.fb_hasAnyVisibleLeafs) {
+  for (id<FBXCElementSnapshot> child in children) {
+    if ([FBXCElementSnapshotWrapper ensureWrapped:child].fb_hasAnyVisibleLeafs) {
       return YES;
     }
   }
@@ -169,13 +170,13 @@
     return [self fb_cacheVisibilityWithValue:NO forAncestors:nil];
   }
 
-  NSArray<XCElementSnapshot *> *ancestors = self.fb_ancestors;
+  NSArray<id<FBXCElementSnapshot>> *ancestors = self.fb_ancestors;
   if ([FBConfiguration shouldUseTestManagerForVisibilityDetection]) {
     BOOL visibleAttrValue = [(NSNumber *)[self fb_attributeValue:FB_XCAXAIsVisibleAttributeName] boolValue];
     return [self fb_cacheVisibilityWithValue:visibleAttrValue forAncestors:ancestors];
   }
 
-  XCElementSnapshot *parentWindow = ancestors.count > 1 ? [ancestors objectAtIndex:ancestors.count - 2] : nil;
+  id<FBXCElementSnapshot> parentWindow = ancestors.count > 1 ? [ancestors objectAtIndex:ancestors.count - 2] : nil;
   CGRect visibleRect = selfFrame;
   if (nil != parentWindow) {
     visibleRect = [self fb_frameInContainer:parentWindow hierarchyIntersection:nil];
@@ -186,7 +187,7 @@
   CGPoint midPoint = CGPointMake(visibleRect.origin.x + visibleRect.size.width / 2,
                                  visibleRect.origin.y + visibleRect.size.height / 2);
 #if !TARGET_OS_TV // TV has no orientation, so it does not need to coordinate
-  XCElementSnapshot *appElement = ancestors.count > 0 ? [ancestors lastObject] : self;
+  id<FBXCElementSnapshot> appElement = ancestors.count > 0 ? [ancestors lastObject] : self;
   CGRect appFrame = appElement.frame;
   CGRect windowFrame = nil == parentWindow ? selfFrame : parentWindow.frame;
   if ((appFrame.size.height > appFrame.size.width && windowFrame.size.height < windowFrame.size.width) ||
@@ -197,22 +198,23 @@
     midPoint = FBInvertPointForApplication(midPoint, appFrame.size, FBApplication.fb_activeApplication.interfaceOrientation);
   }
 #endif
-  XCAccessibilityElement *hitElement = [FBActiveAppDetectionPoint axElementWithPoint:midPoint];
+  id<FBXCAccessibilityElement> hitElement = [FBActiveAppDetectionPoint axElementWithPoint:midPoint];
   if (nil != hitElement) {
-    if ([self.accessibilityElement fb_isEqualToElement:hitElement]) {
+    if (FBIsAXElementEqualToOther(self.accessibilityElement, hitElement)) {
       return [self fb_cacheVisibilityWithValue:YES forAncestors:ancestors];
     }
-    for (XCElementSnapshot *ancestor in ancestors) {
-      if ([hitElement fb_isEqualToElement:ancestor.accessibilityElement]) {
+    for (id<FBXCElementSnapshot> ancestor in ancestors) {
+      if (FBIsAXElementEqualToOther(hitElement, ancestor.accessibilityElement)) {
         return [self fb_cacheVisibilityWithValue:YES forAncestors:ancestors];
       }
     }
   }
   if (self.children.count > 0) {
     if (nil != hitElement) {
-      for (XCElementSnapshot *descendant in self._allDescendants) {
-        if ([hitElement fb_isEqualToElement:descendant.accessibilityElement]) {
-          return [self fb_cacheVisibilityWithValue:YES forAncestors:descendant.fb_ancestors];
+      for (id<FBXCElementSnapshot> descendant in self._allDescendants) {
+        if (FBIsAXElementEqualToOther(hitElement, descendant.accessibilityElement)) {
+          return [self fb_cacheVisibilityWithValue:YES
+                                      forAncestors:[FBXCElementSnapshotWrapper ensureWrapped:descendant].fb_ancestors];
         }
       }
     }

package/WebDriverAgentLib/Categories/XCUIElement+FBPickerWheel.m

@@ -10,6 +10,7 @@
 #import "XCUIElement+FBPickerWheel.h"
 
 #import "FBRunLoopSpinner.h"
+#import "FBXCElementSnapshot.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIApplication+FBTouchAction.h"
 #import "XCUICoordinate.h"
@@ -23,7 +24,7 @@ static const NSTimeInterval VALUE_CHANGE_TIMEOUT = 2;
 
 - (BOOL)fb_scrollWithOffset:(CGFloat)relativeHeightOffset error:(NSError **)error
 {
-  XCElementSnapshot *snapshot = self.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
     ? self.lastSnapshot
     : self.fb_takeSnapshot;
   NSString *previousValue = snapshot.value;

package/WebDriverAgentLib/Categories/XCUIElement+FBResolve.m

@@ -41,11 +41,15 @@ static char XCUIELEMENT_IS_RESOLVED_NATIVELY_KEY;
   XCUIElementQuery *query = [self isKindOfClass:XCUIApplication.class]
     ? self.application.fb_query
     : [self.application.fb_query descendantsMatchingType:XCUIElementTypeAny];
-  XCElementSnapshot *cachedSnapshot = self.fb_cachedSnapshot;
+  FBXCElementSnapshotWrapper *cachedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:self.fb_cachedSnapshot];
   NSString *uid = nil == cachedSnapshot ? self.fb_uid : cachedSnapshot.fb_uid;
-  return nil == uid
-    ? self
-    : [query matchingPredicate:[NSPredicate predicateWithFormat:@"%K = %@", FBStringify(XCUIElement, wdUID), uid]].fb_firstMatch;
+  if (nil == uid) {
+    return self;
+  }
+  NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
+    return [[FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_uid isEqualToString:uid];
+  }];
+  return (XCUIElement *)[query matchingPredicate:predicate].fb_firstMatch;
 }
 
 @end