appium-webdriveragent 8.12.2 → 9.0.0

package/WebDriverAgentLib/Categories/XCUIElement+FBScrolling.m

@@ -20,9 +20,11 @@
 #import "XCUIApplication.h"
 #import "XCUICoordinate.h"
 #import "XCUIElement+FBIsVisible.h"
+#import "XCUIElement+FBVisibleFrame.h"
 #import "XCUIElement.h"
 #import "XCUIElement+FBUtilities.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
+#import "XCTestPrivateSymbols.h"
 
 const CGFloat FBFuzzyPointThreshold = 20.f; //Smallest determined value that is not interpreted as touch
 const CGFloat FBScrollToVisibleNormalizedDistance = .5f;
@@ -47,45 +49,35 @@ const CGFloat FBScrollTouchProportion = 0.75f;
 
 - (BOOL)fb_nativeScrollToVisibleWithError:(NSError **)error
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:YES];
   return nil != [self _hitPointByAttemptingToScrollToVisibleSnapshot:snapshot
                                                                error:error];
 }
 
 - (void)fb_scrollUpByNormalizedDistance:(CGFloat)distance
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:YES];
   [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] fb_scrollUpByNormalizedDistance:distance
                                                                          inApplication:self.application];
 }
 
 - (void)fb_scrollDownByNormalizedDistance:(CGFloat)distance
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:YES];
   [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] fb_scrollDownByNormalizedDistance:distance
                                                                            inApplication:self.application];
 }
 
 - (void)fb_scrollLeftByNormalizedDistance:(CGFloat)distance
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:YES];
   [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] fb_scrollLeftByNormalizedDistance:distance
                                                                            inApplication:self.application];
 }
 
 - (void)fb_scrollRightByNormalizedDistance:(CGFloat)distance
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:YES];
   [[FBXCElementSnapshotWrapper ensureWrapped:snapshot] fb_scrollRightByNormalizedDistance:distance
                                                                             inApplication:self.application];
 }
@@ -95,7 +87,8 @@ const CGFloat FBScrollTouchProportion = 0.75f;
   return [self fb_scrollToVisibleWithNormalizedScrollDistance:FBScrollToVisibleNormalizedDistance error:error];
 }
 
-- (BOOL)fb_scrollToVisibleWithNormalizedScrollDistance:(CGFloat)normalizedScrollDistance error:(NSError **)error
+- (BOOL)fb_scrollToVisibleWithNormalizedScrollDistance:(CGFloat)normalizedScrollDistance
+                                                 error:(NSError **)error
 {
   return [self fb_scrollToVisibleWithNormalizedScrollDistance:normalizedScrollDistance
                                               scrollDirection:FBXCUIElementScrollDirectionUnknown
@@ -106,7 +99,8 @@ const CGFloat FBScrollTouchProportion = 0.75f;
                                        scrollDirection:(FBXCUIElementScrollDirection)scrollDirection
                                                  error:(NSError **)error
 {
-  FBXCElementSnapshotWrapper *prescrollSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:[self fb_takeSnapshot]];
+  FBXCElementSnapshotWrapper *prescrollSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:[self fb_takeSnapshot:YES]];
+
   if (prescrollSnapshot.isWDVisible) {
     return YES;
   }
@@ -138,12 +132,12 @@ const CGFloat FBScrollTouchProportion = 0.75f;
       FBXCElementSnapshotWrapper *wrappedCellSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:cellSnapshot];
       if (wrappedCellSnapshot.wdVisible) {
         [visibleCellSnapshots addObject:cellSnapshot];
+        if (visibleCellSnapshots.count > 1) {
+          return YES;
+        }
       }
     }
 
-    if (visibleCellSnapshots.count > 1) {
-      return YES;
-    }
     return NO;
   }];
 
@@ -213,9 +207,9 @@ const CGFloat FBScrollTouchProportion = 0.75f;
   // Cell is now visible, but it might be only partialy visible, scrolling till whole frame is visible.
   // Sometimes, attempting to grab the parent snapshot of the target cell after scrolling is complete causes a stale element reference exception.
   // Trying fb_cachedSnapshot first
-  FBXCElementSnapshotWrapper *targetCellSnapshotWrapped = [FBXCElementSnapshotWrapper ensureWrapped:([self fb_cachedSnapshot] ?: [self fb_takeSnapshot])];
+  FBXCElementSnapshotWrapper *targetCellSnapshotWrapped = [FBXCElementSnapshotWrapper ensureWrapped:[self fb_takeSnapshot:YES]];
   targetCellSnapshot = [targetCellSnapshotWrapped fb_parentCellSnapshot];
-  CGRect visibleFrame = [FBXCElementSnapshotWrapper ensureWrapped:targetCellSnapshot].fb_visibleFrameWithFallback;
+  CGRect visibleFrame = [FBXCElementSnapshotWrapper ensureWrapped:targetCellSnapshot].fb_visibleFrame;
   
   CGVector scrollVector = CGVectorMake(visibleFrame.size.width - targetCellSnapshot.frame.size.width,
                                        visibleFrame.size.height - targetCellSnapshot.frame.size.height
@@ -233,7 +227,7 @@ const CGFloat FBScrollTouchProportion = 0.75f;
     return YES;
   }
 
-  id<FBXCElementSnapshot> appSnapshot = [self.application fb_takeSnapshot];
+  id<FBXCElementSnapshot> appSnapshot = [self.application fb_takeSnapshot:YES];
   for (id<FBXCElementSnapshot> elementSnapshot in appSnapshot._allDescendants.copy) {
     FBXCElementSnapshotWrapper *wrappedElementSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:elementSnapshot];
     // We are comparing pre-scroll snapshot so frames are irrelevant.
@@ -255,27 +249,32 @@ const CGFloat FBScrollTouchProportion = 0.75f;
   return self.visibleFrame;
 }
 
-- (void)fb_scrollUpByNormalizedDistance:(CGFloat)distance inApplication:(XCUIApplication *)application
+- (void)fb_scrollUpByNormalizedDistance:(CGFloat)distance
+                          inApplication:(XCUIApplication *)application
 {
   [self fb_scrollByNormalizedVector:CGVectorMake(0.0, distance) inApplication:application];
 }
 
-- (void)fb_scrollDownByNormalizedDistance:(CGFloat)distance inApplication:(XCUIApplication *)application
+- (void)fb_scrollDownByNormalizedDistance:(CGFloat)distance
+                            inApplication:(XCUIApplication *)application
 {
   [self fb_scrollByNormalizedVector:CGVectorMake(0.0, -distance) inApplication:application];
 }
 
-- (void)fb_scrollLeftByNormalizedDistance:(CGFloat)distance inApplication:(XCUIApplication *)application
+- (void)fb_scrollLeftByNormalizedDistance:(CGFloat)distance
+                            inApplication:(XCUIApplication *)application
 {
   [self fb_scrollByNormalizedVector:CGVectorMake(distance, 0.0) inApplication:application];
 }
 
-- (void)fb_scrollRightByNormalizedDistance:(CGFloat)distance inApplication:(XCUIApplication *)application
+- (void)fb_scrollRightByNormalizedDistance:(CGFloat)distance
+                             inApplication:(XCUIApplication *)application
 {
   [self fb_scrollByNormalizedVector:CGVectorMake(-distance, 0.0) inApplication:application];
 }
 
-- (BOOL)fb_scrollByNormalizedVector:(CGVector)normalizedScrollVector inApplication:(XCUIApplication *)application
+- (BOOL)fb_scrollByNormalizedVector:(CGVector)normalizedScrollVector
+                      inApplication:(XCUIApplication *)application
 {
   CGVector scrollVector = CGVectorMake(CGRectGetWidth(self.scrollingFrame) * normalizedScrollVector.dx,
                                        CGRectGetHeight(self.scrollingFrame) * normalizedScrollVector.dy
@@ -283,7 +282,9 @@ const CGFloat FBScrollTouchProportion = 0.75f;
   return [self fb_scrollByVector:scrollVector inApplication:application error:nil];
 }
 
-- (BOOL)fb_scrollByVector:(CGVector)vector inApplication:(XCUIApplication *)application error:(NSError **)error
+- (BOOL)fb_scrollByVector:(CGVector)vector
+            inApplication:(XCUIApplication *)application
+                    error:(NSError **)error
 {
   CGVector scrollBoundingVector = CGVectorMake(
                                                CGRectGetWidth(self.scrollingFrame) * FBScrollTouchProportion,
@@ -314,7 +315,9 @@ const CGFloat FBScrollTouchProportion = 0.75f;
   return CGVectorMake((CGFloat)floor(x), (CGFloat)floor(y));
 }
 
-- (BOOL)fb_scrollAncestorScrollViewByVectorWithinScrollViewFrame:(CGVector)vector inApplication:(XCUIApplication *)application error:(NSError **)error
+- (BOOL)fb_scrollAncestorScrollViewByVectorWithinScrollViewFrame:(CGVector)vector
+                                                   inApplication:(XCUIApplication *)application
+                                                           error:(NSError **)error
 {
   CGVector hitpointOffset = [self fb_hitPointOffsetForScrollingVector:vector];
 

package/WebDriverAgentLib/Categories/XCUIElement+FBTyping.m

@@ -91,7 +91,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
   [FBLogger logFmt:@"Trying to tap the \"%@\" element to have it focused", snapshot.fb_description];
   [self tap];
   // It might take some time to update the UI
-  [self fb_takeSnapshot];
+  [self fb_takeSnapshot:NO];
 #endif
 }
 
@@ -110,9 +110,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
           frequency:(NSUInteger)frequency
               error:(NSError **)error
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:NO];
   FBXCElementSnapshotWrapper *wrapped = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];
   [self fb_prepareForTextInputWithSnapshot:wrapped];
   if (shouldClear && ![self fb_clearTextWithSnapshot:wrapped shouldPrepareForInput:NO error:error]) {
@@ -123,9 +121,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
 
 - (BOOL)fb_clearTextWithError:(NSError **)error
 {
-  id<FBXCElementSnapshot> snapshot = self.fb_isResolvedFromCache.boolValue
-    ? self.lastSnapshot
-    : self.fb_takeSnapshot;
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:NO];
   return [self fb_clearTextWithSnapshot:[FBXCElementSnapshotWrapper ensureWrapped:snapshot]
                   shouldPrepareForInput:YES
                                   error:error];
@@ -182,7 +178,7 @@ BOOL FBTypeText(NSString *text, NSUInteger typingSpeed, NSError **error)
       return NO;
     }
 
-    currentValue = self.fb_takeSnapshot.value;
+    currentValue = [self fb_takeSnapshot:NO].value;
     if (nil != placeholderValue && [currentValue isEqualToString:placeholderValue]) {
       // Short circuit if only the placeholder value left
       return YES;

package/WebDriverAgentLib/Categories/XCUIElement+FBUID.m

@@ -22,14 +22,14 @@
 {
   return [FBElementUtils idWithAccessibilityElement:([self isKindOfClass:XCUIApplication.class]
                                                      ? [(XCUIApplication *)self accessibilityElement]
-                                                     : [self fb_takeSnapshot].accessibilityElement)];
+                                                     : [self fb_takeSnapshot:NO].accessibilityElement)];
 }
 
 - (NSString *)fb_uid
 {
   return [self isKindOfClass:XCUIApplication.class]
     ? [FBElementUtils uidWithAccessibilityElement:[(XCUIApplication *)self accessibilityElement]]
-    : [FBXCElementSnapshotWrapper ensureWrapped:[self fb_takeSnapshot]].fb_uid;
+    : [FBXCElementSnapshotWrapper ensureWrapped:[self fb_takeSnapshot:NO]].fb_uid;
 }
 
 @end

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.h

@@ -19,12 +19,13 @@ NS_ASSUME_NONNULL_BEGIN
  Gets the most recent snapshot of the current element. The element will be
  automatically resolved if the snapshot is not available yet.
  Calls to this method mutate the `lastSnapshot` instance property..
- Calls to this method reset the `fb_isResolvedFromCache` property value to `NO`.
 
+ @param inDepth Whether to resolve snapshot parents and children. Setting it to NO
+ would improve the snapshotting performance
  @return The recent snapshot of the element
  @throws FBStaleElementException if the element is not present in DOM and thus no snapshot could be made
  */
-- (id<FBXCElementSnapshot>)fb_takeSnapshot;
+- (id<FBXCElementSnapshot>)fb_takeSnapshot:(BOOL)inDepth;
 
 /**
  Extracts the cached element snapshot from its query.
@@ -36,40 +37,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable id<FBXCElementSnapshot>)fb_cachedSnapshot;
 
-/**
- Gets the most recent snapshot of the current element and already resolves the accessibility attributes
- needed for creating the page source of this element. No additional calls to the accessibility layer
- are required.
- Calls to this method mutate the `lastSnapshot` instance property.
- Calls to this method reset the `fb_isResolvedFromCache` property value to `NO`.
-
- @param maxDepth The maximum depth of the snapshot. nil value means to use the default depth.
- with custom attributes cannot be resolved
- 
- @return The recent snapshot of the element with all attributes resolved or a snapshot with default
- 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 id<FBXCElementSnapshot>)fb_snapshotWithAllAttributesAndMaxDepth:(nullable NSNumber *)maxDepth;
-
-/**
- Gets the most recent snapshot of the current element with given attributes resolved.
- No additional calls to the accessibility layer are required.
- Calls to this method mutate the `lastSnapshot` instance property.
- Calls to this method reset the `fb_isResolvedFromCache` property value to `NO`.
-
- @param attributeNames The list of attribute names to resolve. Must be one of
- FB_...Name values exported by XCTestPrivateSymbols.h module.
- `nil` value means that only the default attributes must be extracted
- @param maxDepth The maximum depth of the snapshot. nil value means to use the default depth.
-
- @return The recent snapshot of the element with the given attributes resolved or a snapshot with default
- 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 id<FBXCElementSnapshot>)fb_snapshotWithAttributes:(nullable NSArray<NSString *> *)attributeNames
-                                                      maxDepth:(nullable NSNumber *)maxDepth;
-
 /**
  Filters elements by matching them to snapshots from the corresponding array
 

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.m

@@ -14,6 +14,7 @@
 #import "FBConfiguration.h"
 #import "FBExceptions.h"
 #import "FBImageUtils.h"
+#import "FBElementUtils.h"
 #import "FBLogger.h"
 #import "FBMacros.h"
 #import "FBMathUtils.h"
@@ -32,6 +33,7 @@
 #import "XCTestPrivateSymbols.h"
 #import "XCTRunnerDaemonSession.h"
 #import "XCUIApplicationProcess+FBQuiescence.h"
+#import "XCUIApplication.h"
 #import "XCUIElement+FBCaching.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 #import "XCUIElementQuery.h"
@@ -40,22 +42,21 @@
 #import "XCUIScreen.h"
 #import "XCUIElement+FBResolve.h"
 
-#define DEFAULT_AX_TIMEOUT 60.
-
 @implementation XCUIElement (FBUtilities)
 
-- (id<FBXCElementSnapshot>)fb_takeSnapshot
+- (id<FBXCElementSnapshot>)fb_takeSnapshot:(BOOL)inDepth
 {
   NSError *error = nil;
-  self.fb_isResolvedFromCache = @(NO);
-  self.lastSnapshot = [self.fb_query fb_uniqueSnapshotWithError:&error];
+  self.lastSnapshot = inDepth
+    ? [self.fb_query fb_uniqueSnapshotWithError:&error]
+    : (id<FBXCElementSnapshot>)[self snapshotWithError:&error];
   if (nil == self.lastSnapshot) {
     NSString *hintText = @"Make sure the application UI has the expected state";
-    if (nil != error
-        && [error.localizedDescription containsString:@"Identity Binding"]) {
+    if (nil != error && [error.localizedDescription containsString:@"Identity Binding"]) {
       hintText = [NSString stringWithFormat:@"%@. You could also try to switch the binding strategy using the 'boundElementsByIndex' setting for the element lookup", hintText];
     }
-    NSString *reason = [NSString stringWithFormat:@"The previously found element \"%@\" is not present in the current view anymore. %@", self.description, hintText];
+    NSString *reason = [NSString stringWithFormat:@"The previously found element \"%@\" is not present in the current view anymore. %@",
+                        self.description, hintText];
     if (nil != error) {
       reason = [NSString stringWithFormat:@"%@. Original error: %@", reason, error.localizedDescription];
     }
@@ -69,63 +70,6 @@
   return [self.query fb_cachedSnapshot];
 }
 
-- (nullable id<FBXCElementSnapshot>)fb_snapshotWithAllAttributesAndMaxDepth:(NSNumber *)maxDepth
-{
-  NSMutableArray *allNames = [NSMutableArray arrayWithArray:FBStandardAttributeNames()];
-  [allNames addObjectsFromArray:FBCustomAttributeNames()];
-  return [self fb_snapshotWithAttributes:allNames.copy
-                                maxDepth:maxDepth];
-}
-
-- (nullable id<FBXCElementSnapshot>)fb_snapshotWithAttributes:(NSArray<NSString *> *)attributeNames
-                                                     maxDepth:(NSNumber *)maxDepth
-{
-  NSSet<NSString *> *standardAttributes = [NSSet setWithArray:FBStandardAttributeNames()];
-  id<FBXCElementSnapshot> snapshot = self.fb_takeSnapshot;
-  NSTimeInterval axTimeout = FBConfiguration.customSnapshotTimeout;
-  if (nil == attributeNames
-      || [[NSSet setWithArray:attributeNames] isSubsetOfSet:standardAttributes]
-      || axTimeout < DBL_EPSILON) {
-    // return the "normal" element snapshot if no custom attributes are requested
-    return snapshot;
-  }
-
-  id<FBXCAccessibilityElement> axElement = snapshot.accessibilityElement;
-  if (nil == axElement) {
-    return nil;
-  }
-
-  NSError *setTimeoutError;
-  BOOL isTimeoutSet = [FBXCAXClientProxy.sharedClient setAXTimeout:axTimeout
-                                                             error:&setTimeoutError];
-  if (!isTimeoutSet) {
-    [FBLogger logFmt:@"Cannot set snapshoting timeout to %.1fs. Original error: %@",
-     axTimeout, setTimeoutError.localizedDescription];
-  }
-
-  NSError *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, 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)", description];
-    snapshotWithAttributes = self.lastSnapshot;
-  } else {
-    self.lastSnapshot = snapshotWithAttributes;
-  }
-
-  if (isTimeoutSet) {
-    [FBXCAXClientProxy.sharedClient setAXTimeout:DEFAULT_AX_TIMEOUT error:nil];
-  }
-  return snapshotWithAttributes;
-}
-
 - (NSArray<XCUIElement *> *)fb_filterDescendantsWithSnapshots:(NSArray<id<FBXCElementSnapshot>> *)snapshots
                                                       selfUID:(NSString *)selfUID
                                                  onlyChildren:(BOOL)onlyChildren
@@ -143,9 +87,7 @@
   NSMutableArray<XCUIElement *> *matchedElements = [NSMutableArray array];
   NSString *uid = selfUID;
   if (nil == uid) {
-    uid = self.fb_isResolvedFromCache.boolValue
-      ? [FBXCElementSnapshotWrapper wdUIDWithSnapshot:self.lastSnapshot]
-      : self.fb_uid;
+    uid = self.fb_uid;
   }
   if (nil != uid && [matchedIds containsObject:uid]) {
     XCUIElement *stableSelf = self.fb_stableInstance;

package/WebDriverAgentLib/Categories/XCUIElement+FBVisibleFrame.h

@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "FBXCElementSnapshotWrapper.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XCUIElement (FBVisibleFrame)
+
+/**
+ Returns the snapshot visibleFrame with a fallback to direct attribute retrieval from FBXCAXClient in case of a snapshot fault (nil visibleFrame)
+
+ @return the snapshot visibleFrame
+ */
+- (CGRect)fb_visibleFrame;
+
+@end
+
+@interface FBXCElementSnapshotWrapper (FBVisibleFrame)
+
+/**
+ Returns the snapshot visibleFrame with a fallback to direct attribute retrieval from FBXCAXClient in case of a snapshot fault (nil visibleFrame)
+
+ @return the snapshot visibleFrame
+ */
+- (CGRect)fb_visibleFrame;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBVisibleFrame.m

@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "XCUIElement+FBVisibleFrame.h"
+#import "FBElementUtils.h"
+#import "FBXCodeCompatibility.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
+#import "XCUIElement+FBUtilities.h"
+#import "XCTestPrivateSymbols.h"
+
+@implementation XCUIElement (FBVisibleFrame)
+
+- (CGRect)fb_visibleFrame
+{
+  id<FBXCElementSnapshot> snapshot = [self fb_takeSnapshot:NO];
+  return [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_visibleFrame;
+}
+
+@end
+
+@implementation FBXCElementSnapshotWrapper (FBVisibleFrame)
+
+- (CGRect)fb_visibleFrame
+{
+  CGRect thisVisibleFrame = [self visibleFrame];
+  if (!CGRectIsEmpty(thisVisibleFrame)) {
+    return thisVisibleFrame;
+  }
+
+  NSDictionary *visibleFrameDict = [self fb_attributeValue:FB_XCAXAVisibleFrameAttributeName
+                                                     error:nil];
+  if (nil == visibleFrameDict) {
+    return thisVisibleFrame;
+  }
+
+  id x = [visibleFrameDict objectForKey:@"X"];
+  id y = [visibleFrameDict objectForKey:@"Y"];
+  id height = [visibleFrameDict objectForKey:@"Height"];
+  id width = [visibleFrameDict objectForKey:@"Width"];
+  if (x != nil && y != nil && height != nil && width != nil) {
+    return CGRectMake([x doubleValue], [y doubleValue], [width doubleValue], [height doubleValue]);
+  }
+
+  return thisVisibleFrame;
+}
+
+@end

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -28,24 +28,10 @@
 
 - (id<FBXCElementSnapshot>)fb_snapshotForAttributeName:(NSString *)name
 {
-  // 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
-  if ([name isEqualToString:FBStringify(XCUIElement, isWDVisible)]) {
-    return [self fb_snapshotWithAttributes:@[FB_XCAXAIsVisibleAttributeName]
-                                  maxDepth:@1];
-  }
-  if ([name isEqualToString:FBStringify(XCUIElement, isWDAccessible)]) {
-    return [self fb_snapshotWithAttributes:@[FB_XCAXAIsElementAttributeName]
-                                  maxDepth:@1];
-  }
-  if ([name isEqualToString:FBStringify(XCUIElement, isWDAccessibilityContainer)]) {
-    return [self fb_snapshotWithAttributes:@[FB_XCAXAIsElementAttributeName]
-                                  maxDepth:nil];
-  }
-  
-  return self.fb_takeSnapshot;
+  BOOL inDepth = [name isEqualToString:FBStringify(XCUIElement, isWDAccessible)]
+    || [name isEqualToString:FBStringify(XCUIElement, isWDAccessibilityContainer)]
+    || [name isEqualToString:FBStringify(XCUIElement, wdIndex)];
+  return [self fb_takeSnapshot:inDepth];
 }
 
 - (id)fb_valueForWDAttributeName:(NSString *)name
@@ -92,6 +78,7 @@
     value = @([value boolValue]);
   } else if (elementType == XCUIElementTypeTextView ||
              elementType == XCUIElementTypeTextField ||
+             elementType == XCUIElementTypeSearchField ||
              elementType == XCUIElementTypeSecureTextField) {
     NSString *placeholderValue = self.placeholderValue;
     value = FBFirstNonEmptyValue(value, placeholderValue);
@@ -183,8 +170,8 @@
     // 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 ([FBXCElementSnapshotWrapper ensureWrapped:parentSnapshot].fb_isAccessibilityElement
-        && parentSnapshot.elementType != XCUIElementTypeTable) {
+    if (parentSnapshot.elementType != XCUIElementTypeTable
+        && [FBXCElementSnapshotWrapper ensureWrapped:parentSnapshot].fb_isAccessibilityElement) {
       return NO;
     }
     parentSnapshot = parentSnapshot.parent;

package/WebDriverAgentLib/Commands/FBCustomCommands.m

@@ -567,7 +567,8 @@
   FBElementCache *elementCache = request.session.elementCache;
   BOOL hasElement = ![request.parameters[@"uuid"] isEqual:@"0"];
   XCUIElement *destination = hasElement
-    ? [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]]
+    ? [elementCache elementForUUID:(NSString *)request.parameters[@"uuid"]
+                    checkStaleness:YES]
     : request.session.activeApplication;
   id keys = request.arguments[@"keys"];