appium-webdriveragent 16.12.3 → 16.12.5

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [16.12.5](https://github.com/appium/WebDriverAgent/compare/v16.12.4...v16.12.5) (2026-09-07)
+
+### Bug Fixes
+
+* touch and scroll related view issue in IntegrationApp ([#1253](https://github.com/appium/WebDriverAgent/issues/1253)) ([34859e9](https://github.com/appium/WebDriverAgent/commit/34859e9b443c184505206576b3b531d85d2afbcf))
+
+## [16.12.4](https://github.com/appium/WebDriverAgent/compare/v16.12.3...v16.12.4) (2026-09-06)
+
+### Miscellaneous Chores
+
+* add coordinate screen in the integration app ([#1251](https://github.com/appium/WebDriverAgent/issues/1251)) ([de6acac](https://github.com/appium/WebDriverAgent/commit/de6acac7ebbaf70915f0c09093e3a12623efcea2))
+
 ## [16.12.3](https://github.com/appium/WebDriverAgent/compare/v16.12.2...v16.12.3) (2026-09-04)
 
 ### Bug Fixes

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -932,6 +932,7 @@
 		BEA2FA45BED17FE03010FECD /* FBFindElementCommands.h in Headers */ = {isa = PBXBuildFile; fileRef = EE9AB7581CAEDF0C008C271F /* FBFindElementCommands.h */; };
 		BF9B191D841681A571BAFED1 /* _XCTestObservationPrivate-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = C840A8703A7C8D48897E158A /* _XCTestObservationPrivate-Protocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		BFF5D9B9446DD542E5D6017D /* XCTTagSelection.h in Headers */ = {isa = PBXBuildFile; fileRef = 8E2092D85A7C691F157B1971 /* XCTTagSelection.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		C01249000000000000000003 /* FBCoordinateProbeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C01249000000000000000002 /* FBCoordinateProbeViewController.m */; };
 		C040AE5F2E3B934E8EEAEE0F /* XCUIApplicationProcessDelegate-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 43FCB89739438814F43BCA24 /* XCUIApplicationProcessDelegate-Protocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C07F140AF96143A0A5CAA2B0 /* XCTestCaseDiscoveryUIAutomationDelegate-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = E29888B75A756D1CCD21604C /* XCTestCaseDiscoveryUIAutomationDelegate-Protocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		C1414C29C836902466C4D6DB /* XCTestCastMethodNamesUIAutomationDelegate-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = A80A1C12FA9899367D316E8C /* XCTestCastMethodNamesUIAutomationDelegate-Protocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1269,6 +1270,10 @@
 		FEC3A97A4929115A192F947A /* XCUIDeviceEventAndStateInterface-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 003AAAB9CB5FB38E45E05F6F /* XCUIDeviceEventAndStateInterface-Protocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		FFA7672B731B57AB9283DD40 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; };
 		FFD70914E6D8CE5D4FED4B69 /* XCUIAXNotificationHandling-Protocol.h in Headers */ = {isa = PBXBuildFile; fileRef = EA96C2FEDE73CB5148BA4949 /* XCUIAXNotificationHandling-Protocol.h */; };
+		6C07E44E139D41D6BA092F39 /* FBTouchableViewTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D04760558C64B8EB69380E0 /* FBTouchableViewTests.m */; };
+		C15E49E6B6924191BAAD9FDF /* FBIntegrationAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 27B518E261C14E29B943AB9B /* FBIntegrationAppTests.m */; };
+		81E462B8A75F497CBFC6FD8B /* TouchableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 315A15002518CB8700A3A064 /* TouchableView.m */; };
+		B6DE70BFF27148BDAC72F80C /* TouchSpotView.m in Sources */ = {isa = PBXBuildFile; fileRef = 315A15062518CC2800A3A064 /* TouchSpotView.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -1748,6 +1753,8 @@
 		B8A163261EFA440E42CA6AC1 /* XCTRunnerDaemonSessionUIAutomationDelegate-Protocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "XCTRunnerDaemonSessionUIAutomationDelegate-Protocol.h"; sourceTree = "<group>"; };
 		B98A9F937EF98D6359FCCC7A /* XCTRuntimeIssueDetectionPolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = XCTRuntimeIssueDetectionPolicy.h; sourceTree = "<group>"; };
 		BCED63DFD03326F6351165FE /* WDAFindIntegrationTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WDAFindIntegrationTests.swift; sourceTree = "<group>"; };
+		C01249000000000000000001 /* FBCoordinateProbeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBCoordinateProbeViewController.h; sourceTree = "<group>"; };
+		C01249000000000000000002 /* FBCoordinateProbeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBCoordinateProbeViewController.m; sourceTree = "<group>"; };
 		C840A8703A7C8D48897E158A /* _XCTestObservationPrivate-Protocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "_XCTestObservationPrivate-Protocol.h"; sourceTree = "<group>"; };
 		C878996F07A9B26E66FC4EAC /* WDAClickIntegrationTests.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = WDAClickIntegrationTests.swift; sourceTree = "<group>"; };
 		C8FB547322D3949C00B69954 /* LSApplicationWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSApplicationWorkspace.h; sourceTree = "<group>"; };
@@ -1959,6 +1966,8 @@
 		FCD1815F2BF21CA0936B04E1 /* XCTMessagingRole_SiriAutomation-Protocol.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "XCTMessagingRole_SiriAutomation-Protocol.h"; sourceTree = "<group>"; };
 		FDB15E393EA0850C004D26B2 /* XCTScreenCapturePolicy.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = XCTScreenCapturePolicy.h; sourceTree = "<group>"; };
 		FF8E3B470FC9639D5F18E2EA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		1D04760558C64B8EB69380E0 /* FBTouchableViewTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBTouchableViewTests.m; sourceTree = "<group>"; };
+		27B518E261C14E29B943AB9B /* FBIntegrationAppTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBIntegrationAppTests.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -2629,6 +2638,7 @@
 		EE9B76541CF7987300275851 /* IntegrationTests */ = {
 			isa = PBXGroup;
 			children = (
+				27B518E261C14E29B943AB9B /* FBIntegrationAppTests.m */,
 				EE9B76991CF799F400275851 /* FBAlertTests.m */,
 				719CD8FE2126C90200C7D0C2 /* FBAutoAlertsHandlerTests.m */,
 				EE26409C1D0EBA25009BE6B0 /* FBElementAttributeTests.m */,
@@ -2672,6 +2682,7 @@
 		EE9B76561CF7987300275851 /* UnitTests */ = {
 			isa = PBXGroup;
 			children = (
+				1D04760558C64B8EB69380E0 /* FBTouchableViewTests.m */,
 				ADBC39951D07840300327304 /* Doubles */,
 				71A7EAFB1E229302001DA4F2 /* FBClassChainTests.m */,
 				EEE16E961D33A25500172525 /* FBConfigurationTests.m */,
@@ -2732,6 +2743,8 @@
 				EE55B3231D1D5388003AAAEC /* FBTableDataSource.m */,
 				EE9B76841CF7997600275851 /* ViewController.h */,
 				EE9B76851CF7997600275851 /* ViewController.m */,
+				C01249000000000000000001 /* FBCoordinateProbeViewController.h */,
+				C01249000000000000000002 /* FBCoordinateProbeViewController.m */,
 				315A14FF2518CB8700A3A064 /* TouchableView.h */,
 				315A15002518CB8700A3A064 /* TouchableView.m */,
 				315A15052518CC2800A3A064 /* TouchSpotView.h */,
@@ -4809,6 +4822,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				B6DE70BFF27148BDAC72F80C /* TouchSpotView.m in Sources */,
+				81E462B8A75F497CBFC6FD8B /* TouchableView.m in Sources */,
+				6C07E44E139D41D6BA092F39 /* FBTouchableViewTests.m in Sources */,
 				713352FD26CEF31D00523CBC /* FBLRUCacheTests.m in Sources */,
 				EE3F8CFE1D08AA17006F02CE /* FBRunLoopSpinnerTests.m in Sources */,
 				A09D847635CA4C155583B967 /* FBXCAXClientProxyTests.m in Sources */,
@@ -4851,6 +4867,7 @@
 				315A15072518CC2800A3A064 /* TouchSpotView.m in Sources */,
 				EE9B76911CF7997600275851 /* main.m in Sources */,
 				EE9B768F1CF7997600275851 /* ViewController.m in Sources */,
+				C01249000000000000000003 /* FBCoordinateProbeViewController.m in Sources */,
 				315A15012518CB8700A3A064 /* TouchableView.m in Sources */,
 				315A150A2518D6F400A3A064 /* TouchViewController.m in Sources */,
 				ADDA07241D6BB2BF001700AC /* FBScrollViewController.m in Sources */,
@@ -4863,6 +4880,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C15E49E6B6924191BAAD9FDF /* FBIntegrationAppTests.m in Sources */,
 				EE26409D1D0EBA25009BE6B0 /* FBElementAttributeTests.m in Sources */,
 				7119E1EC1E891F8600D0B125 /* FBPickerWheelSelectTests.m in Sources */,
 				71ACF5B8242F2FDC00F0AAD4 /* FBSafariAlertTests.m in Sources */,

package/WebDriverAgent.xcodeproj/xcshareddata/xcschemes/IntegrationApp_watchOS.xcscheme

@@ -46,6 +46,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9D6B02D8FC050BAF7159284F"
             BuildableName = "IntegrationApp_watchOS.app"
+            BlueprintName = "IntegrationApp_watchOS"
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -62,6 +63,7 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "9D6B02D8FC050BAF7159284F"
             BuildableName = "IntegrationApp_watchOS.app"
+            BlueprintName = "IntegrationApp_watchOS"
             ReferencedContainer = "container:WebDriverAgent.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

package/WebDriverAgentLib/Info.plist

@@ -15,11 +15,11 @@
     <key>CFBundlePackageType</key>
     <string>FMWK</string>
     <key>CFBundleShortVersionString</key>
-    <string>16.12.3</string>
+    <string>16.12.5</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>16.12.3</string>
+    <string>16.12.5</string>
     <key>NSPrincipalClass</key>
     <string/>
   </dict>

package/WebDriverAgentTests/IntegrationApp/COORDINATE_PROBE.md

@@ -0,0 +1,50 @@
+# Coordinate probe
+
+Open **Coordinate Probe** below **DeepHierarchy** on the IntegrationApp home screen.
+Use the standard Back button to return to the existing fixtures. Opening the probe
+creates a fresh measurement session.
+
+The **Touch** canvas records actual `UITouch.locationInView:` coordinates rather
+than assuming that a gesture succeeded because it hit a large button. **Scroll**
+shows 80 numbered rows, each 44 points high.
+
+## Automation identifiers
+
+| Identifier | Purpose |
+| --- | --- |
+| `coordinate-probe` | Home screen button that opens the probe |
+| `probe-status` | Label containing the measurement JSON |
+| `coordinate-canvas` | Touch target |
+| `probe-mode` | Touch/Scroll segmented control |
+| `probe-table` | Scrollable table |
+| `probe-row-0` through `probe-row-79` | Individual table rows |
+
+The `probe-status` label exposes `start`, `last`, `phase`, and `count` after a
+touch. `start` and `last` are **canvas-local app points**. It also exposes
+`canvasBounds`, `canvasWindowRect`, `windowSize`, `screenSize`, and `scrollY`.
+Geometry is refreshed when the view lays out, including after rotation or window
+resizing. Touch-related fields are absent before the first touch.
+
+For example, locate `coordinate-probe` by accessibility ID and click it. Then
+locate `coordinate-canvas`, send an element-relative action, and read the JSON
+from `probe-status`. Check that `count` increased and compare `start`/`last` with
+the expected canvas-local point within a suitable tolerance. Derive test offsets
+from the current element rectangle rather than hard-coding a device size.
+
+## Native and compatibility builds
+
+The screen uses the same source for both configurations. Keep the IntegrationApp
+scheme and set the build's `TARGETED_DEVICE_FAMILY`:
+
+- `1,2`: native support for iPhone and iPad (the existing default).
+- `1`: iPhone-only; install on iPad to exercise iPhone compatibility mode.
+
+These are build settings, not a switch within the running app. Verify the actual
+window and element frames before interpreting results. An iPad-native app can
+also run in a resized window; maximize it when testing a full-screen native case.
+For the compatibility case, compare app and SpringBoard window sizes and the
+reported element rectangles with the recorded probe geometry.
+
+If keeping both builds installed at once, give them distinct bundle IDs. This
+change does not add another app target or alter the existing bundle ID or signing
+configuration.

package/WebDriverAgentTests/IntegrationApp/Classes/FBCoordinateProbeViewController.h

@@ -0,0 +1,4 @@
+#import <UIKit/UIKit.h>
+
+@interface FBCoordinateProbeViewController : UIViewController
+@end

package/WebDriverAgentTests/IntegrationApp/Classes/FBCoordinateProbeViewController.m

@@ -0,0 +1,176 @@
+#import "FBCoordinateProbeViewController.h"
+
+@interface FBCoordinateProbeCanvas : UIView
+@property (nonatomic, copy) void (^onTouch)(NSString *phase, CGPoint point);
+@end
+
+@implementation FBCoordinateProbeCanvas
+
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+  self.onTouch(@"began", [touches.anyObject locationInView:self]);
+}
+
+- (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+  self.onTouch(@"moved", [touches.anyObject locationInView:self]);
+}
+
+- (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+  self.onTouch(@"ended", [touches.anyObject locationInView:self]);
+}
+
+- (void)touchesCancelled:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+  self.onTouch(@"cancelled", [touches.anyObject locationInView:self]);
+}
+
+- (void)drawRect:(CGRect)rect
+{
+  CGContextRef context = UIGraphicsGetCurrentContext();
+  CGContextSetStrokeColorWithColor(context, UIColor.whiteColor.CGColor);
+  for (NSInteger i = 1; i < 4; i++) {
+    CGFloat x = CGRectGetWidth(self.bounds) * i / 4.0;
+    CGFloat y = CGRectGetHeight(self.bounds) * i / 4.0;
+    CGContextMoveToPoint(context, x, 0);
+    CGContextAddLineToPoint(context, x, CGRectGetHeight(self.bounds));
+    CGContextMoveToPoint(context, 0, y);
+    CGContextAddLineToPoint(context, CGRectGetWidth(self.bounds), y);
+  }
+  CGContextStrokePath(context);
+}
+
+@end
+
+@interface FBCoordinateProbeViewController () <UITableViewDataSource, UITableViewDelegate>
+@property (nonatomic, strong) UILabel *statusLabel;
+@property (nonatomic, strong) UISegmentedControl *modeControl;
+@property (nonatomic, strong) FBCoordinateProbeCanvas *canvas;
+@property (nonatomic, strong) UITableView *table;
+@property (nonatomic, strong) NSMutableDictionary<NSString *, id> *measurement;
+@property (nonatomic) NSUInteger touchCount;
+@end
+
+@implementation FBCoordinateProbeViewController
+
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  self.title = @"Coordinate Probe";
+  self.view.backgroundColor = UIColor.systemBackgroundColor;
+  self.measurement = [NSMutableDictionary dictionary];
+
+  self.statusLabel = [UILabel new];
+  self.statusLabel.accessibilityIdentifier = @"probe-status";
+  self.statusLabel.font = [UIFont monospacedSystemFontOfSize:10 weight:UIFontWeightRegular];
+  self.statusLabel.numberOfLines = 0;
+  [self.view addSubview:self.statusLabel];
+
+  self.modeControl = [[UISegmentedControl alloc] initWithItems:@[@"Touch", @"Scroll"]];
+  self.modeControl.accessibilityIdentifier = @"probe-mode";
+  self.modeControl.selectedSegmentIndex = 0;
+  [self.modeControl addTarget:self action:@selector(modeChanged) forControlEvents:UIControlEventValueChanged];
+  [self.view addSubview:self.modeControl];
+
+  self.canvas = [FBCoordinateProbeCanvas new];
+  self.canvas.backgroundColor = UIColor.systemBlueColor;
+  self.canvas.isAccessibilityElement = YES;
+  self.canvas.accessibilityIdentifier = @"coordinate-canvas";
+  self.canvas.accessibilityLabel = @"Coordinate canvas";
+  self.canvas.accessibilityTraits = UIAccessibilityTraitAllowsDirectInteraction;
+  self.canvas.contentMode = UIViewContentModeRedraw;
+  __weak typeof(self) weakSelf = self;
+  self.canvas.onTouch = ^(NSString *phase, CGPoint point) {
+    FBCoordinateProbeViewController *controller = weakSelf;
+    if (nil == controller) {
+      return;
+    }
+    if ([phase isEqualToString:@"began"]) {
+      controller.touchCount++;
+      controller.measurement[@"start"] = @[@(point.x), @(point.y)];
+    }
+    controller.measurement[@"last"] = @[@(point.x), @(point.y)];
+    controller.measurement[@"phase"] = phase;
+    controller.measurement[@"count"] = @(controller.touchCount);
+    [controller publishMeasurement];
+  };
+  [self.view addSubview:self.canvas];
+
+  self.table = [[UITableView alloc] initWithFrame:CGRectZero style:UITableViewStylePlain];
+  self.table.accessibilityIdentifier = @"probe-table";
+  self.table.rowHeight = 44;
+  self.table.dataSource = self;
+  self.table.delegate = self;
+  self.table.hidden = YES;
+  [self.view addSubview:self.table];
+}
+
+- (void)viewDidLayoutSubviews
+{
+  [super viewDidLayoutSubviews];
+  // Use the app's actual available area, including navigation bars and resized iPad windows.
+  CGRect safeFrame = self.view.safeAreaLayoutGuide.layoutFrame;
+  CGFloat width = MAX(0, CGRectGetWidth(safeFrame) - 40);
+  CGFloat left = CGRectGetMinX(safeFrame) + 20;
+  CGFloat top = CGRectGetMinY(safeFrame) + 8;
+  self.statusLabel.frame = CGRectMake(left, top, width, 96);
+  self.modeControl.frame = CGRectMake(left, top + 104, width, 30);
+  CGRect contentFrame = CGRectMake(left, top + 146, width,
+                                   MAX(0, CGRectGetMaxY(safeFrame) - top - 166));
+  self.canvas.frame = contentFrame;
+  self.table.frame = contentFrame;
+  [self publishMeasurement];
+}
+
+- (void)publishMeasurement
+{
+  UIWindow *window = self.view.window;
+  if (nil == window) {
+    return;
+  }
+  CGRect bounds = self.canvas.bounds;
+  CGRect frame = [self.canvas convertRect:bounds toView:window];
+  // Touch coordinates are local to the canvas. Window geometry lets tests compare
+  // those measurements with WDA's element rectangles without assuming a screen size.
+  self.measurement[@"canvasBounds"] = @[@(bounds.size.width), @(bounds.size.height)];
+  self.measurement[@"canvasWindowRect"] = @[@(frame.origin.x), @(frame.origin.y),
+                                           @(frame.size.width), @(frame.size.height)];
+  self.measurement[@"windowSize"] = @[@(window.bounds.size.width), @(window.bounds.size.height)];
+  self.measurement[@"screenSize"] = @[@(window.screen.bounds.size.width), @(window.screen.bounds.size.height)];
+  self.measurement[@"scrollY"] = @(self.table.contentOffset.y);
+  NSData *data = [NSJSONSerialization dataWithJSONObject:self.measurement
+                                               options:NSJSONWritingSortedKeys
+                                                 error:nil];
+  self.statusLabel.text = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+}
+
+- (void)modeChanged
+{
+  self.canvas.hidden = self.modeControl.selectedSegmentIndex == 1;
+  self.table.hidden = !self.canvas.hidden;
+  [self publishMeasurement];
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+  return 80;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+  UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"probe-row"];
+  if (nil == cell) {
+    cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"probe-row"];
+  }
+  cell.textLabel.text = [NSString stringWithFormat:@"Probe row %ld", (long)indexPath.row];
+  cell.accessibilityIdentifier = [NSString stringWithFormat:@"probe-row-%ld", (long)indexPath.row];
+  return cell;
+}
+
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView
+{
+  [self publishMeasurement];
+}
+
+@end

package/WebDriverAgentTests/IntegrationApp/Classes/FBScrollViewController.m

@@ -15,6 +15,7 @@ static const CGFloat FBSubviewHeight = 40.0;
 @interface FBScrollViewController ()
 @property (nonatomic, weak) IBOutlet UIScrollView *scrollView;
 @property (nonatomic, strong) IBOutlet FBTableDataSource *dataSource;
+@property (nonatomic, copy) NSArray<UILabel *> *rowLabels;
 @end
 
 @implementation FBScrollViewController
@@ -22,18 +23,30 @@ static const CGFloat FBSubviewHeight = 40.0;
 - (void)viewDidLoad {
   [super viewDidLoad];
   [self setupLabelViews];
-  self.scrollView.contentSize = CGSizeMake(CGRectGetWidth(self.view.frame), self.dataSource.count * FBSubviewHeight);
+}
+
+- (void)viewDidLayoutSubviews
+{
+  [super viewDidLayoutSubviews];
+  CGFloat width = CGRectGetWidth(self.scrollView.bounds);
+  [self.rowLabels enumerateObjectsUsingBlock:^(UILabel *label, NSUInteger index, BOOL *stop) {
+    label.frame = CGRectMake(0, index * FBSubviewHeight, width, FBSubviewHeight);
+  }];
+  self.scrollView.contentSize = CGSizeMake(width, self.rowLabels.count * FBSubviewHeight);
 }
 
 - (void)setupLabelViews
 {
   NSUInteger count = self.dataSource.count;
+  NSMutableArray<UILabel *> *labels = [NSMutableArray arrayWithCapacity:count];
   for (NSInteger i = 0 ; i < count ; i++) {
-    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, i * FBSubviewHeight, CGRectGetWidth(self.view.frame), FBSubviewHeight)];
+    UILabel *label = [UILabel new];
     label.text = [self.dataSource textForElementAtIndex:i];
     label.textAlignment = NSTextAlignmentCenter;
     [self.scrollView addSubview:label];
+    [labels addObject:label];
   }
+  self.rowLabels = labels;
 }
 
 @end

package/WebDriverAgentTests/IntegrationApp/Classes/TouchViewController.h

@@ -11,7 +11,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface TouchViewController : UIViewController
+@interface TouchViewController : UIViewController <TouchableViewDelegate>
 
 @property (weak, nonatomic) IBOutlet TouchableView *touchable;
 @property (weak, nonatomic) IBOutlet UILabel *numberOfTapsLabel;

package/WebDriverAgentTests/IntegrationApp/Classes/TouchableView.h

@@ -21,8 +21,9 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TouchableView : UIView
 
 @property (nonatomic) NSMutableDictionary<NSNumber*, TouchSpotView*> *touchViews;
+// Cumulative completed contacts; cancelled contacts are excluded.
 @property (nonatomic) int numberOFTaps;
-@property (nonatomic) id delegate;
+@property (nonatomic, weak, nullable) id<TouchableViewDelegate> delegate;
 
 @end
 

package/WebDriverAgentTests/IntegrationApp/Classes/TouchableView.m

@@ -34,12 +34,11 @@
 
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
 {
-  self.numberOFTaps += 1;
-  [self.delegate shouldHandleTouchesNumber:(int)touches.count];
   for (UITouch *touch in touches)
   {
     [self createViewForTouch:touch];
   }
+  [self.delegate shouldHandleTouchesNumber:(int)self.touchViews.count];
 }
 
 - (void)touchesMoved:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -56,8 +55,13 @@
 {
   for (UITouch *touch in touches)
   {
+    // Count completed contacts, independently of how UIKit batches callbacks.
+    if ([self viewForTouch:touch] != nil) {
+      self.numberOFTaps += 1;
+    }
     [self removeViewForTouch:touch];
   }
+  [self.delegate shouldHandleTouchesNumber:(int)self.touchViews.count];
   [self.delegate shouldHandleTapsNumber:self.numberOFTaps];
 }
 
@@ -67,6 +71,7 @@
   {
     [self removeViewForTouch:touch];
   }
+  [self.delegate shouldHandleTouchesNumber:(int)self.touchViews.count];
 }
 
 - (void)createViewForTouch:(UITouch *)touch

package/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m

@@ -7,6 +7,7 @@
  */
 
 #import "ViewController.h"
+#import "FBCoordinateProbeViewController.h"
 
 @interface ViewController ()
 @property (weak, nonatomic) IBOutlet UILabel *orentationLabel;
@@ -30,6 +31,11 @@
   self.button.accessibilityCustomActions = @[action1, action2];
 }
 
+- (IBAction)showCoordinateProbe:(id)sender
+{
+  [self.navigationController pushViewController:[FBCoordinateProbeViewController new] animated:NO];
+}
+
 - (BOOL)handleCustomAction:(UIAccessibilityCustomAction *)action
 {
   // Custom action handler - just return YES to indicate success
@@ -57,13 +63,13 @@
   // lay out. This page exists purely as a fixture for exercising element
   // lookups (e.g. class chain locators) against a deep accessibility tree.
   UIViewController *deepHierarchyViewController = [UIViewController new];
-  deepHierarchyViewController.view.backgroundColor = UIColor.whiteColor;
+  deepHierarchyViewController.view.backgroundColor = UIColor.systemBackgroundColor;
   deepHierarchyViewController.view.accessibilityIdentifier = @"DeepHierarchyPage";
 
   NSInteger depth = 70;
   // A plain UILabel sibling, not part of the nested chain below, so the
   // fixture stays recognizable to a human glancing at the simulator instead
-  // of showing a blank white screen.
+  // of showing a blank screen.
   UILabel *titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20, 60, CGRectGetWidth(UIScreen.mainScreen.bounds) - 40, 60)];
   titleLabel.text = [NSString stringWithFormat:@"Deep Hierarchy\n%ld nested elements", (long)depth];
   titleLabel.numberOfLines = 2;

package/WebDriverAgentTests/IntegrationApp/Info.plist

@@ -30,8 +30,6 @@
 	<string>Yo Yo</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Yo Yo</string>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -49,6 +47,8 @@
 			</array>
 		</dict>
 	</dict>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

package/WebDriverAgentTests/IntegrationApp/Resources/Base.lproj/Main.storyboard

@@ -4,6 +4,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -83,8 +84,19 @@
                                     <action selector="goToDeepHierarchy:" destination="BYZ-38-t0r" eventType="touchUpInside" id="dHi-03-Act"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cPr-01-Btn">
+                                <rect key="frame" x="139" y="418" width="136" height="30"/>
+                                <accessibility key="accessibilityConfiguration" identifier="coordinate-probe"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="cPr-02-Hgt"/>
+                                </constraints>
+                                <state key="normal" title="Coordinate Probe"/>
+                                <connections>
+                                    <action selector="showCoordinateProbe:" destination="BYZ-38-t0r" eventType="touchUpInside" id="cPr-03-Act"/>
+                                </connections>
+                            </button>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <accessibility key="accessibilityConfiguration" label="MainView"/>
                         <constraints>
                             <constraint firstItem="YgP-SF-TkS" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="41Q-cm-l5K"/>
@@ -101,6 +113,8 @@
                             <constraint firstItem="M2N-Yn-ytb" firstAttribute="top" secondItem="YgP-SF-TkS" secondAttribute="bottom" constant="8" id="tMN-gl-smg"/>
                             <constraint firstItem="dHi-01-Btn" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="dHi-04-Cnt"/>
                             <constraint firstItem="dHi-01-Btn" firstAttribute="top" secondItem="1Ht-AF-MGW" secondAttribute="bottom" constant="8" id="dHi-05-Top"/>
+                            <constraint firstItem="cPr-01-Btn" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="cPr-04-Cnt"/>
+                            <constraint firstItem="cPr-01-Btn" firstAttribute="top" secondItem="dHi-01-Btn" secondAttribute="bottom" constant="8" id="cPr-05-Top"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="dmu-Fe-aoT"/>
@@ -129,7 +143,7 @@
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <accessibility key="accessibilityConfiguration" identifier="touchableView"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" secondItem="C6B-Wo-jWm" secondAttribute="height" multiplier="288:269" id="LeW-u7-tWl"/>
+                                    <constraint firstAttribute="width" secondItem="C6B-Wo-jWm" secondAttribute="height" multiplier="288:269" priority="749" id="LeW-u7-tWl"/>
                                 </constraints>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Taps" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IV8-Ak-Z8e">
@@ -147,17 +161,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
+                        <viewLayoutGuide key="safeArea" id="tch-sa-Area"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="C6B-Wo-jWm" firstAttribute="top" secondItem="gEY-Ha-hqz" secondAttribute="bottom" constant="8" id="1PW-tn-oTF"/>
-                            <constraint firstAttribute="trailing" secondItem="IV8-Ak-Z8e" secondAttribute="trailing" constant="144" id="5Tn-XG-5OD"/>
-                            <constraint firstAttribute="trailing" secondItem="Q4X-EY-aSL" secondAttribute="trailing" constant="130" id="6Rr-L0-eoR"/>
-                            <constraint firstItem="IV8-Ak-Z8e" firstAttribute="firstBaseline" secondItem="C6B-Wo-jWm" secondAttribute="baseline" constant="24.5" symbolType="layoutAnchor" id="77y-Kf-c0Y"/>
-                            <constraint firstAttribute="trailing" secondItem="C6B-Wo-jWm" secondAttribute="trailing" constant="16" id="CaC-dk-dbo"/>
-                            <constraint firstItem="Q4X-EY-aSL" firstAttribute="leading" secondItem="aEY-AK-0k9" secondAttribute="leading" constant="125" id="Ych-oZ-hmA"/>
-                            <constraint firstItem="Q4X-EY-aSL" firstAttribute="top" secondItem="IV8-Ak-Z8e" secondAttribute="bottom" constant="7.5" id="ktv-kW-VWI"/>
-                            <constraint firstItem="C6B-Wo-jWm" firstAttribute="leading" secondItem="aEY-AK-0k9" secondAttribute="leading" constant="16" id="pI7-Ds-hXG"/>
-                            <constraint firstItem="IV8-Ak-Z8e" firstAttribute="leading" secondItem="aEY-AK-0k9" secondAttribute="leading" constant="139" id="vbu-wn-Qvc"/>
+                            <constraint firstItem="C6B-Wo-jWm" firstAttribute="top" secondItem="tch-sa-Area" secondAttribute="top" constant="8" id="1PW-tn-oTF"/>
+                            <constraint firstItem="C6B-Wo-jWm" firstAttribute="leading" secondItem="tch-sa-Area" secondAttribute="leading" constant="16" id="pI7-Ds-hXG"/>
+                            <constraint firstItem="tch-sa-Area" firstAttribute="trailing" secondItem="C6B-Wo-jWm" secondAttribute="trailing" constant="16" id="CaC-dk-dbo"/>
+                            <constraint firstItem="IV8-Ak-Z8e" firstAttribute="top" secondItem="C6B-Wo-jWm" secondAttribute="bottom" constant="8" id="77y-Kf-c0Y"/>
+                            <constraint firstItem="IV8-Ak-Z8e" firstAttribute="leading" secondItem="C6B-Wo-jWm" secondAttribute="leading" id="vbu-wn-Qvc"/>
+                            <constraint firstItem="IV8-Ak-Z8e" firstAttribute="trailing" secondItem="C6B-Wo-jWm" secondAttribute="trailing" id="5Tn-XG-5OD"/>
+                            <constraint firstItem="Q4X-EY-aSL" firstAttribute="top" secondItem="IV8-Ak-Z8e" secondAttribute="bottom" constant="8" id="ktv-kW-VWI"/>
+                            <constraint firstItem="Q4X-EY-aSL" firstAttribute="leading" secondItem="C6B-Wo-jWm" secondAttribute="leading" id="Ych-oZ-hmA"/>
+                            <constraint firstItem="Q4X-EY-aSL" firstAttribute="trailing" secondItem="C6B-Wo-jWm" secondAttribute="trailing" id="6Rr-L0-eoR"/>
+                            <constraint firstItem="tch-sa-Area" firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="Q4X-EY-aSL" secondAttribute="bottom" constant="8" id="tch-btm-Fit"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="fDl-EC-1lc"/>
@@ -237,7 +253,7 @@
                                     <constraint firstAttribute="height" constant="21" id="VBZ-ac-GvI"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" systemColor="labelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Wim-fT-xNl">
@@ -282,7 +298,7 @@
                                     <constraint firstAttribute="height" constant="21" id="664-Z3-V7W"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" systemColor="labelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="hidden_invisible" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vt6-b1-U0h">
@@ -291,7 +307,7 @@
                                     <constraint firstAttribute="height" constant="21" id="51j-sl-XYd"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" systemColor="labelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GsS-jO-scK">
@@ -319,7 +335,7 @@
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no"/>
                             </textField>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="GsS-jO-scK" firstAttribute="leading" secondItem="Ucg-Ag-VpP" secondAttribute="leadingMargin" constant="154" id="1RA-Fx-3Jh"/>
                             <constraint firstItem="SjL-dx-Zsi" firstAttribute="top" secondItem="U7D-NR-20N" secondAttribute="bottom" constant="8" id="3NW-Hc-tPr"/>
@@ -445,7 +461,7 @@
                                     <constraint firstAttribute="height" constant="21" id="2qA-NT-ddc"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <color key="textColor" systemColor="labelColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Zk-wE-jwj">
@@ -466,7 +482,7 @@
                                 <state key="normal" title="Create Alert (Force Touch)"/>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="3Zk-wE-jwj" firstAttribute="centerX" secondItem="JWE-cA-TW0" secondAttribute="centerX" id="83u-1W-xLt"/>
                             <constraint firstItem="D7g-22-s49" firstAttribute="centerX" secondItem="JWE-cA-TW0" secondAttribute="centerX" id="9nT-k0-9gf"/>
@@ -527,7 +543,7 @@
                                 </connections>
                             </button>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="vYb-QB-vwU" firstAttribute="centerX" secondItem="55R-aH-x4M" secondAttribute="centerX" id="0MT-Eq-8dG"/>
                             <constraint firstItem="vYb-QB-vwU" firstAttribute="top" secondItem="yvD-8P-ibI" secondAttribute="bottom" constant="20" id="c3y-G3-HCj"/>
@@ -548,7 +564,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="jo0-3M-nUd">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" textLabel="2mC-E2-VxB" style="IBUITableViewCellStyleDefault" id="wCs-18-PFf">
                                 <rect key="frame" x="0.0" y="50" width="414" height="44"/>
@@ -561,7 +577,7 @@
                                             <rect key="frame" x="20" y="0.0" width="374" height="44"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="textColor" systemColor="labelColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                     </subviews>
@@ -603,7 +619,7 @@
                                 </userDefinedRuntimeAttributes>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="xEQ-MI-a2g" firstAttribute="top" secondItem="KLL-RT-L40" secondAttribute="top" id="Bep-no-nwg"/>
                             <constraint firstAttribute="trailing" secondItem="xEQ-MI-a2g" secondAttribute="trailing" id="akP-zz-jsv"/>
@@ -624,6 +640,9 @@
         </scene>
     </scenes>
     <resources>
+        <systemColor name="labelColor">
+            <color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

package/WebDriverAgentTests/IntegrationTests/FBConfigurationTests.m

@@ -21,14 +21,10 @@
 
 @implementation FBConfigurationTests
 
-- (void)setUp
+- (void)testReduceMotion
 {
-  [super setUp];
   [self launchApplication];
-}
 
-- (void)testReduceMotion
-{
   BOOL defaultReduceMotionEnabled = FBConfiguration.sharedInstance.reduceMotionEnabled;
 
   FBConfiguration.sharedInstance.reduceMotionEnabled = YES;
@@ -44,6 +40,9 @@
     XCTSkip(@"Deliberately freezes the app for several seconds, too slow/flaky for CI");
   }
 
+  // Launch only after the CI skip so a skipped test cannot time out in app startup.
+  [self launchApplication];
+
   NSTimeInterval previousDeadline = FBConfiguration.sharedInstance.accessibilityDeadline;
   // Also bounds any snapshot-based wait -tap itself may perform once the app is stuck.
   FBConfiguration.sharedInstance.accessibilityDeadline = 3.0;

package/WebDriverAgentTests/IntegrationTests/FBElementVisibilityTests.m

@@ -13,6 +13,7 @@
 #import "FBTestMacros.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBIsVisible.h"
+#import "XCUIElement+FBUtilities.h"
 
 @interface FBElementVisibilityTests : FBIntegrationTestCase
 @end
@@ -26,14 +27,15 @@
   }
   [self launchApplication];
   [self goToSpringBoardFirstPage];
+  [self.springboard fb_waitUntilStable];
 
-  // Check Icons on first screen
-  // Note: Calender app exits 2 (an app icon + a widget) exist on the home screen
-  // on iOS 15+. The firstMatch is for it.
-  XCTAssertTrue(self.springboard.icons[@"Calendar"].firstMatch.fb_isVisible);
-  XCTAssertTrue(self.springboard.icons[@"Reminders"].fb_isVisible);
+  // Calendar can match both its app icon and a widget on iOS 15+.
+  FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Calendar"].firstMatch.fb_isVisible);
+  // Safari is in the dock; Reminders is not reliably visible on the first page
+  // of CI simulators. Wait for the Home transition before checking visibility.
+  FBAssertWaitTillBecomesTrue(self.springboard.icons[@"Safari"].firstMatch.fb_isVisible);
 
-  // Check Icons on second screen screen
+  // Check the fixture icon on another page.
   XCTAssertFalse(self.springboard.icons[@"IntegrationApp"].firstMatch.fb_isVisible);
 }
 

package/WebDriverAgentTests/IntegrationTests/FBIntegrationAppTests.m

@@ -0,0 +1,78 @@
+/**
+ * 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.
+ */
+
+#import "FBIntegrationTestCase.h"
+#import "FBTestMacros.h"
+#import "XCUIDevice+FBRotation.h"
+#import "XCUIElement+FBUtilities.h"
+
+@interface FBIntegrationAppTests : FBIntegrationTestCase
+@end
+
+@implementation FBIntegrationAppTests
+
+- (void)setUp
+{
+  [super setUp];
+  [self resetOrientation];
+  [self launchApplication];
+}
+
+- (void)tearDown
+{
+  [self resetOrientation];
+  [super tearDown];
+}
+
+- (void)rotateTo:(UIDeviceOrientation)orientation
+{
+  XCTAssertTrue([[XCUIDevice sharedDevice] fb_setDeviceInterfaceOrientation:orientation]);
+  [self.testedApplication fb_waitUntilStable];
+}
+
+- (void)testTouchControlsRemainOnScreenAfterRotation
+{
+  [self goToTouchPage];
+  XCUIElement *canvas = [self.testedApplication descendantsMatchingType:XCUIElementTypeAny][@"touchableView"];
+  XCUIElement *taps = self.testedApplication.staticTexts[FBTapsCountLabelIdentifier];
+  XCUIElement *touches = self.testedApplication.staticTexts[FBTouchesCountLabelIdentifier];
+  NSArray<NSNumber *> *orientations = @[@(UIDeviceOrientationLandscapeLeft),
+                                       @(UIDeviceOrientationLandscapeRight),
+                                       @(UIDeviceOrientationPortrait)];
+  NSUInteger count = 0;
+  for (NSNumber *orientation in orientations) {
+    [self rotateTo:orientation.integerValue];
+    CGRect screen = self.testedApplication.frame;
+    XCTAssertTrue(CGRectContainsRect(screen, canvas.frame));
+    XCTAssertTrue(CGRectContainsRect(screen, taps.frame));
+    XCTAssertTrue(CGRectContainsRect(screen, touches.frame));
+    XCTAssertGreaterThan(CGRectGetHeight(canvas.frame), 0);
+    [canvas tap];
+    NSString *expectedTaps = [NSString stringWithFormat:@"%lu", (unsigned long)++count];
+    FBAssertWaitTillBecomesTrue([taps.label isEqualToString:expectedTaps]);
+    XCTAssertEqualObjects(touches.label, @"0");
+  }
+}
+
+- (void)testScrollRowsResizeWhenRotatingInBothDirections
+{
+  [self rotateTo:UIDeviceOrientationLandscapeLeft];
+  [self goToScrollPageWithCells:NO];
+  XCUIElement *scroll = self.testedApplication.scrollViews[@"scrollView"];
+  XCUIElement *row = scroll.staticTexts[@"3"];
+  NSArray<NSNumber *> *orientations = @[@(UIDeviceOrientationPortrait),
+                                       @(UIDeviceOrientationLandscapeRight)];
+  for (NSNumber *orientation in orientations) {
+    [self rotateTo:orientation.integerValue];
+    XCTAssertEqualWithAccuracy(CGRectGetWidth(row.frame), CGRectGetWidth(scroll.frame), 1);
+    XCTAssertEqualWithAccuracy(CGRectGetMidX(row.frame), CGRectGetMidX(scroll.frame), 1);
+    XCTAssertTrue(row.hittable);
+  }
+}
+
+@end

package/WebDriverAgentTests/IntegrationTests/FBIntegrationTestCase.m

@@ -34,6 +34,7 @@ NSArray<NSString *> *const FBMainViewButtonLabels = @[
   @"Scrolling",
   @"Touch",
   @"DeepHierarchy",
+  @"Coordinate Probe",
 ];
 
 @interface FBIntegrationTestCase ()

package/WebDriverAgentTests/UnitTests/FBTouchableViewTests.m

@@ -0,0 +1,121 @@
+/**
+ * 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.
+ */
+
+#import <XCTest/XCTest.h>
+
+#import "../IntegrationApp/Classes/TouchableView.h"
+
+// Only the location and identity are needed to replay UIKit's touch callbacks.
+@interface FBFixtureTouchDouble : NSObject
+@end
+
+@implementation FBFixtureTouchDouble
+- (CGPoint)locationInView:(UIView *)view
+{
+  return CGPointMake(50, 50);
+}
+@end
+
+@interface FBTouchableViewTests : XCTestCase <TouchableViewDelegate>
+@property (nonatomic, strong) TouchableView *touchable;
+@property (nonatomic) int reportedTouches;
+@property (nonatomic) int reportedTaps;
+@end
+
+@implementation FBTouchableViewTests
+
+- (void)setUp
+{
+  [super setUp];
+  self.reportedTouches = 0;
+  self.reportedTaps = 0;
+  self.touchable = [[TouchableView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+  self.touchable.delegate = self;
+}
+
+- (void)tearDown
+{
+  self.touchable.delegate = nil;
+  self.touchable = nil;
+  [super tearDown];
+}
+
+- (void)shouldHandleTouchesNumber:(int)touchesCount
+{
+  self.reportedTouches = touchesCount;
+}
+
+- (void)shouldHandleTapsNumber:(int)numberOfTaps
+{
+  self.reportedTaps = numberOfTaps;
+}
+
+- (UITouch *)newTouch
+{
+  return (UITouch *)[FBFixtureTouchDouble new];
+}
+
+- (void)testStaggeredTouchesTrackActiveFingers
+{
+  NSSet *first = [NSSet setWithObject:[self newTouch]];
+  NSSet *second = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:first withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 1);
+  [self.touchable touchesBegan:second withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 2);
+  XCTAssertEqual(self.reportedTaps, 0);
+
+  [self.touchable touchesEnded:first withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 1);
+  XCTAssertEqual(self.reportedTaps, 1);
+  [self.touchable touchesEnded:second withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 2);
+}
+
+- (void)testSimultaneousContactsCountIndependentlyOfCallbackBatching
+{
+  NSSet *touches = [NSSet setWithObjects:[self newTouch], [self newTouch], nil];
+  [self.touchable touchesBegan:touches withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 2);
+  [self.touchable touchesEnded:touches withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 2);
+}
+
+- (void)testCancelledContactsDoNotCarryOverIntoNextTap
+{
+  NSSet *first = [NSSet setWithObject:[self newTouch]];
+  NSSet *second = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:first withEvent:nil];
+  [self.touchable touchesBegan:second withEvent:nil];
+  [self.touchable touchesCancelled:[first setByAddingObjectsFromSet:second] withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 0);
+
+  NSSet *next = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:next withEvent:nil];
+  [self.touchable touchesEnded:next withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 1);
+}
+
+- (void)testCancellingOneFingerPreservesTheOtherContact
+{
+  NSSet *first = [NSSet setWithObject:[self newTouch]];
+  NSSet *second = [NSSet setWithObject:[self newTouch]];
+  [self.touchable touchesBegan:[first setByAddingObjectsFromSet:second] withEvent:nil];
+  [self.touchable touchesCancelled:first withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 1);
+  XCTAssertEqual(self.reportedTaps, 0);
+  [self.touchable touchesEnded:second withEvent:nil];
+  XCTAssertEqual(self.reportedTouches, 0);
+  XCTAssertEqual(self.reportedTaps, 1);
+}
+
+@end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "16.12.3",
+  "version": "16.12.5",
   "description": "Package bundling WebDriverAgent",
   "keywords": [
     "Appium",