appium-webdriveragent 4.7.0 → 4.8.2

package/WebDriverAgentLib/Categories/XCUIElement+FBUID.h

@@ -7,24 +7,29 @@
  * 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
 
 @interface XCUIElement (FBUID)
 
-/*! Represents unique internal element identifier, which is the same for an element and its snapshot */
+/*! Represents unique internal element identifier, which is the same for an element and its snapshot as UUIDv4 */
 @property (nonatomic, nullable, readonly, copy) NSString *fb_uid;
 
+/*! Represents unique internal element identifier, which is the same for an element and its snapshot */
+@property (nonatomic, readonly) unsigned long long fb_accessibiltyId;
+
 @end
 
 
-@interface XCElementSnapshot (FBUID)
+@interface FBXCElementSnapshotWrapper (FBUID)
 
-/*! Represents unique internal element identifier, which is the same for an element and its snapshot */
+/*! Represents unique internal element identifier, which is the same for an element and its snapshot as UUIDv4 */
 @property (nonatomic, nullable, readonly, copy) NSString *fb_uid;
 
+/*! Represents unique internal element identifier, which is the same for an element and its snapshot */
+@property (nonatomic, readonly) unsigned long long fb_accessibiltyId;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBUID.m

@@ -15,20 +15,32 @@
 
 @implementation XCUIElement (FBUID)
 
+- (unsigned long long)fb_accessibiltyId
+{
+  return [FBElementUtils idWithAccessibilityElement:([self isKindOfClass:XCUIApplication.class]
+                                                     ? [(XCUIApplication *)self accessibilityElement]
+                                                     : [self fb_takeSnapshot].accessibilityElement)];
+}
+
 - (NSString *)fb_uid
 {
   return [self isKindOfClass:XCUIApplication.class]
     ? [FBElementUtils uidWithAccessibilityElement:[(XCUIApplication *)self accessibilityElement]]
-    : [self fb_takeSnapshot].fb_uid;
+    : [FBXCElementSnapshotWrapper ensureWrapped:[self fb_takeSnapshot]].fb_uid;
 }
 
 @end
 
-@implementation XCElementSnapshot (FBUID)
+@implementation FBXCElementSnapshotWrapper (FBUID)
+
+- (unsigned long long)fb_accessibiltyId
+{
+  return [FBElementUtils idWithAccessibilityElement:self.accessibilityElement];
+}
 
 - (NSString *)fb_uid
 {
-  return [FBElementUtils uidWithAccessibilityElement:self.accessibilityElement];
+  return [FBElementUtils uidWithAccessibilityElement:[self accessibilityElement]];
 }
 
 @end

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.h

@@ -8,8 +8,8 @@
  */
 
 #import <XCTest/XCTest.h>
-#import <WebDriverAgentLib/XCElementSnapshot.h>
 #import <WebDriverAgentLib/FBElement.h>
+#import "FBXCElementSnapshot.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
  @return The recent snapshot of the element
  @throws FBStaleElementException if the element is not present in DOM and thus no snapshot could be made
  */
-- (XCElementSnapshot *)fb_takeSnapshot;
+- (id<FBXCElementSnapshot>)fb_takeSnapshot;
 
 /**
  Extracts the cached element snapshot from its query.
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @return Either the cached snapshot or nil
  */
-- (nullable XCElementSnapshot *)fb_cachedSnapshot;
+- (nullable id<FBXCElementSnapshot>)fb_cachedSnapshot;
 
 /**
  Gets the most recent snapshot of the current element and already resolves the accessibility attributes
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
  attributes resolved if there was a failure while resolving additional attributes
  @throws FBStaleElementException if the element is not present in DOM and thus no snapshot could be made
  */
-- (nullable XCElementSnapshot *)fb_snapshotWithAllAttributesAndMaxDepth:(nullable NSNumber *)maxDepth;
+- (nullable id<FBXCElementSnapshot>)fb_snapshotWithAllAttributesAndMaxDepth:(nullable NSNumber *)maxDepth;
 
 /**
  Gets the most recent snapshot of the current element with given attributes resolved.
@@ -67,8 +67,8 @@ NS_ASSUME_NONNULL_BEGIN
  attributes resolved if there was a failure while resolving additional attributes
  @throws FBStaleElementException if the element is not present in DOM and thus no snapshot could be made
 */
-- (nullable XCElementSnapshot *)fb_snapshotWithAttributes:(nullable NSArray<NSString *> *)attributeNames
-                                                 maxDepth:(nullable NSNumber *)maxDepth;
+- (nullable id<FBXCElementSnapshot>)fb_snapshotWithAttributes:(nullable NSArray<NSString *> *)attributeNames
+                                                      maxDepth:(nullable NSNumber *)maxDepth;
 
 /**
  Filters elements by matching them to snapshots from the corresponding array
@@ -80,7 +80,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @return Array of filtered elements, which have matches in snapshots array
  */
-- (NSArray<XCUIElement *> *)fb_filterDescendantsWithSnapshots:(NSArray<XCElementSnapshot *> *)snapshots
+- (NSArray<XCUIElement *> *)fb_filterDescendantsWithSnapshots:(NSArray<id<FBXCElementSnapshot>> *)snapshots
                                                       selfUID:(nullable NSString *)selfUID
                                                  onlyChildren:(BOOL)onlyChildren;
 

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -22,6 +22,8 @@
 #import "FBScreenshot.h"
 #import "FBXCAXClientProxy.h"
 #import "FBXCodeCompatibility.h"
+#import "FBXCElementSnapshot.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
 #import "XCUIApplication.h"
 #import "XCUIApplication+FBQuiescence.h"
 #import "XCUIApplicationImpl.h"
@@ -41,7 +43,7 @@
 
 @implementation XCUIElement (FBUtilities)
 
-- (XCElementSnapshot *)fb_takeSnapshot
+- (id<FBXCElementSnapshot>)fb_takeSnapshot
 {
   NSError *error = nil;
   self.fb_isResolvedFromCache = @(NO);
@@ -61,12 +63,12 @@
   return self.lastSnapshot;
 }
 
-- (XCElementSnapshot *)fb_cachedSnapshot
+- (id<FBXCElementSnapshot>)fb_cachedSnapshot
 {
   return [self.query fb_cachedSnapshot];
 }
 
-- (nullable XCElementSnapshot *)fb_snapshotWithAllAttributesAndMaxDepth:(NSNumber *)maxDepth
+- (nullable id<FBXCElementSnapshot>)fb_snapshotWithAllAttributesAndMaxDepth:(NSNumber *)maxDepth
 {
   NSMutableArray *allNames = [NSMutableArray arrayWithArray:FBStandardAttributeNames()];
   [allNames addObjectsFromArray:FBCustomAttributeNames()];
@@ -74,11 +76,11 @@
                                 maxDepth:maxDepth];
 }
 
-- (nullable XCElementSnapshot *)fb_snapshotWithAttributes:(NSArray<NSString *> *)attributeNames
-                                                 maxDepth:(NSNumber *)maxDepth
+- (nullable id<FBXCElementSnapshot>)fb_snapshotWithAttributes:(NSArray<NSString *> *)attributeNames
+                                                     maxDepth:(NSNumber *)maxDepth
 {
   NSSet<NSString *> *standardAttributes = [NSSet setWithArray:FBStandardAttributeNames()];
-  XCElementSnapshot *snapshot = self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = self.fb_takeSnapshot;
   NSTimeInterval axTimeout = FBConfiguration.customSnapshotTimeout;
   if (nil == attributeNames
       || [[NSSet setWithArray:attributeNames] isSubsetOfSet:standardAttributes]
@@ -87,7 +89,7 @@
     return snapshot;
   }
 
-  XCAccessibilityElement *axElement = snapshot.accessibilityElement;
+  id<FBXCAccessibilityElement> axElement = snapshot.accessibilityElement;
   if (nil == axElement) {
     return nil;
   }
@@ -101,16 +103,17 @@
   }
 
   NSError *error;
-  XCElementSnapshot *snapshotWithAttributes = [FBXCAXClientProxy.sharedClient snapshotForElement:axElement
-                                                                                      attributes:attributeNames
-                                                                                        maxDepth:maxDepth
-                                                                                           error:&error];
+  id<FBXCElementSnapshot> snapshotWithAttributes = [FBXCAXClientProxy.sharedClient snapshotForElement:axElement
+                                                                                           attributes:attributeNames
+                                                                                             maxDepth:maxDepth
+                                                                                                error:&error];
   if (nil == snapshotWithAttributes) {
+    NSString *description = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_description;
     [FBLogger logFmt:@"Cannot take a snapshot with attribute(s) %@ of '%@' after %.2f seconds",
-     attributeNames, snapshot.fb_description, axTimeout];
+     attributeNames, description, axTimeout];
     [FBLogger logFmt:@"This timeout could be customized via '%@' setting", FB_SETTING_CUSTOM_SNAPSHOT_TIMEOUT];
     [FBLogger logFmt:@"Internal error: %@", error.localizedDescription];
-    [FBLogger logFmt:@"Falling back to the default snapshotting mechanism for the element '%@' (some attribute values, like visibility or accessibility might not be precise though)", snapshot.fb_description];
+    [FBLogger logFmt:@"Falling back to the default snapshotting mechanism for the element '%@' (some attribute values, like visibility or accessibility might not be precise though)", description];
     snapshotWithAttributes = self.lastSnapshot;
   } else {
     self.lastSnapshot = snapshotWithAttributes;
@@ -122,19 +125,22 @@
   return snapshotWithAttributes;
 }
 
-- (NSArray<XCUIElement *> *)fb_filterDescendantsWithSnapshots:(NSArray<XCElementSnapshot *> *)snapshots
+- (NSArray<XCUIElement *> *)fb_filterDescendantsWithSnapshots:(NSArray<id<FBXCElementSnapshot>> *)snapshots
                                                       selfUID:(NSString *)selfUID
                                                  onlyChildren:(BOOL)onlyChildren
 {
   if (0 == snapshots.count) {
     return @[];
   }
-  NSArray<NSString *> *sortedIds = [snapshots valueForKey:FBStringify(XCUIElement, wdUID)];
+  NSMutableArray<NSString *> *sortedIds = [NSMutableArray new];
+  for (id<FBXCElementSnapshot> snapshot in snapshots) {
+    [sortedIds addObject:(NSString *)[FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_uid];
+  }
   NSMutableArray<XCUIElement *> *matchedElements = [NSMutableArray array];
   NSString *uid = selfUID;
   if (nil == uid) {
     uid = self.fb_isResolvedFromCache.boolValue
-      ? self.lastSnapshot.fb_uid
+      ? [FBXCElementSnapshotWrapper ensureWrapped:self.lastSnapshot].fb_uid
       : self.fb_uid;
   }
   if ([sortedIds containsObject:uid]) {
@@ -151,7 +157,10 @@
   XCUIElementQuery *query = onlyChildren
     ? [self.fb_query childrenMatchingType:type]
     : [self.fb_query descendantsMatchingType:type];
-  query = [query matchingPredicate:[NSPredicate predicateWithFormat:@"%K IN %@", FBStringify(XCUIElement, wdUID), sortedIds]];
+  NSPredicate *predicate = [NSPredicate predicateWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot, NSDictionary *bindings) {
+    return [sortedIds containsObject:(NSString *)[FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_uid];
+  }];
+  query = [query matchingPredicate:predicate];
   if (1 == snapshots.count) {
     XCUIElement *result = query.fb_firstMatch;
     result.fb_isResolvedNatively = @NO;
@@ -206,7 +215,7 @@
 
 - (NSData *)fb_screenshotWithError:(NSError **)error
 {
-  XCElementSnapshot *selfSnapshot = self.fb_isResolvedFromCache.boolValue
+  id<FBXCElementSnapshot> selfSnapshot = self.fb_isResolvedFromCache.boolValue
     ? self.lastSnapshot
     : self.fb_takeSnapshot;
   if (CGRectIsEmpty(selfSnapshot.frame)) {
@@ -221,8 +230,8 @@
   UIInterfaceOrientation orientation = self.application.interfaceOrientation;
   if (orientation == UIInterfaceOrientationLandscapeLeft || orientation == UIInterfaceOrientationLandscapeRight) {
     // Workaround XCTest bug when element frame is returned as in portrait mode even if the screenshot is rotated
-    NSArray<XCElementSnapshot *> *ancestors = selfSnapshot.fb_ancestors;
-    XCElementSnapshot *parentWindow = nil;
+    NSArray<id<FBXCElementSnapshot>> *ancestors = [FBXCElementSnapshotWrapper ensureWrapped:selfSnapshot].fb_ancestors;
+    id<FBXCElementSnapshot> parentWindow = nil;
     if (1 == ancestors.count) {
       parentWindow = selfSnapshot;
     } else if (ancestors.count > 1) {

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.h

@@ -8,8 +8,8 @@
  */
 
 #import <WebDriverAgentLib/FBElement.h>
-#import <WebDriverAgentLib/XCElementSnapshot.h>
 #import <WebDriverAgentLib/XCUIElement.h>
+#import "FBXCElementSnapshotWrapper.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 
-@interface XCElementSnapshot (WebDriverAttributes) <FBElement>
+@interface FBXCElementSnapshotWrapper (WebDriverAttributes) <FBElement>
 
 @end
 

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -14,6 +14,7 @@
 #import "FBElementTypeTransformer.h"
 #import "FBLogger.h"
 #import "FBMacros.h"
+#import "FBXCElementSnapshotWrapper.h"
 #import "XCUIElement+FBAccessibility.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBUID.h"
@@ -26,9 +27,9 @@
 
 @implementation XCUIElement (WebDriverAttributesForwarding)
 
-- (XCElementSnapshot *)fb_snapshotForAttributeName:(NSString *)name
+- (id<FBXCElementSnapshot>)fb_snapshotForAttributeName:(NSString *)name
 {
-  // These attrbiutes are special, because we can only retrieve them from
+  // These attributes are special, because we can only retrieve them from
   // the snapshot if we explicitly ask XCTest to include them into the query while taking it.
   // That is why fb_snapshotWithAllAttributes method must be used instead of the default snapshot
   // call
@@ -51,8 +52,8 @@
 - (id)fb_valueForWDAttributeName:(NSString *)name
 {
   NSString *wdAttributeName = [FBElementUtils wdAttributeNameForAttributeName:name];
-  XCElementSnapshot *snapshot = [self fb_snapshotForAttributeName:wdAttributeName];
-  return [snapshot fb_valueForWDAttributeName:name];
+  id<FBXCElementSnapshot> snapshot = [self fb_snapshotForAttributeName:wdAttributeName];
+  return [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] fb_valueForWDAttributeName:name];
 }
 
 - (id)forwardingTargetForSelector:(SEL)aSelector
@@ -61,13 +62,13 @@
   SEL webDriverAttributesSelector = descr.name;
   return nil == webDriverAttributesSelector
     ? nil
-    : [self fb_snapshotForAttributeName:NSStringFromSelector(webDriverAttributesSelector)];
+    : [FBXCElementSnapshotWrapper ensureWrapped:[self fb_snapshotForAttributeName:NSStringFromSelector(webDriverAttributesSelector)]];
 }
 
 @end
 
 
-@implementation XCElementSnapshot (WebDriverAttributes)
+@implementation FBXCElementSnapshotWrapper (WebDriverAttributes)
 
 - (id)fb_valueForWDAttributeName:(NSString *)name
 {
@@ -161,8 +162,8 @@
   // Text fields: actual accessible element isn't text field itself, but nested element
   if (elementType == XCUIElementTypeCell) {
     if (!self.fb_isAccessibilityElement) {
-      XCElementSnapshot *containerView = [[self children] firstObject];
-      if (!containerView.fb_isAccessibilityElement) {
+      id<FBXCElementSnapshot> containerView = [[self children] firstObject];
+      if (![FBXCElementSnapshotWrapper ensureWrapped:containerView].fb_isAccessibilityElement) {
         return NO;
       }
     }
@@ -171,12 +172,13 @@
       return NO;
     }
   }
-  XCElementSnapshot *parentSnapshot = self.parent;
+  id<FBXCElementSnapshot> parentSnapshot = self.parent;
   while (parentSnapshot) {
     // In the scenario when table provides Search results controller, table could be marked as accessible element, even though it isn't
     // As it is highly unlikely that table view should ever be an accessibility element itself,
     // for now we work around that by skipping Table View in container checks
-    if (parentSnapshot.fb_isAccessibilityElement && parentSnapshot.elementType != XCUIElementTypeTable) {
+    if ([FBXCElementSnapshotWrapper ensureWrapped:parentSnapshot].fb_isAccessibilityElement
+        && parentSnapshot.elementType != XCUIElementTypeTable) {
       return NO;
     }
     parentSnapshot = parentSnapshot.parent;
@@ -186,9 +188,10 @@
 
 - (BOOL)isWDAccessibilityContainer
 {
-  NSArray<XCElementSnapshot *> *children = self.children;
-  for (XCElementSnapshot *child in children) {
-    if (child.isWDAccessibilityContainer || child.fb_isAccessibilityElement) {
+  NSArray<id<FBXCElementSnapshot>> *children = self.children;
+  for (id<FBXCElementSnapshot> child in children) {
+    FBXCElementSnapshotWrapper *wrappedChild = [FBXCElementSnapshotWrapper ensureWrapped:child];
+    if (wrappedChild.isWDAccessibilityContainer || wrappedChild.fb_isAccessibilityElement) {
       return YES;
     }
   }
@@ -209,7 +212,7 @@
 {
   if (nil != self.parent) {
     for (NSUInteger index = 0; index < self.parent.children.count; ++index) {
-      if ([self.parent.children objectAtIndex:index] == self) {
+      if ([self.parent.children objectAtIndex:index] == self.snapshot) {
         return index;
       }
     }

package/WebDriverAgentLib/Categories/XCUIElementQuery+FBHelpers.h

@@ -8,8 +8,7 @@
  */
 
 #import <XCTest/XCTest.h>
-
-@class XCElementSnapshot;
+#import "FBXCElementSnapshot.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -23,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
 
  @return Either the cached snapshot or nil
  */
-- (nullable XCElementSnapshot *)fb_cachedSnapshot;
+- (nullable id<FBXCElementSnapshot>)fb_cachedSnapshot;
 
 @end
 

package/WebDriverAgentLib/Categories/XCUIElementQuery+FBHelpers.m

@@ -11,13 +11,13 @@
 
 #import "FBXCodeCompatibility.h"
 #import "XCUIElementQuery.h"
-
+#import "FBXCElementSnapshot.h"
 
 @implementation XCUIElementQuery (FBHelpers)
 
-- (nullable XCElementSnapshot *)fb_cachedSnapshot
+- (nullable id<FBXCElementSnapshot>)fb_cachedSnapshot
 {
-  XCElementSnapshot *rootElementSnapshot = self.rootElementSnapshot;
+  id<FBXCElementSnapshot> rootElementSnapshot = self.rootElementSnapshot;
   if (nil == rootElementSnapshot) {
     return nil;
   }

package/WebDriverAgentLib/Commands/FBElementCommands.m

@@ -12,7 +12,6 @@
 #import "FBApplication.h"
 #import "FBConfiguration.h"
 #import "FBKeyboard.h"
-#import "FBPredicate.h"
 #import "FBRoute.h"
 #import "FBRouteRequest.h"
 #import "FBRunLoopSpinner.h"
@@ -105,7 +104,7 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  BOOL isEnabled = element.lastSnapshot.isWDEnabled;
+  BOOL isEnabled = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDEnabled;
   return FBResponseWithObject(isEnabled ? @YES : @NO);
 }
 
@@ -113,7 +112,7 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(element.lastSnapshot.wdRect);
+  return FBResponseWithObject([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdRect);
 }
 
 + (id<FBResponsePayload>)handleGetAttribute:(FBRouteRequest *)request
@@ -135,7 +134,8 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:additionalAttributes
                                           andMaxDepth:maxDepth];
-  id attributeValue = [element.lastSnapshot fb_valueForWDAttributeName:attributeName];
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot];
+  id attributeValue = [wrappedSnapshot fb_valueForWDAttributeName:attributeName];
   return FBResponseWithObject(attributeValue ?: [NSNull null]);
 }
 
@@ -143,7 +143,8 @@
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  id text = FBFirstNonEmptyValue(element.lastSnapshot.wdValue, element.lastSnapshot.wdLabel);
+  FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot];
+  id text = FBFirstNonEmptyValue(wrappedSnapshot.wdValue, wrappedSnapshot.wdLabel);
   return FBResponseWithObject(text ?: @"");
 }
 
@@ -153,7 +154,7 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsVisibleAttributeName]
                                           andMaxDepth:@1];
-  return FBResponseWithObject(@(element.lastSnapshot.isWDVisible));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDVisible));
 }
 
 + (id<FBResponsePayload>)handleGetAccessible:(FBRouteRequest *)request
@@ -162,7 +163,7 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsElementAttributeName]
                                           andMaxDepth:@1];
-  return FBResponseWithObject(@(element.lastSnapshot.isWDAccessible));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDAccessible));
 }
 
 + (id<FBResponsePayload>)handleGetIsAccessibilityContainer:(FBRouteRequest *)request
@@ -171,21 +172,21 @@
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsElementAttributeName]
                                           andMaxDepth:nil];
-  return FBResponseWithObject(@(element.lastSnapshot.isWDAccessibilityContainer));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].isWDAccessibilityContainer));
 }
 
 + (id<FBResponsePayload>)handleGetName:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(element.lastSnapshot.wdType);
+  return FBResponseWithObject([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdType);
 }
 
 + (id<FBResponsePayload>)handleGetSelected:(FBRouteRequest *)request
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  return FBResponseWithObject(@(element.lastSnapshot.wdSelected));
+  return FBResponseWithObject(@([FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdSelected));
 }
 
 + (id<FBResponsePayload>)handleSetValue:(FBRouteRequest *)request
@@ -199,7 +200,7 @@
   NSString *textToType = [value isKindOfClass:NSArray.class]
     ? [value componentsJoinedByString:@""]
     : value;
-  XCUIElementType elementType = element.lastSnapshot.elementType;
+  XCUIElementType elementType = [(id<FBXCElementSnapshot>)element.lastSnapshot elementType];
 #if !TARGET_OS_TV
   if (elementType == XCUIElementTypePickerWheel) {
     [element adjustToPickerWheelValue:textToType];
@@ -370,7 +371,8 @@
 
   NSString *const predicateString = request.arguments[@"predicateString"];
   if (predicateString) {
-    NSPredicate *formattedPredicate = [NSPredicate fb_formatSearchPredicate:[FBPredicate predicateWithFormat:predicateString]];
+    NSPredicate *formattedPredicate = [NSPredicate fb_snapshotBlockPredicateWithPredicate:[NSPredicate
+                                                                                           predicateWithFormat:predicateString]];
     XCUIElement *childElement = [[[[element.fb_query descendantsMatchingType:XCUIElementTypeAny] matchingPredicate:formattedPredicate] allElementsBoundByAccessibilityElement] lastObject];
     if (!childElement) {
       return FBResponseWithStatus([FBCommandStatus noSuchElementErrorWithMessage:[NSString stringWithFormat:@"'%@' predicate didn't match any elements", predicateString] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
@@ -414,7 +416,7 @@
   FBSession *session = request.session;
   FBElementCache *elementCache = session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  CGRect frame = element.lastSnapshot.frame;
+  CGRect frame = [(id<FBXCElementSnapshot>)element.lastSnapshot frame];
   CGPoint startPoint = CGPointMake((CGFloat)(frame.origin.x + [request.arguments[@"fromX"] doubleValue]), (CGFloat)(frame.origin.y + [request.arguments[@"fromY"] doubleValue]));
   CGPoint endPoint = CGPointMake((CGFloat)(frame.origin.x + [request.arguments[@"toX"] doubleValue]), (CGFloat)(frame.origin.y + [request.arguments[@"toY"] doubleValue]));
   NSTimeInterval duration = [request.arguments[@"duration"] doubleValue];
@@ -564,7 +566,7 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
 {
   FBElementCache *elementCache = request.session.elementCache;
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]];
-  if (element.lastSnapshot.elementType != XCUIElementTypePickerWheel) {
+  if ([element.lastSnapshot elementType] != XCUIElementTypePickerWheel) {
     return FBResponseWithStatus([FBCommandStatus invalidArgumentErrorWithMessage:[NSString stringWithFormat:@"The element is expected to be a valid Picker Wheel control. '%@' was given instead", element.wdType] traceback:[NSString stringWithFormat:@"%@", NSThread.callStackSymbols]]);
   }
   NSString* order = [request.arguments[@"order"] lowercaseString];
@@ -634,7 +636,7 @@ static const CGFloat DEFAULT_OFFSET = (CGFloat)0.2;
     XCUIElement *window = application.windows.fb_firstMatch;
     if (window) {
       element = window;
-      XCElementSnapshot *snapshot = element.fb_cachedSnapshot ?: element.fb_takeSnapshot;
+      id<FBXCElementSnapshot> snapshot = element.fb_cachedSnapshot ?: element.fb_takeSnapshot;
       point.x -= snapshot.frame.origin.x;
       point.y -= snapshot.frame.origin.y;
     }

package/WebDriverAgentLib/Commands/FBFindElementCommands.m

@@ -15,7 +15,6 @@
 #import "FBElementCache.h"
 #import "FBExceptions.h"
 #import "FBMacros.h"
-#import "FBPredicate.h"
 #import "FBRouteRequest.h"
 #import "FBSession.h"
 #import "XCTestPrivateSymbols.h"
@@ -84,11 +83,12 @@ static id<FBResponsePayload> FBNoSuchElementErrorResponseForRequest(FBRouteReque
   XCUIElement *element = [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
                        resolveForAdditionalAttributes:@[FB_XCAXAIsVisibleAttributeName]
                                           andMaxDepth:nil];
-  NSArray<XCElementSnapshot *> *visibleCellSnapshots = [element.lastSnapshot descendantsByFilteringWithBlock:^BOOL(XCElementSnapshot *snapshot) {
-    return snapshot.elementType == XCUIElementTypeCell && snapshot.wdVisible;
+  NSArray<id<FBXCElementSnapshot>> *visibleCellSnapshots = [element.lastSnapshot descendantsByFilteringWithBlock:^BOOL(id<FBXCElementSnapshot> snapshot) {
+    return snapshot.elementType == XCUIElementTypeCell
+      && [FBXCElementSnapshotWrapper ensureWrapped:snapshot].wdVisible;
   }];
   NSArray *cells = [element fb_filterDescendantsWithSnapshots:visibleCellSnapshots
-                                                      selfUID:element.lastSnapshot.wdUID
+                                                      selfUID:[FBXCElementSnapshotWrapper ensureWrapped:element.lastSnapshot].wdUID
                                                  onlyChildren:NO];
   return FBResponseWithCachedElements(cells, request.session.elementCache, FBConfiguration.shouldUseCompactResponses);
 }
@@ -169,8 +169,7 @@ shouldReturnAfterFirstMatch:(BOOL)shouldReturnAfterFirstMatch
     return [element fb_descendantsMatchingXPathQuery:value
                          shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];
   } else if ([usingText isEqualToString:@"predicate string"]) {
-    NSPredicate *predicate = [FBPredicate predicateWithFormat:value];
-    return [element fb_descendantsMatchingPredicate:predicate
+    return [element fb_descendantsMatchingPredicate:[NSPredicate predicateWithFormat:value]
                         shouldReturnAfterFirstMatch:shouldReturnAfterFirstMatch];
   } else if ([usingText isEqualToString:@"name"]
              || [usingText isEqualToString:@"id"]