appium-webdriveragent 4.15.1 → 5.1.0

package/WebDriverAgentLib/Utilities/FBAppiumActionsSynthesizer.m

@@ -80,7 +80,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
 
 - (nullable instancetype)initWithActionItem:(NSDictionary<NSString *, id> *)item
                                 application:(XCUIApplication *)application
-                                 atPosition:(nullable NSValue *)atPosition
+                                 atPosition:(nullable XCUICoordinate *)atPosition
                                      offset:(double)offset
                                       error:(NSError **)error
 {
@@ -90,14 +90,14 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     self.application = application;
     self.offset = offset;
     id options = [item objectForKey:FB_OPTIONS_KEY];
-    if (atPosition) {
-      self.atPosition = [atPosition CGPointValue];
+    if (nil != atPosition) {
+      self.atPosition = (id) atPosition;
     } else {
-      NSValue *result = [self coordinatesWithOptions:options error:error];
+      XCUICoordinate *result = [self coordinatesWithOptions:options error:error];
       if (nil == result) {
         return nil;
       }
-      self.atPosition = [result CGPointValue];
+      self.atPosition = result;
     }
     self.duration = [self durationWithOptions:options];
     if (self.duration < 0) {
@@ -124,7 +124,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     0.0;
 }
 
-- (nullable NSValue *)coordinatesWithOptions:(nullable NSDictionary<NSString *, id> *)options error:(NSError **)error
+- (nullable XCUICoordinate *)coordinatesWithOptions:(nullable NSDictionary<NSString *, id> *)options
+                                              error:(NSError **)error
 {
   if (![options isKindOfClass:NSDictionary.class]) {
     NSString *description = [NSString stringWithFormat:@"'%@' key is mandatory for '%@' action", FB_OPTIONS_KEY, self.class.actionName];
@@ -169,7 +170,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
   NSTimeInterval currentOffset = FBMillisToSeconds(self.offset);
   NSMutableArray<XCPointerEventPath *> *result = [NSMutableArray array];
   XCPointerEventPath *currentPath = [[XCPointerEventPath alloc]
-                                     initForTouchAtPoint:self.atPosition
+                                     initForTouchAtPoint:self.atPosition.screenPoint
                                      offset:currentOffset];
   [result addObject:currentPath];
   currentOffset += FBMillisToSeconds(FB_TAP_DURATION_MS);
@@ -180,7 +181,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     NSNumber *tapCount = [options objectForKey:FB_OPTION_COUNT] ?: @1;
     for (NSInteger times = 1; times < tapCount.integerValue; ++times) {
       currentOffset += FBMillisToSeconds(FB_INTERTAP_MIN_DURATION_MS);
-      XCPointerEventPath *nextPath = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:currentOffset];
+      XCPointerEventPath *nextPath = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
+                                                                              offset:currentOffset];
       [result addObject:nextPath];
       currentOffset += FBMillisToSeconds(FB_TAP_DURATION_MS);
       [nextPath liftUpAtOffset:currentOffset];
@@ -204,7 +206,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
 
 - (nullable instancetype)initWithActionItem:(NSDictionary<NSString *, id> *)item
                                 application:(XCUIApplication *)application
-                                 atPosition:(nullable NSValue *)atPosition
+                                 atPosition:(nullable XCUICoordinate *)atPosition
                                      offset:(double)offset
                                       error:(NSError **)error
 {
@@ -239,7 +241,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
                                             error:(NSError **)error
 {
   XCPointerEventPath *result = [[XCPointerEventPath alloc]
-                                initForTouchAtPoint:self.atPosition
+                                initForTouchAtPoint:self.atPosition.screenPoint
                                 offset:FBMillisToSeconds(self.offset)];
   if (nil != self.pressure && nil != result.pointerEvents.lastObject) {
     XCPointerEvent *pointerEvent = (XCPointerEvent *)result.pointerEvents.lastObject;
@@ -272,7 +274,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
                                  currentItemIndex:(NSUInteger)currentItemIndex
                                             error:(NSError **)error
 {
-  return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition
+  return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
                                                     offset:FBMillisToSeconds(self.offset)]];
 }
 
@@ -312,7 +314,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     }
   }
   NSTimeInterval currentOffset = FBMillisToSeconds(self.offset + self.duration);
-  XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:currentOffset];
+  XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
+                                                                        offset:currentOffset];
   if (currentItemIndex == allItems.count - 1) {
     [result liftUpAtOffset:currentOffset];
   }
@@ -353,7 +356,8 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
     return nil;
   }
 
-  [eventPath moveToPoint:self.atPosition atOffset:FBMillisToSeconds(self.offset)];
+  [eventPath moveToPoint:self.atPosition.screenPoint
+                atOffset:FBMillisToSeconds(self.offset)];
   return @[];
 }
 
@@ -509,7 +513,11 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
         return nil;
       }
       FBAppiumGestureItem *lastItem = [chain.items lastObject];
-      gestureItem = [[gestureItemClass alloc] initWithActionItem:actionItem application:self.application atPosition:[NSValue valueWithCGPoint:lastItem.atPosition] offset:chain.durationOffset error:error];
+      gestureItem = [[gestureItemClass alloc] initWithActionItem:actionItem
+                                                     application:self.application
+                                                      atPosition:lastItem.atPosition
+                                                          offset:chain.durationOffset
+                                                           error:error];
     }
     if (nil == gestureItem) {
       return nil;
@@ -527,7 +535,7 @@ static const double FB_LONG_TAP_DURATION_MS = 600.0;
   BOOL isMultiTouch = [self.actions.firstObject isKindOfClass:NSArray.class];
   eventRecord = [[XCSynthesizedEventRecord alloc]
                  initWithName:(isMultiTouch ? @"Multi-Finger Touch Action" : @"Single-Finger Touch Action")
-                 interfaceOrientation:[FBXCTestDaemonsProxy orientationWithApplication:self.application]];
+                 interfaceOrientation:self.application.interfaceOrientation];
   for (NSArray<NSDictionary<NSString *, id> *> *action in (isMultiTouch ? self.actions : @[self.actions])) {
     NSArray<NSDictionary<NSString *, id> *> *preprocessedAction = [self preprocessAction:action];
     NSArray<XCPointerEventPath *> *eventPaths = [self eventPathsWithAction:preprocessedAction error:error];

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.h

@@ -51,19 +51,10 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FBBaseGestureItem : FBBaseActionItem
 
 /*! Absolute position on the screen where the gesure should be performed */
-@property (nonatomic) CGPoint atPosition;
+@property (nonatomic) XCUICoordinate *atPosition;
 /*! Gesture duration in milliseconds */
 @property (nonatomic) double duration;
 
-/**
- Returns fixed hit point coordinates for the case when XCTest fails to transform element snaapshot properly on screen rotation.
-
- @param hitPoint The initial hitpoint coordinates
- @param snapshot Element's snapshot instance
- @return The fixed hit point coordinates, if there is a need to fix them, or the unchanged hit point value
- */
-- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(id<FBXCElementSnapshot>)snapshot;
-
 /**
  Calculate absolute gesture position on the screen based on provided element and positionOffset values.
 
@@ -72,9 +63,9 @@ NS_ASSUME_NONNULL_BEGIN
  @param error If there is an error, upon return contains an NSError object that describes the problem
  @return Adbsolute gesture position on the screen or nil if the calculation fails (for example, the element is invisible)
  */
-- (nullable NSValue *)hitpointWithElement:(nullable XCUIElement *)element
-                           positionOffset:(nullable NSValue *)positionOffset
-                                    error:(NSError **)error;
+- (nullable XCUICoordinate *)hitpointWithElement:(nullable XCUIElement *)element
+                                  positionOffset:(nullable NSValue *)positionOffset
+                                           error:(NSError **)error;
 
 @end
 

package/WebDriverAgentLib/Utilities/FBBaseActionsSynthesizer.m

@@ -31,7 +31,10 @@
   return nil;
 }
 
-- (NSArray<XCPointerEventPath *> *)addToEventPath:(XCPointerEventPath *)eventPath allItems:(NSArray *)allItems currentItemIndex:(NSUInteger)currentItemIndex error:(NSError **)error
+- (NSArray<XCPointerEventPath *> *)addToEventPath:(XCPointerEventPath *)eventPath
+                                         allItems:(NSArray *)allItems
+                                 currentItemIndex:(NSUInteger)currentItemIndex
+                                            error:(NSError **)error
 {
   @throw [[FBErrorBuilder.builder withDescription:@"Override this method in subclasses"] build];
   return nil;
@@ -41,84 +44,40 @@
 
 @implementation FBBaseGestureItem
 
-- (CGPoint)fixedHitPointWith:(CGPoint)hitPoint forSnapshot:(id<FBXCElementSnapshot>)snapshot
+- (nullable XCUICoordinate *)hitpointWithElement:(nullable XCUIElement *)element
+                                  positionOffset:(nullable NSValue *)positionOffset
+                                           error:(NSError **)error
 {
-  UIInterfaceOrientation interfaceOrientation = self.application.interfaceOrientation;
-  if (interfaceOrientation == UIInterfaceOrientationPortrait) {
-    // There is no need to recalculate anything for portrait orientation
-    return hitPoint;
-  }
-  CGRect appFrame = self.application.frame;
-  if (@available(iOS 13.0, *)) {
-    // For Xcode11 it is always necessary to adjust the tap point coordinates
-    return FBInvertPointForApplication(hitPoint, appFrame.size, interfaceOrientation);
-  }
-  NSArray<id<FBXCElementSnapshot>> *ancestors = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_ancestors;
-  id<FBXCElementSnapshot> parentWindow = ancestors.count > 1 ? [ancestors objectAtIndex:ancestors.count - 2] : nil;
-  CGRect parentWindowFrame = nil == parentWindow ? snapshot.frame : parentWindow.frame;
-  if ((appFrame.size.height > appFrame.size.width && parentWindowFrame.size.height < parentWindowFrame.size.width) ||
-      (appFrame.size.height < appFrame.size.width && parentWindowFrame.size.height > parentWindowFrame.size.width)) {
-    /*
-     This is the indication of the fact that transformation is broken and coordinates should be
-     recalculated manually.
-     However, upside-down case cannot be covered this way, which is not important for Appium
-     */
-    return FBInvertPointForApplication(hitPoint, appFrame.size, interfaceOrientation);
-  }
-  return hitPoint;
-}
-
-- (nullable NSValue *)hitpointWithElement:(nullable XCUIElement *)element positionOffset:(nullable NSValue *)positionOffset error:(NSError **)error
-{
-  CGPoint hitPoint;
   if (nil == element) {
+    CGVector offset = CGVectorMake(positionOffset.CGPointValue.x, positionOffset.CGPointValue.y);
     // Only absolute offset is defined
-    hitPoint = [positionOffset CGPointValue];
-    if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.0")) {
-      /*
-       Since iOS 10.0 XCTest has a bug when it always returns portrait coordinates for UI elements
-       even if the device is not in portait mode. That is why we need to recalculate them manually
-       based on the current orientation value
-       */
-      hitPoint = FBInvertPointForApplication(hitPoint, self.application.frame.size, self.application.interfaceOrientation);
-    }
-  } else {
-    // The offset relative to the element is defined
-
-    id<FBXCElementSnapshot> snapshot = element.fb_isResolvedFromCache.boolValue
-      ? element.lastSnapshot
-      : element.fb_takeSnapshot;
-    if (nil == positionOffset) {
-      NSValue *hitPointValue = [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_hitPoint;
-      if (nil != hitPointValue) {
-        // short circuit element hitpoint
-        return hitPointValue;
-      }
-      [FBLogger logFmt:@"Will use the frame of '%@' for hit point calculation instead", element.debugDescription];
-    }
-    CGRect visibleFrame = snapshot.visibleFrame;
-    CGRect frame = CGRectIsEmpty(visibleFrame) ? element.frame : visibleFrame;
-    if (CGRectIsEmpty(frame)) {
-      [FBLogger log:self.application.fb_descriptionRepresentation];
-      NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable", element.description];
-      if (error) {
-        *error = [[FBErrorBuilder.builder withDescription:description] build];
-      }
-      return nil;
+    return [[self.application coordinateWithNormalizedOffset:CGVectorMake(0, 0)] coordinateWithOffset:offset];
+  }
+
+  // The offset relative to the element is defined
+  if (nil == positionOffset) {
+    if (element.hittable) {
+      // short circuit element hitpoint
+      return element.hitPointCoordinate;
     }
-    if (nil == positionOffset) {
-      hitPoint = CGPointMake(frame.origin.x + frame.size.width / 2,
-                             frame.origin.y + frame.size.height / 2);
-    } else {
-      CGPoint origin = frame.origin;
-      hitPoint = CGPointMake(origin.x, origin.y);
-      CGPoint offsetValue = [positionOffset CGPointValue];
-      hitPoint = CGPointMake(hitPoint.x + offsetValue.x, hitPoint.y + offsetValue.y);
-      // TODO: Shall we throw an exception if hitPoint is out of the element frame?
+    [FBLogger logFmt:@"Will use the frame of '%@' for hit point calculation instead", element.debugDescription];
+  }
+  if (CGRectIsEmpty(element.frame)) {
+    [FBLogger log:self.application.fb_descriptionRepresentation];
+    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable",
+                             element.description];
+    if (error) {
+      *error = [[FBErrorBuilder.builder withDescription:description] build];
     }
-    hitPoint = [self fixedHitPointWith:hitPoint forSnapshot:snapshot];
+    return nil;
   }
-  return [NSValue valueWithCGPoint:hitPoint];
+  if (nil == positionOffset) {
+    return [element coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.5)];
+  }
+
+  CGVector offset = CGVectorMake(positionOffset.CGPointValue.x, positionOffset.CGPointValue.y);
+  // TODO: Shall we throw an exception if hitPoint is out of the element frame?
+  return [[element coordinateWithNormalizedOffset:CGVectorMake(0, 0)] coordinateWithOffset:offset];
 }
 
 @end
@@ -179,7 +138,10 @@
 
 @implementation FBBaseActionsSynthesizer
 
-- (instancetype)initWithActions:(NSArray *)actions forApplication:(XCUIApplication *)application elementCache:(nullable FBElementCache *)elementCache error:(NSError **)error
+- (instancetype)initWithActions:(NSArray *)actions
+                 forApplication:(XCUIApplication *)application
+                   elementCache:(nullable FBElementCache *)elementCache
+                          error:(NSError **)error
 {
   self = [super init];
   if (self) {

package/WebDriverAgentLib/Utilities/FBKeyboard.m

@@ -63,8 +63,7 @@
     }];
     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);
+    return firstKey.exists && firstKey.hittable;
   };
   NSString* errMessage = @"The on-screen keyboard must be present to send keys";
   if (timeout <= 0) {

package/WebDriverAgentLib/Utilities/FBMathUtils.h

@@ -32,12 +32,6 @@ BOOL FBSizeFuzzyEqualToSize(CGSize size1, CGSize size2, CGFloat threshold);
 BOOL FBRectFuzzyEqualToRect(CGRect rect1, CGRect rect2, CGFloat threshold);
 
 #if !TARGET_OS_TV
-/*! Inverts point if necessary to match location on screen */
-CGPoint FBInvertPointForApplication(CGPoint point, CGSize screenSize, UIInterfaceOrientation orientation);
-
-/*! Inverts offset if necessary to match screen orientation */
-CGPoint FBInvertOffsetForOrientation(CGPoint offset, UIInterfaceOrientation orientation);
-
 /*! Inverts size if necessary to match current screen orientation */
 CGSize FBAdjustDimensionsForApplication(CGSize actualSize, UIInterfaceOrientation orientation);
 #endif

package/WebDriverAgentLib/Utilities/FBMathUtils.m

@@ -46,35 +46,6 @@ BOOL FBRectFuzzyEqualToRect(CGRect rect1, CGRect rect2, CGFloat threshold)
 }
 
 #if !TARGET_OS_TV
-CGPoint FBInvertPointForApplication(CGPoint point, CGSize screenSize, UIInterfaceOrientation orientation)
-{
-  switch (orientation) {
-    case UIInterfaceOrientationUnknown:
-    case UIInterfaceOrientationPortrait:
-      return point;
-    case UIInterfaceOrientationPortraitUpsideDown:
-      return CGPointMake(screenSize.width - point.x, screenSize.height - point.y);
-    case UIInterfaceOrientationLandscapeLeft:
-      return CGPointMake(point.y, MAX(screenSize.width, screenSize.height) - point.x);
-    case UIInterfaceOrientationLandscapeRight:
-      return CGPointMake(MIN(screenSize.width, screenSize.height) - point.y, point.x);
-  }
-}
-
-CGPoint FBInvertOffsetForOrientation(CGPoint offset, UIInterfaceOrientation orientation)
-{
-  switch (orientation) {
-    case UIInterfaceOrientationUnknown:
-    case UIInterfaceOrientationPortrait:
-      return offset;
-    case UIInterfaceOrientationPortraitUpsideDown:
-      return CGPointMake(-offset.x, -offset.y);
-    case UIInterfaceOrientationLandscapeLeft:
-      return CGPointMake(offset.y, -offset.x);
-    case UIInterfaceOrientationLandscapeRight:
-      return CGPointMake(-offset.y, offset.x);
-  }
-}
 
 CGSize FBAdjustDimensionsForApplication(CGSize actualSize, UIInterfaceOrientation orientation)
 {

package/WebDriverAgentLib/Utilities/FBScreen.m

@@ -22,17 +22,10 @@
 
 + (CGSize)statusBarSizeForApplication:(XCUIApplication *)application
 {
-  XCUIApplication *app = application;
-  BOOL expectVisibleBar = YES;
-
+  XCUIApplication *app = FBApplication.fb_systemApplication;
   // Since iOS 13 the status bar is no longer part of the application, it’s part of the SpringBoard
-  if (@available(iOS 13.0, *)) {
-    app = FBApplication.fb_systemApplication;
-    expectVisibleBar = NO;
-  }
-
   XCUIElement *mainStatusBar = app.statusBars.allElementsBoundByIndex.firstObject;
-  if (!mainStatusBar || (expectVisibleBar && !mainStatusBar.fb_isVisible)) {
+  if (nil == mainStatusBar) {
     return CGSizeZero;
   }
   CGSize result = mainStatusBar.frame.size;

package/WebDriverAgentLib/Utilities/FBScreenshot.m

@@ -228,7 +228,6 @@ NSString *formatTimeInterval(NSTimeInterval interval) {
                                    compressionQuality:(CGFloat)compressionQuality
                                                 error:(NSError **)error
 {
-  // TODO: Use native accessors after we drop the support of Xcode 12.4 and below
   Class imageEncodingClass = NSClassFromString(@"XCTImageEncoding");
   if (nil == imageEncodingClass) {
     [[[FBErrorBuilder builder]

package/WebDriverAgentLib/Utilities/FBW3CActionsSynthesizer.m

@@ -133,16 +133,16 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
       return nil;
     }
     self.duration = durationObj.doubleValue;
-    NSValue *position = [self positionWithError:error];
+    XCUICoordinate *position = [self positionWithError:error];
     if (nil == position) {
       return nil;
     }
-    self.atPosition = [position CGPointValue];
+    self.atPosition = position;
   }
   return self;
 }
 
-- (nullable NSValue *)positionWithError:(NSError **)error
+- (nullable XCUICoordinate *)positionWithError:(NSError **)error
 {
   if (nil == self.previousItem) {
     NSString *errorDescription = [NSString stringWithFormat:@"The '%@' action item must be preceded by %@ item", self.actionItem, FB_ACTION_ITEM_TYPE_POINTER_MOVE];
@@ -151,39 +151,32 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
     return nil;
   }
-  return [NSValue valueWithCGPoint:self.previousItem.atPosition];
+  return self.previousItem.atPosition;
 }
 
-- (nullable NSValue *)hitpointWithElement:(nullable XCUIElement *)element
-                           positionOffset:(nullable NSValue *)positionOffset
-                                    error:(NSError **)error
+- (nullable XCUICoordinate *)hitpointWithElement:(nullable XCUIElement *)element
+                                  positionOffset:(nullable NSValue *)positionOffset
+                                           error:(NSError **)error
 {
   if (nil == element || nil == positionOffset) {
     return [super hitpointWithElement:element positionOffset:positionOffset error:error];
   }
 
   // An offset relative to the element is defined
-  id<FBXCElementSnapshot> snapshot = element.fb_isResolvedFromCache.boolValue
-    ? element.lastSnapshot
-    : element.fb_takeSnapshot;
-  CGRect frame = snapshot.frame;
-  if (CGRectIsEmpty(frame)) {
+  if (CGRectIsEmpty(element.frame)) {
     [FBLogger log:self.application.fb_descriptionRepresentation];
-    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable", [FBXCElementSnapshotWrapper ensureWrapped:snapshot].fb_description];
+    NSString *description = [NSString stringWithFormat:@"The element '%@' is not visible on the screen and thus is not interactable",
+                             element.description];
     if (error) {
       *error = [[FBErrorBuilder.builder withDescription:description] build];
     }
     return nil;
   }
-  CGRect visibleFrame = snapshot.visibleFrame;
-  frame = CGRectIsEmpty(visibleFrame) ? frame : visibleFrame;
+
   // W3C standard requires that relative element coordinates start at the center of the element's rectangle
-  CGPoint hitPoint = CGPointMake(frame.origin.x + frame.size.width / 2, frame.origin.y + frame.size.height / 2);
-  CGPoint offsetValue = [positionOffset CGPointValue];
-  hitPoint = CGPointMake(hitPoint.x + offsetValue.x, hitPoint.y + offsetValue.y);
+  CGVector offset = CGVectorMake(positionOffset.CGPointValue.x, positionOffset.CGPointValue.y);
   // TODO: Shall we throw an exception if hitPoint is out of the element frame?
-  hitPoint = [self fixedHitPointWith:hitPoint forSnapshot:snapshot];
-  return [NSValue valueWithCGPoint:hitPoint];
+  return [[element coordinateWithNormalizedOffset:CGVectorMake(0.5, 0.5)] coordinateWithOffset:offset];
 }
 
 @end
@@ -220,7 +213,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
   }
   if (nil == self.pressure) {
-    XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition
+    XCPointerEventPath *result = [[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
                                                                           offset:FBMillisToSeconds(self.offset)];
     return @[result];
   }
@@ -247,7 +240,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
 
 @implementation FBPointerMoveItem
 
-- (nullable NSValue *)positionWithError:(NSError **)error
+- (nullable XCUICoordinate *)positionWithError:(NSError **)error
 {
   static NSArray<NSString *> *supportedOriginTypes;
   static dispatch_once_t onceToken;
@@ -295,12 +288,9 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
     }
     return nil;
   }
-  CGPoint recentPosition = self.previousItem.atPosition;
-  CGPoint offsetRelativeToRecentPosition = (nil == x && nil == y) ? CGPointMake(0.0, 0.0) : CGPointMake(x.floatValue, y.floatValue);
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.0")) {
-    offsetRelativeToRecentPosition = FBInvertOffsetForOrientation(offsetRelativeToRecentPosition, self.application.interfaceOrientation);
-  }
-  return [NSValue valueWithCGPoint:CGPointMake(recentPosition.x + offsetRelativeToRecentPosition.x, recentPosition.y + offsetRelativeToRecentPosition.y)];
+  XCUICoordinate *recentPosition = self.previousItem.atPosition;
+  CGVector offsetRelativeToRecentPosition = (nil == x && nil == y) ? CGVectorMake(0, 0) : CGVectorMake(x.floatValue, y.floatValue);
+  return [recentPosition coordinateWithOffset:offsetRelativeToRecentPosition];
 }
 
 + (NSString *)actionName
@@ -314,9 +304,11 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
                                             error:(NSError **)error
 {
   if (nil == eventPath) {
-    return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition offset:FBMillisToSeconds(self.offset + self.duration)]];
+    return @[[[XCPointerEventPath alloc] initForTouchAtPoint:self.atPosition.screenPoint
+                                                      offset:FBMillisToSeconds(self.offset + self.duration)]];
   }
-  [eventPath moveToPoint:self.atPosition atOffset:FBMillisToSeconds(self.offset + self.duration)];
+  [eventPath moveToPoint:self.atPosition.screenPoint
+                atOffset:FBMillisToSeconds(self.offset + self.duration)];
   return @[];
 }
 
@@ -890,7 +882,7 @@ static NSString *const FB_KEY_ACTIONS = @"actions";
 {
   XCSynthesizedEventRecord *eventRecord = [[XCSynthesizedEventRecord alloc]
                                            initWithName:@"W3C Touch Action"
-                                           interfaceOrientation:[FBXCTestDaemonsProxy orientationWithApplication:self.application]];
+                                           interfaceOrientation:self.application.interfaceOrientation];
   NSMutableDictionary<NSString *, NSDictionary<NSString *, id> *> *actionsMapping = [NSMutableDictionary new];
   NSMutableArray<NSString *> *actionIds = [NSMutableArray new];
   for (NSDictionary<NSString *, id> *action in self.actions) {

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.h

@@ -23,10 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (id<XCTestManager_ManagerInterface>)testRunnerProxy;
 
-#if !TARGET_OS_TV
-+ (UIInterfaceOrientation)orientationWithApplication:(XCUIApplication *)application;
-#endif
-
 + (BOOL)synthesizeEventWithRecord:(XCSynthesizedEventRecord *)record
                             error:(NSError *__autoreleasing*)error;
 

package/WebDriverAgentLib/Utilities/FBXCTestDaemonsProxy.m

@@ -30,7 +30,6 @@ static dispatch_once_t onceTestRunnerDaemonClass;
 
 + (void)load
 {
-  // XCTRunnerDaemonSession class is only available since Xcode 8.3
   dispatch_once(&onceTestRunnerDaemonClass, ^{
     FBXCTRunnerDaemonSessionClass = objc_lookUpClass("XCTRunnerDaemonSession");
   });
@@ -60,17 +59,6 @@ static dispatch_once_t onceTestRunnerDaemonClass;
   return ((XCTRunnerDaemonSession *)[FBXCTRunnerDaemonSessionClass sharedSession]).daemonProxy;
 }
 
-#if !TARGET_OS_TV
-+ (UIInterfaceOrientation)orientationWithApplication:(XCUIApplication *)application
-{
-  if (nil == FBXCTRunnerDaemonSessionClass ||
-      [[FBXCTRunnerDaemonSessionClass sharedSession] useLegacyEventCoordinateTransformationPath]) {
-    return application.interfaceOrientation;
-  }
-  return UIInterfaceOrientationPortrait;
-}
-#endif
-
 + (BOOL)synthesizeEventWithRecord:(XCSynthesizedEventRecord *)record error:(NSError *__autoreleasing*)error
 {
   __block BOOL didSucceed = NO;

package/WebDriverAgentTests/IntegrationTests/FBAppiumTouchActionsIntegrationTests.m

@@ -194,14 +194,6 @@
 
 - (void)testDoubleTap
 {
-  if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad &&
-      SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // "tap the element" does not work on iPadOS simulator after change the rotation in iOS 15
-    // while selecting the element worked. (I confirmed with getting an element screenshot that
-    // the FBShowAlertButtonName was actually selected after changing the orientation.)
-    return;
-  }
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"tap",
@@ -214,16 +206,8 @@
   [self verifyGesture:gesture orientation:UIDeviceOrientationLandscapeLeft];
 }
 
-// TODO: UIDeviceOrientationLandscapeRight is not so good in iOS 16? (Especially simulators)
 - (void)testPress
 {
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // Does not work on iOS 15.0.
-    // The same action tap the FBShowAlertButtonName after rotating the screen
-    // worked with W3C actions. `.click` action did not work.
-    return;
-  }
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"action": @"press",

package/WebDriverAgentTests/IntegrationTests/FBW3CTouchActionsIntegrationTests.m

@@ -294,18 +294,8 @@
   [self verifyGesture:gesture orientation:UIDeviceOrientationPortrait];
 }
 
-// TODO: UIDeviceOrientationLandscapeLeft did not work in iOS 16 simumlator.
-// UIDeviceOrientationPortrait was ok.
 - (void)testDoubleTap
 {
-  if ([UIDevice.currentDevice userInterfaceIdiom] == UIUserInterfaceIdiomPad &&
-      SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // "tap the element" does not work on iPadOS simulator after change the rotation in iOS 15
-    // while selecting the element worked. (I confirmed with getting an element screenshot that
-    // the FBShowAlertButtonName was actually selected after changing the orientation.)
-    return;
-  }
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"type": @"pointer",
@@ -326,17 +316,8 @@
   [self verifyGesture:gesture orientation:UIDeviceOrientationLandscapeLeft];
 }
 
-// TODO: UIDeviceOrientationLandscapeRight did not work in iOS 16 simumlator.
-// UIDeviceOrientationPortrait was ok.
 - (void)testLongPressWithCombinedPause
 {
-  if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"15.0")) {
-    // Xcode 13 x iOS 14 also does not work while Xcode 12.5 x iOS 14 worked.
-    // Skip this test for iOS 15 since iOS 15 works with Xcode 13 at least.
-    return;
-  }
-
-
   NSArray<NSDictionary<NSString *, id> *> *gesture =
   @[@{
       @"type": @"pointer",

package/WebDriverAgentTests/UnitTests/FBMathUtilsTests.m

@@ -98,18 +98,6 @@
   XCTAssertFalse(FBRectFuzzyEqualToRect(referenceRect, CGRectMake(-1, -1, 1, 1), 1));
 }
 
-
-- (void)testPointInvertion
-{
-  const CGPoint testPoint = CGPointMake(1, 2);
-  const CGSize screenSize = CGSizeMake(10, 15);
-  const CGFloat t = FBDefaultFrameFuzzyThreshold;
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(1, 2), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationPortrait), t));
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(9, 13), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationPortraitUpsideDown), t));
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(2, 14), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationLandscapeLeft), t));
-  XCTAssertTrue(FBPointFuzzyEqualToPoint(CGPointMake(8, 1), FBInvertPointForApplication(testPoint, screenSize, UIInterfaceOrientationLandscapeRight), t));
-}
-
 - (void)testSizeInversion
 {
   const CGSize screenSizePortrait = CGSizeMake(10, 15);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "4.15.1",
+  "version": "5.1.0",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "scripts": {