appium-webdriveragent 11.0.2 → 11.1.0

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [11.1.0](https://github.com/appium/WebDriverAgent/compare/v11.0.2...v11.1.0) (2025-12-28)
+
+### Features
+
+* expose customActions on the element ([#1095](https://github.com/appium/WebDriverAgent/issues/1095)) ([3028512](https://github.com/appium/WebDriverAgent/commit/302851237297ee31965c55a75436ad0aea2a8c8f))
+
 ## [11.0.2](https://github.com/appium/WebDriverAgent/compare/v11.0.1...v11.0.2) (2025-12-25)
 
 ### Miscellaneous Chores

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -529,6 +529,7 @@
 		71F5BE50252F14EB00EE9EBA /* FBExceptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 71F5BE4D252F14EB00EE9EBA /* FBExceptions.h */; };
 		71F5BE51252F14EB00EE9EBA /* FBExceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F5BE4E252F14EB00EE9EBA /* FBExceptions.m */; };
 		71F5BE52252F14EB00EE9EBA /* FBExceptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F5BE4E252F14EB00EE9EBA /* FBExceptions.m */; };
+		AABBCCDDEEFF001122334457 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = AABBCCDDEEFF001122334456 /* SceneDelegate.m */; };
 		AD35D06C1CF1C35500870A75 /* WebDriverAgentLib.framework in Copy frameworks */ = {isa = PBXBuildFile; fileRef = EE158A991CBD452B00A3E3F0 /* WebDriverAgentLib.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		AD6C26941CF2379700F8B5FF /* FBAlert.h in Headers */ = {isa = PBXBuildFile; fileRef = AD6C26921CF2379700F8B5FF /* FBAlert.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		AD6C26951CF2379700F8B5FF /* FBAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = AD6C26931CF2379700F8B5FF /* FBAlert.m */; };
@@ -799,7 +800,6 @@
 		EE9B76591CF7987800275851 /* FBRouteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76571CF7987300275851 /* FBRouteTests.m */; };
 		EE9B768E1CF7997600275851 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76831CF7997600275851 /* AppDelegate.m */; };
 		EE9B768F1CF7997600275851 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76851CF7997600275851 /* ViewController.m */; };
-		AABBCCDDEEFF001122334457 /* SceneDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = AABBCCDDEEFF001122334456 /* SceneDelegate.m */; };
 		EE9B76911CF7997600275851 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76871CF7997600275851 /* main.m */; };
 		EE9B76941CF7997600275851 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EE9B768C1CF7997600275851 /* Main.storyboard */; };
 		EE9B769A1CF799F400275851 /* FBAlertTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EE9B76991CF799F400275851 /* FBAlertTests.m */; };
@@ -822,6 +822,10 @@
 		EEE3764A1D59FAE900ED88DD /* XCUIElement+FBWebDriverAttributes.m in Sources */ = {isa = PBXBuildFile; fileRef = EEE376481D59FAE900ED88DD /* XCUIElement+FBWebDriverAttributes.m */; };
 		EEE9B4721CD02B88009D2030 /* FBRunLoopSpinner.h in Headers */ = {isa = PBXBuildFile; fileRef = EEE9B4701CD02B88009D2030 /* FBRunLoopSpinner.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		EEE9B4731CD02B88009D2030 /* FBRunLoopSpinner.m in Sources */ = {isa = PBXBuildFile; fileRef = EEE9B4711CD02B88009D2030 /* FBRunLoopSpinner.m */; };
+		F59CD6D42EF16E5E00F91287 /* XCUIElement+FBCustomActions.h in Headers */ = {isa = PBXBuildFile; fileRef = F59CD6D22EF16E5E00F91287 /* XCUIElement+FBCustomActions.h */; };
+		F59CD6D52EF16E5E00F91287 /* XCUIElement+FBCustomActions.m in Sources */ = {isa = PBXBuildFile; fileRef = F59CD6D32EF16E5E00F91287 /* XCUIElement+FBCustomActions.m */; };
+		F59CD6D62EF16E5E00F91287 /* XCUIElement+FBCustomActions.h in Headers */ = {isa = PBXBuildFile; fileRef = F59CD6D22EF16E5E00F91287 /* XCUIElement+FBCustomActions.h */; };
+		F59CD6D72EF16E5E00F91287 /* XCUIElement+FBCustomActions.m in Sources */ = {isa = PBXBuildFile; fileRef = F59CD6D32EF16E5E00F91287 /* XCUIElement+FBCustomActions.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -1110,6 +1114,8 @@
 		71F5BE33252E5B2200EE9EBA /* FBElementSwipingTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBElementSwipingTests.m; sourceTree = "<group>"; };
 		71F5BE4D252F14EB00EE9EBA /* FBExceptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBExceptions.h; sourceTree = "<group>"; };
 		71F5BE4E252F14EB00EE9EBA /* FBExceptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBExceptions.m; sourceTree = "<group>"; };
+		AABBCCDDEEFF001122334455 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
+		AABBCCDDEEFF001122334456 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		AD42DD2A1CF121E600806E5D /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		AD6C26921CF2379700F8B5FF /* FBAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FBAlert.h; path = WebDriverAgentLib/FBAlert.h; sourceTree = SOURCE_ROOT; };
 		AD6C26931CF2379700F8B5FF /* FBAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; name = FBAlert.m; path = WebDriverAgentLib/FBAlert.m; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@@ -1369,8 +1375,6 @@
 		EE9B76581CF7987300275851 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		EE9B76821CF7997600275851 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		EE9B76831CF7997600275851 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		AABBCCDDEEFF001122334455 /* SceneDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = "<group>"; };
-		AABBCCDDEEFF001122334456 /* SceneDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = "<group>"; };
 		EE9B76841CF7997600275851 /* ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		EE9B76851CF7997600275851 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
 		EE9B76861CF7997600275851 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1404,6 +1408,8 @@
 		EEE9B4701CD02B88009D2030 /* FBRunLoopSpinner.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBRunLoopSpinner.h; sourceTree = "<group>"; };
 		EEE9B4711CD02B88009D2030 /* FBRunLoopSpinner.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBRunLoopSpinner.m; sourceTree = "<group>"; };
 		EEF9882A1C486603005CA669 /* WebDriverAgentRunner.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = WebDriverAgentRunner.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		F59CD6D22EF16E5E00F91287 /* XCUIElement+FBCustomActions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "XCUIElement+FBCustomActions.h"; sourceTree = "<group>"; };
+		F59CD6D32EF16E5E00F91287 /* XCUIElement+FBCustomActions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "XCUIElement+FBCustomActions.m"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1820,6 +1826,8 @@
 				71E75E6C254824230099FC87 /* XCUIElementQuery+FBHelpers.m */,
 				13DE7A59287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.h */,
 				13DE7A5A287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.m */,
+				F59CD6D22EF16E5E00F91287 /* XCUIElement+FBCustomActions.h */,
+				F59CD6D32EF16E5E00F91287 /* XCUIElement+FBCustomActions.m */,
 			);
 			name = Categories;
 			path = WebDriverAgentLib/Categories;
@@ -2521,6 +2529,7 @@
 				641EE6E42240C5CA00173FCB /* XCKeyboardLayout.h in Headers */,
 				641EE6E52240C5CA00173FCB /* XCTAsyncActivity-Protocol.h in Headers */,
 				641EE6E62240C5CA00173FCB /* XCActivityRecord.h in Headers */,
+				F59CD6D62EF16E5E00F91287 /* XCUIElement+FBCustomActions.h in Headers */,
 				71822765258744C700661B83 /* HTTPDataResponse.h in Headers */,
 				641EE6E72240C5CA00173FCB /* XCUIElement+FBFind.h in Headers */,
 				641EE6E82240C5CA00173FCB /* XCTestManager_ManagerInterface-Protocol.h in Headers */,
@@ -2556,6 +2565,7 @@
 				719CD8F82126C78F00C7D0C2 /* FBAlertsMonitor.h in Headers */,
 				EE158AE41CBD456F00A3E3F0 /* FBSession.h in Headers */,
 				13DE7A55287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */,
+				F59CD6D42EF16E5E00F91287 /* XCUIElement+FBCustomActions.h in Headers */,
 				EE35AD0F1E3B77D600A02D78 /* _XCTestImplementation.h in Headers */,
 				71241D7B1FAE3D2500B9559F /* FBTouchActionCommands.h in Headers */,
 				EE158ACA1CBD456F00A3E3F0 /* FBTouchIDCommands.h in Headers */,
@@ -3117,6 +3127,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				F59CD6D72EF16E5E00F91287 /* XCUIElement+FBCustomActions.m in Sources */,
 				64E3502E2AC0B6EB005F3ACB /* NSDictionary+FBUtf8SafeDictionary.m in Sources */,
 				718226CF2587443700661B83 /* GCDAsyncSocket.m in Sources */,
 				E444DCBC24917A5E0060D7EB /* HTTPResponseProxy.m in Sources */,
@@ -3323,6 +3334,7 @@
 				71D475C42538F5A8008D9401 /* XCUIApplicationProcess+FBQuiescence.m in Sources */,
 				641EE7082240CDEB00173FCB /* XCUIElement+FBTVFocuse.m in Sources */,
 				71E75E6F254824230099FC87 /* XCUIElementQuery+FBHelpers.m in Sources */,
+				F59CD6D52EF16E5E00F91287 /* XCUIElement+FBCustomActions.m in Sources */,
 				71D04DCA25356C43008A052C /* XCUIElement+FBCaching.m in Sources */,
 				EE158AEB1CBD456F00A3E3F0 /* FBRuntimeUtils.m in Sources */,
 				EEE376461D59F81400ED88DD /* XCUIElement+FBUtilities.m in Sources */,

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -204,6 +204,7 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
   info[@"value"] = FBValueOrNull(wrappedSnapshot.wdValue);
   info[@"label"] = FBValueOrNull(wrappedSnapshot.wdLabel);
   info[@"rect"] = wrappedSnapshot.wdRect;
+  info[@"customActions"] = FBValueOrNull(wrappedSnapshot.wdCustomActions);
   
   NSDictionary<NSString *, NSString *(^)(void)> *attributeBlocks = [self fb_attributeBlockMapForWrappedSnapshot:wrappedSnapshot];
 

package/WebDriverAgentLib/Categories/XCUIElement+FBCustomActions.h

@@ -0,0 +1,27 @@
+/**
+ * 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 <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface XCUIElement (FBCustomActions)
+
+/*! Custom accessibility actions as a string – may be nil if the element does not have this attribute */
+@property (nonatomic, readonly, nullable) NSString *fb_customActions;
+
+@end
+
+@interface FBXCElementSnapshotWrapper (FBCustomActions)
+
+/*! Custom accessibility actions as a string – may be nil if the element does not have this attribute */
+@property (nonatomic, readonly, nullable) NSString *fb_customActions;
+
+@end
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Categories/XCUIElement+FBCustomActions.m

@@ -0,0 +1,127 @@
+/**
+ * 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 "XCUIElement+FBCustomActions.h"
+#import "XCUIElement+FBUtilities.h"
+#import "FBXCElementSnapshotWrapper+Helpers.h"
+#import "FBLogger.h"
+#import "FBConfiguration.h"
+#import "XCTestPrivateSymbols.h"
+
+@interface FBXCElementSnapshotWrapper (FBCustomActionsInternal)
+
+- (NSString *)fb_stringAttribute:(NSString *)attributeName                            
+                          symbol:(NSNumber *)symbol;
+
+@end
+
+@implementation XCUIElement (FBCustomActions)
+
+- (NSString *)fb_customActions
+{
+  @autoreleasepool {
+    id<FBXCElementSnapshot> snapshot = [self fb_standardSnapshot];
+    return [[FBXCElementSnapshotWrapper ensureWrapped:snapshot]
+            fb_customActions];
+  }
+}
+
+@end
+
+
+@implementation FBXCElementSnapshotWrapper(FBCustomActions)
+
+- (NSString *)fb_customActions
+{
+  return [self fb_stringAttribute:FB_XCAXACustomActionsAttributeName
+                           symbol:FB_XCAXACustomActionsAttribute];
+}
+
+- (NSString *)fb_stringAttribute:(NSString *)attributeName
+                            symbol:(NSNumber *)symbol
+{
+  id cached = (self.snapshot.additionalAttributes ?: @{})[symbol];
+  if ([cached isKindOfClass:[NSString class]]) {
+    return cached;
+  }
+  
+  NSError *error = nil;
+  id raw = [self fb_attributeValue:attributeName error:&error];
+  if (raw == nil) {
+    [FBLogger logFmt: @"[FBCustomActions] Cannot determine string value for %@: %@",
+     attributeName, error.localizedDescription];
+    return nil;
+  }
+  
+  // Case 1: Already a string
+  if ([raw isKindOfClass:[NSString class]]) {
+    return [self retrieveCustomActionsFromString:raw forSymbol:symbol];
+  }
+  
+  // Case 2: Array of custom actions
+  if ([raw isKindOfClass:[NSArray class]]) {
+    return [self retrieveCustomActionsFromArray:raw forSymbol:symbol];
+  }
+  
+  // Fallback: Try to cast to string
+  return [self retrieveCustomActionsByCastingToString:raw forSymbol:symbol];
+}
+
+- (NSString *)retrieveCustomActionsFromString:(NSString *)stringValue
+                                    forSymbol:(NSNumber *)symbol
+{
+  NSMutableDictionary *updated =
+  (self.additionalAttributes ?: @{}).mutableCopy;
+  updated[symbol] = stringValue;
+  self.snapshot.additionalAttributes = updated.copy;
+  return stringValue;
+}
+
+- (NSString *)retrieveCustomActionsFromArray:(NSArray *)arrayValue
+                                   forSymbol:(NSNumber *)symbol
+{
+  NSMutableArray *stringified = [NSMutableArray array];
+  for (id action in arrayValue) {
+    NSString *title = nil;
+    
+    if ([action isKindOfClass:[NSDictionary class]]) {
+      title = ((NSDictionary *)action)[@"CustomActionName"];
+    }
+    
+    if (!title || ![title isKindOfClass:[NSString class]]) {
+      @try {
+        title = [action valueForKey:@"title"];
+      } @catch (__unused NSException * e) {
+        title = @"<unknown>";
+      }
+    }
+    
+    [stringified addObject:title ?: @"<null>"];
+    [FBLogger logFmt: @"[FBCustomActions] Custom action title: %@", title];
+  }
+  
+  NSString *joined = [stringified componentsJoinedByString:@","];
+  NSMutableDictionary *updated =
+  (self.additionalAttributes ?: @{}).mutableCopy;
+  updated[symbol] = joined;
+  self.snapshot.additionalAttributes = updated.copy;
+  return joined;
+}
+
+- (NSString *)retrieveCustomActionsByCastingToString:(id)raw
+                                           forSymbol:(NSNumber *)symbol
+{
+  NSString *stringValue = [NSString stringWithFormat:@"%@", raw];
+  NSMutableDictionary *updated =
+  (self.additionalAttributes ?: @{}).mutableCopy;
+  updated[symbol] = stringValue;
+  self.snapshot.additionalAttributes = updated.copy;
+  return stringValue;
+}
+
+@end

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -24,6 +24,7 @@
 #import "XCUIHitPointResult.h"
 #import "FBAccessibilityTraits.h"
 #import "XCUIElement+FBMinMax.h"
+#import "XCUIElement+FBCustomActions.h"
 
 #define BROKEN_RECT CGRectMake(-1, -1, 0, 0)
 
@@ -285,4 +286,9 @@
   };
  }
 
+- (NSString *)wdCustomActions
+{
+    return self.fb_customActions;
+}
+
 @end

package/WebDriverAgentLib/Commands/FBSessionCommands.m

@@ -355,6 +355,7 @@
       FB_SETTING_INCLUDE_HITTABLE_IN_PAGE_SOURCE: @([FBConfiguration includeHittableInPageSource]),
       FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE: @([FBConfiguration includeNativeFrameInPageSource]),
       FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE: @([FBConfiguration includeMinMaxValueInPageSource]),
+      FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE: @([FBConfiguration includeCustomActionsInPageSource]),
       FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS: @([FBConfiguration enforceCustomSnapshots]),
       FB_SETTING_LIMIT_XPATH_CONTEXT_SCOPE: @([FBConfiguration limitXpathContextScope]),
 #if !TARGET_OS_TV
@@ -467,6 +468,9 @@
   if (nil != [settings objectForKey:FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE]) {
     [FBConfiguration setIncludeMinMaxValueInPageSource:[[settings objectForKey:FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE] boolValue]];
   }
+  if (nil != [settings objectForKey:FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE]) {
+    [FBConfiguration setIncludeCustomActionsInPageSource:[[settings objectForKey:FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE] boolValue]];
+  }
   if (nil != [settings objectForKey:FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS]) {
     [FBConfiguration setEnforceCustomSnapshots:[[settings objectForKey:FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS] boolValue]];
   }

package/WebDriverAgentLib/Info.plist

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

package/WebDriverAgentLib/Routing/FBElement.h

@@ -76,6 +76,9 @@ NS_ASSUME_NONNULL_BEGIN
 /*! Element's maximum value */
 @property (nonatomic, readonly, strong, nullable) NSNumber *wdMaxValue;
 
+/*! Element's custom actions */
+@property (nonatomic, readonly, strong, nullable) NSString *wdCustomActions;
+
 /**
  Returns value of given property specified in WebDriver Spec
  Check the FBElement protocol to get list of supported attributes.

package/WebDriverAgentLib/Utilities/FBConfiguration.h

@@ -376,6 +376,17 @@ typedef NS_ENUM(NSInteger, FBConfigurationKeyboardPreference) {
 + (void)setIncludeMinMaxValueInPageSource:(BOOL)enabled;
 + (BOOL)includeMinMaxValueInPageSource;
 
+/**
+ * Whether to include `customActions` attribute in the XML page source.
+ * Custom actions represent accessibility actions available on UI elements.
+ * This may affect performance if used on many elements.
+ * Disabled by default.
+ *
+ * @param enabled Either YES or NO
+ */
++ (void)setIncludeCustomActionsInPageSource:(BOOL)enabled;
++ (BOOL)includeCustomActionsInPageSource;
+
 /**
  * Whether to enforce the use of custom snapshots instead of standard snapshots.
  * When enabled, fb_customSnapshot is always invoked instead of fb_standardSnapshot

package/WebDriverAgentLib/Utilities/FBConfiguration.m

@@ -63,6 +63,7 @@ static UIInterfaceOrientation FBScreenshotOrientation;
 static BOOL FBShouldIncludeHittableInPageSource = NO;
 static BOOL FBShouldIncludeNativeFrameInPageSource = NO;
 static BOOL FBShouldIncludeMinMaxValueInPageSource = NO;
+static BOOL FBShouldIncludeCustomActionsInPageSource = NO;
 static BOOL FBShouldEnforceCustomSnapshots = NO;
 
 @implementation FBConfiguration
@@ -687,6 +688,16 @@ static BOOL FBShouldEnforceCustomSnapshots = NO;
   return FBShouldIncludeMinMaxValueInPageSource;
 }
 
++ (void)setIncludeCustomActionsInPageSource:(BOOL)enabled
+{
+  FBShouldIncludeCustomActionsInPageSource = enabled;
+}
+
++ (BOOL)includeCustomActionsInPageSource
+{
+  return FBShouldIncludeCustomActionsInPageSource;
+}
+
 + (void)setEnforceCustomSnapshots:(BOOL)enabled
 {
   FBShouldEnforceCustomSnapshots = enabled;

package/WebDriverAgentLib/Utilities/FBSettings.h

@@ -42,6 +42,7 @@ extern NSString* const FB_SETTING_AUTO_CLICK_ALERT_SELECTOR;
 extern NSString *const FB_SETTING_INCLUDE_HITTABLE_IN_PAGE_SOURCE;
 extern NSString *const FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE;
 extern NSString *const FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE;
+extern NSString *const FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE;
 extern NSString *const FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS;
 
 NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBSettings.m

@@ -38,4 +38,5 @@ NSString* const FB_SETTING_AUTO_CLICK_ALERT_SELECTOR = @"autoClickAlertSelector"
 NSString* const FB_SETTING_INCLUDE_HITTABLE_IN_PAGE_SOURCE = @"includeHittableInPageSource";
 NSString* const FB_SETTING_INCLUDE_NATIVE_FRAME_IN_PAGE_SOURCE = @"includeNativeFrameInPageSource";
 NSString* const FB_SETTING_INCLUDE_MIN_MAX_VALUE_IN_PAGE_SOURCE = @"includeMinMaxValueInPageSource";
+NSString* const FB_SETTING_INCLUDE_CUSTOM_ACTIONS_IN_PAGE_SOURCE = @"includeCustomActionsInPageSource";
 NSString* const FB_SETTING_ENFORCE_CUSTOM_SNAPSHOTS = @"enforceCustomSnapshots";

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -131,6 +131,10 @@
 
 @end
 
+@interface FBCustomActionsAttribute : FBElementAttribute
+
+@end
+
 #if TARGET_OS_TV
 
 @interface FBFocusedAttribute : FBElementAttribute
@@ -397,6 +401,10 @@ static NSString *const topNodeIndexPath = @"top";
       [includedAttributes removeObject:FBMinValueAttribute.class];
       [includedAttributes removeObject:FBMaxValueAttribute.class];
     }
+    if (!FBConfiguration.includeCustomActionsInPageSource) {
+      // customActions are retrieved from accessibility attributes and may be slow on deep trees
+      [includedAttributes removeObject:FBCustomActionsAttribute.class];
+    }
     if (nil != excludedAttributes) {
       for (NSString *excludedAttributeName in excludedAttributes) {
         for (Class supportedAttribute in FBElementAttribute.supportedAttributes) {
@@ -660,6 +668,7 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
            FBNativeFrameAttribute.class,
            FBMinValueAttribute.class,
            FBMaxValueAttribute.class,
+           FBCustomActionsAttribute.class,
           ];
 }
 
@@ -954,3 +963,17 @@ static NSString *const FBAbstractMethodInvocationException = @"AbstractMethodInv
 }
 
 @end
+
+@implementation FBCustomActionsAttribute
+
++ (NSString *)name
+{
+  return @"customActions";
+}
+
++ (NSString *)valueForElement:(id<FBElement>)element
+{
+  return element.wdCustomActions;
+}
+
+@end

package/WebDriverAgentLib/Utilities/XCTestPrivateSymbols.h

@@ -29,6 +29,10 @@ extern NSString   *FB_XCAXACustomMinValueAttributeName;
 extern NSNumber   *FB_XCAXACustomMaxValueAttribute;
 extern NSString   *FB_XCAXACustomMaxValueAttributeName;
 
+/*! Accessibility identifier for custom actions attribute */
+extern NSNumber   *FB_XCAXACustomActionsAttribute;
+extern NSString   *FB_XCAXACustomActionsAttributeName;
+
 /*! Getter for  XCTest logger */
 extern id<XCDebugLogDelegate> (*XCDebugLogger)(void);
 

package/WebDriverAgentLib/Utilities/XCTestPrivateSymbols.m

@@ -22,6 +22,8 @@ NSNumber *FB_XCAXACustomMinValueAttribute;
 NSString *FB_XCAXACustomMinValueAttributeName = @"XC_kAXXCAttributeMinValue";
 NSNumber *FB_XCAXACustomMaxValueAttribute;
 NSString *FB_XCAXACustomMaxValueAttributeName = @"XC_kAXXCAttributeMaxValue";
+NSNumber *FB_XCAXACustomActionsAttribute;
+NSString *FB_XCAXACustomActionsAttributeName = @"XC_kAXXCAttributeCustomActions";
 
 void (*XCSetDebugLogger)(id <XCDebugLogDelegate>);
 id<XCDebugLogDelegate> (*XCDebugLogger)(void);
@@ -49,12 +51,20 @@ __attribute__((constructor)) void FBLoadXCTestSymbols(void)
   NSString *XC_kAXXCAttributeMinValue = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomMinValueAttributeName UTF8String]);
   NSString *XC_kAXXCAttributeMaxValue = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomMaxValueAttributeName UTF8String]);
   
-  NSArray<NSNumber *> *minMaxAttrs = XCAXAccessibilityAttributesForStringAttributes(@[XC_kAXXCAttributeMinValue, XC_kAXXCAttributeMaxValue]);
-  FB_XCAXACustomMinValueAttribute = minMaxAttrs[0];
-  FB_XCAXACustomMaxValueAttribute = minMaxAttrs[1];
+  NSString *XC_kAXXCAttributeCustomActions = *(NSString *__autoreleasing *)FBRetrieveXCTestSymbol([FB_XCAXACustomActionsAttributeName UTF8String]);
+  
+  NSArray<NSNumber *> *customAttrs = XCAXAccessibilityAttributesForStringAttributes(@[
+    XC_kAXXCAttributeMinValue,
+    XC_kAXXCAttributeMaxValue,
+    XC_kAXXCAttributeCustomActions
+  ]);
+  FB_XCAXACustomMinValueAttribute = customAttrs[0];
+  FB_XCAXACustomMaxValueAttribute = customAttrs[1];
+  FB_XCAXACustomActionsAttribute = customAttrs[2];
   
   NSCAssert(FB_XCAXACustomMinValueAttribute != nil, @"Failed to retrieve FB_XCAXACustomMinValueAttribute", FB_XCAXACustomMinValueAttribute);
   NSCAssert(FB_XCAXACustomMaxValueAttribute != nil, @"Failed to retrieve FB_XCAXACustomMaxValueAttribute", FB_XCAXACustomMaxValueAttribute);
+  NSCAssert(FB_XCAXACustomActionsAttribute != nil, @"Failed to retrieve FB_XCAXACustomActionsAttribute", FB_XCAXACustomActionsAttribute);
 }
 
 void *FBRetrieveXCTestSymbol(const char *name)
@@ -89,7 +99,8 @@ NSArray<NSString*> *FBCustomAttributeNames(void)
       FB_XCAXAIsVisibleAttributeName,
       FB_XCAXAIsElementAttributeName,
       FB_XCAXACustomMinValueAttributeName,
-      FB_XCAXACustomMaxValueAttributeName
+      FB_XCAXACustomMaxValueAttributeName,
+      FB_XCAXACustomActionsAttributeName
     ];
   });
   return customNames;

package/WebDriverAgentTests/IntegrationApp/Classes/ViewController.m

@@ -10,10 +10,32 @@
 
 @interface ViewController ()
 @property (weak, nonatomic) IBOutlet UILabel *orentationLabel;
+@property (weak, nonatomic) IBOutlet UIButton *button;
 @end
 
 @implementation ViewController
 
+- (void)viewDidLoad
+{
+  [super viewDidLoad];
+  
+  UIAccessibilityCustomAction *action1 =
+  [[UIAccessibilityCustomAction alloc] initWithName:@"Custom Action 1"
+                                             target:self
+                                           selector:@selector(handleCustomAction:)];
+  UIAccessibilityCustomAction *action2 =
+  [[UIAccessibilityCustomAction alloc] initWithName:@"Custom Action 2"
+                                             target:self
+                                           selector:@selector(handleCustomAction:)];
+  self.button.accessibilityCustomActions = @[action1, action2];
+}
+
+- (BOOL)handleCustomAction:(UIAccessibilityCustomAction *)action
+{
+  // Custom action handler - just return YES to indicate success
+  return YES;
+}
+
 - (IBAction)deadlockApp:(id)sender
 {
   dispatch_sync(dispatch_get_main_queue(), ^{

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nJd-IZ-bfU">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="nJd-IZ-bfU">
     <device id="retina6_5" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +21,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nbp-zX-Om1">
-                                <rect key="frame" x="186.66666666666666" y="117" width="41" height="30"/>
+                                <rect key="frame" x="186.66666666666666" y="161" width="41" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="GzF-4f-MaH"/>
                                 </constraints>
@@ -31,7 +31,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YgP-SF-TkS">
-                                <rect key="frame" x="159.66666666666666" y="155" width="95" height="30"/>
+                                <rect key="frame" x="159.66666666666666" y="199" width="95" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="wTu-YB-p22"/>
                                 </constraints>
@@ -42,7 +42,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M2N-Yn-ytb">
-                                <rect key="frame" x="173" y="193" width="68" height="30"/>
+                                <rect key="frame" x="173" y="237" width="68" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Sf6-pE-ROp"/>
                                 </constraints>
@@ -52,7 +52,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S56-6U-3gG">
-                                <rect key="frame" x="177" y="231" width="60" height="30"/>
+                                <rect key="frame" x="177" y="275" width="60" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="7sH-TN-BNa"/>
                                 </constraints>
@@ -62,13 +62,13 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Orientation" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uiD-R4-b34">
-                                <rect key="frame" x="164.66666666666666" y="269" width="85" height="21"/>
+                                <rect key="frame" x="164.66666666666666" y="313" width="85" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Ht-AF-MGW">
-                                <rect key="frame" x="186" y="298" width="42" height="30"/>
+                                <rect key="frame" x="186" y="342" width="42" height="30"/>
                                 <state key="normal" title="Touch"/>
                                 <connections>
                                     <segue destination="XaE-eF-eIt" kind="show" id="q3u-B9-6R6"/>
@@ -114,7 +114,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="C6B-Wo-jWm" customClass="TouchableView">
-                                <rect key="frame" x="16" y="96.000000000000028" width="382" height="356.66666666666674"/>
+                                <rect key="frame" x="16" y="140.00000000000003" width="382" height="356.66666666666674"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <accessibility key="accessibilityConfiguration" identifier="touchableView"/>
                                 <constraints>
@@ -122,14 +122,14 @@
                                 </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">
-                                <rect key="frame" x="139" y="458.66666666666669" width="131" height="21"/>
+                                <rect key="frame" x="139" y="502.66666666666674" width="131" height="21"/>
                                 <accessibility key="accessibilityConfiguration" identifier="numberOfTapsLabel"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Touches" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q4X-EY-aSL">
-                                <rect key="frame" x="125" y="487.33333333333331" width="159" height="21"/>
+                                <rect key="frame" x="125" y="531.33333333333337" width="159" height="21"/>
                                 <accessibility key="accessibilityConfiguration" identifier="numberOfTouchesLabel"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -165,7 +165,7 @@
             <objects>
                 <navigationController id="nJd-IZ-bfU" customClass="FBNavigationController" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="hZx-8U-FDw">
-                        <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                        <rect key="frame" x="0.0" y="88" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </navigationBar>
                     <connections>
@@ -189,7 +189,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Value" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mxs-lj-ChP">
-                                <rect key="frame" x="20" y="99" width="374" height="34"/>
+                                <rect key="frame" x="20" y="143" width="374" height="34"/>
                                 <accessibility key="accessibilityConfiguration" identifier="" label=""/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no"/>
@@ -199,19 +199,19 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </pageControl>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="LZF-72-rfb">
-                                <rect key="frame" x="20" y="499" width="374" height="327"/>
-                                <mutableString key="text">1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901</mutableString>
+                                <rect key="frame" x="20" y="543" width="374" height="249"/>
+                                <string key="text">1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                             <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="dateAndTime" minuteInterval="1" style="wheels" translatesAutoresizingMaskIntoConstraints="NO" id="dxw-sJ-Dkr">
-                                <rect key="frame" x="20" y="365" width="374" height="126"/>
+                                <rect key="frame" x="20" y="409" width="374" height="126"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="126" id="QRU-5e-MQt"/>
                                 </constraints>
                             </datePicker>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Exq-MB-zeu">
-                                <rect key="frame" x="103.66666666666667" y="201" width="46.000000000000014" height="30"/>
+                                <rect key="frame" x="103.66666666666667" y="245" width="46.000000000000014" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Otl-5O-2Nq"/>
                                 </constraints>
@@ -221,7 +221,7 @@
                                 </connections>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NJh-8E-4En">
-                                <rect key="frame" x="106.66666666666667" y="242" width="42.000000000000014" height="21"/>
+                                <rect key="frame" x="106.66666666666667" y="286" width="42.000000000000014" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="VBZ-ac-GvI"/>
                                 </constraints>
@@ -230,7 +230,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="Wim-fT-xNl">
-                                <rect key="frame" x="64" y="267" width="131" height="29"/>
+                                <rect key="frame" x="64" y="311" width="131" height="29"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="28" id="IoK-dx-Y4W"/>
                                 </constraints>
@@ -240,32 +240,32 @@
                                 </segments>
                             </segmentedControl>
                             <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="U7D-NR-20N">
-                                <rect key="frame" x="207" y="276" width="118" height="31"/>
+                                <rect key="frame" x="207" y="320" width="118" height="31"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="114" id="vy6-tS-yHd"/>
                                 </constraints>
                             </slider>
                             <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SjL-dx-Zsi">
-                                <rect key="frame" x="235" y="314" width="51" height="31"/>
+                                <rect key="frame" x="235" y="358" width="51" height="31"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="49" id="dRJ-Hb-qNW"/>
                                 </constraints>
                             </switch>
                             <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="w6h-ic-qpa">
-                                <rect key="frame" x="134" y="353" width="150" height="4"/>
+                                <rect key="frame" x="134" y="397" width="150" height="4"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="150" id="7Tf-hh-LKX"/>
                                 </constraints>
                             </progressView>
                             <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="u8X-Wb-Od3">
-                                <rect key="frame" x="69" y="311" width="94" height="29"/>
+                                <rect key="frame" x="69" y="355" width="94" height="29"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="94" id="bNi-xp-G14"/>
                                     <constraint firstAttribute="height" constant="29" id="f0s-Rr-QTt"/>
                                 </constraints>
                             </stepper>
                             <label opaque="NO" userInteractionEnabled="NO" alpha="0.0" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="alpha_invisible" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ucg-0s-c50">
-                                <rect key="frame" x="224.33333333333334" y="197" width="111.66666666666666" height="21"/>
+                                <rect key="frame" x="224.33333333333334" y="241" width="111.66666666666666" height="21"/>
                                 <color key="backgroundColor" red="1" green="0.0" blue="0.041046944598614132" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="664-Z3-V7W"/>
@@ -275,7 +275,7 @@
                                 <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">
-                                <rect key="frame" x="221.66666666666666" y="226" width="122.66666666666666" height="21"/>
+                                <rect key="frame" x="221.66666666666666" y="270" width="122.66666666666666" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="51j-sl-XYd"/>
                                 </constraints>
@@ -284,7 +284,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GsS-jO-scK">
-                                <rect key="frame" x="174" y="248" width="103" height="30"/>
+                                <rect key="frame" x="174" y="292" width="103" height="30"/>
                                 <accessibility key="accessibilityConfiguration">
                                     <bool key="isElement" value="NO"/>
                                 </accessibility>
@@ -299,10 +299,10 @@
                                 </userDefinedRuntimeAttributes>
                             </button>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="bQv-RY-wkj">
-                                <rect key="frame" x="171" y="320" width="20" height="20"/>
+                                <rect key="frame" x="171" y="364" width="20" height="20"/>
                             </activityIndicatorView>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Value2" borderStyle="roundedRect" textAlignment="natural" clearsOnBeginEditing="YES" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Rab-I8-2aU">
-                                <rect key="frame" x="20" y="141" width="374" height="34"/>
+                                <rect key="frame" x="20" y="185" width="374" height="34"/>
                                 <accessibility key="accessibilityConfiguration" identifier="aIdentifier" label="aLabel"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" spellCheckingType="no"/>
@@ -349,6 +349,9 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="Hk7-AH-JlS"/>
+                    <connections>
+                        <outlet property="button" destination="Exq-MB-zeu" id="G1n-jg-1hY"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="0f2-qL-RU6" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -367,7 +370,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="y1x-J5-Nkw">
-                                <rect key="frame" x="101.66666666666669" y="113" width="211" height="30"/>
+                                <rect key="frame" x="101.66666666666669" y="157" width="211" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="textField"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="B7B-wI-RFc"/>
@@ -377,7 +380,7 @@
                                 <textInputTraits key="textInputTraits"/>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4VK-4B-FEF">
-                                <rect key="frame" x="149.66666666666666" y="194" width="113.99999999999997" height="30"/>
+                                <rect key="frame" x="149.66666666666666" y="238" width="113.99999999999997" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="xsL-Fq-mly"/>
                                 </constraints>
@@ -387,7 +390,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OQt-5y-Tft">
-                                <rect key="frame" x="124" y="232" width="166" height="30"/>
+                                <rect key="frame" x="124" y="276" width="166" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Y5y-Th-63a"/>
                                 </constraints>
@@ -397,7 +400,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rG5-3k-LFe">
-                                <rect key="frame" x="122" y="270" width="169" height="30"/>
+                                <rect key="frame" x="122" y="314" width="169" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="im5-w3-Pgi"/>
                                 </constraints>
@@ -407,7 +410,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ntr-45-Ycd">
-                                <rect key="frame" x="123" y="308" width="168" height="30"/>
+                                <rect key="frame" x="123" y="352" width="168" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="4B7-LM-UwV"/>
                                 </constraints>
@@ -417,7 +420,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CZ1-7J-OGl">
-                                <rect key="frame" x="66.666666666666671" y="176" width="46" height="30"/>
+                                <rect key="frame" x="66.666666666666671" y="220" width="46" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="button"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="tJH-wr-O3J"/>
@@ -425,7 +428,7 @@
                                 <state key="normal" title="Button"/>
                             </button>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="plO-2e-XmX">
-                                <rect key="frame" x="304.66666666666669" y="180" width="42" height="21"/>
+                                <rect key="frame" x="304.66666666666669" y="224" width="42" height="21"/>
                                 <accessibility key="accessibilityConfiguration" identifier="label"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="2qA-NT-ddc"/>
@@ -435,7 +438,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Zk-wE-jwj">
-                                <rect key="frame" x="144" y="346" width="126" height="30"/>
+                                <rect key="frame" x="144" y="390" width="126" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Mk4-bk-Y0L"/>
                                 </constraints>
@@ -445,7 +448,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="D7g-22-s49">
-                                <rect key="frame" x="116" y="384" width="182" height="30"/>
+                                <rect key="frame" x="116" y="428" width="182" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="TzV-CY-64y"/>
                                 </constraints>
@@ -493,7 +496,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vYb-QB-vwU">
-                                <rect key="frame" x="172.66666666666666" y="108" width="69" height="30"/>
+                                <rect key="frame" x="172.66666666666666" y="152" width="69" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="ymh-D3-SCA"/>
                                 </constraints>
@@ -503,7 +506,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FdB-fa-0bl">
-                                <rect key="frame" x="171" y="146" width="72" height="30"/>
+                                <rect key="frame" x="171" y="190" width="72" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="Xas-AZ-Nyw"/>
                                 </constraints>
@@ -583,7 +586,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xEQ-MI-a2g">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="862"/>
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="828"/>
                                 <userDefinedRuntimeAttributes>
                                     <userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="scrollView"/>
                                 </userDefinedRuntimeAttributes>

package/WebDriverAgentTests/IntegrationTests/FBElementAttributeTests.m

@@ -13,6 +13,7 @@
 #import "FBTestMacros.h"
 #import "FBXCodeCompatibility.h"
 #import "XCUIElement+FBAccessibility.h"
+#import "XCUIElement+FBCustomActions.h"
 #import "XCUIElement+FBIsVisible.h"
 #import "XCUIElement+FBWebDriverAttributes.h"
 
@@ -251,4 +252,13 @@
   XCTAssertEqualObjects(element.wdValue, @"1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901");
 }
 
+- (void)testCustomActionsAttributes
+{
+  XCUIElement *buttonElement = self.testedApplication.buttons[@"Button"];
+  XCTAssertTrue(buttonElement.exists);
+  NSString *customActions = buttonElement.wdCustomActions;
+  XCTAssertNotNil(customActions, @"Button should have custom actions");
+  XCTAssertEqualObjects(customActions, @"Custom Action 1,Custom Action 2");
+}
+
 @end

package/WebDriverAgentTests/UnitTests/Doubles/XCElementSnapshotDouble.h

@@ -12,4 +12,5 @@
 @property (readwrite, nullable) id value;
 @property (readwrite, nullable, copy) NSString *label;
 @property (nonatomic, assign) UIAccessibilityTraits traits;
+@property (readwrite, nullable) NSMutableDictionary *additionalAttributes;
 @end

package/WebDriverAgentTests/UnitTests/Doubles/XCElementSnapshotDouble.m

@@ -19,6 +19,7 @@
   self = [super init];
   self->_value = @"magicValue";
   self->_label = @"testLabel";
+  self->_additionalAttributes = [NSMutableDictionary dictionary];
   return self;
 }
 
@@ -72,11 +73,6 @@
   return YES;
 }
 
-- (NSDictionary *)additionalAttributes
-{
-  return @{};
-}
-
 - (id<FBXCAccessibilityElement>)accessibilityElement
 {
   return nil;

package/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h

@@ -38,6 +38,7 @@
 @property (nonatomic, readwrite, assign) XCUIElementType elementType;
 @property (nonatomic, readwrite, getter=isWDAccessibilityContainer) BOOL wdAccessibilityContainer;
 @property (nonatomic, copy, readwrite, nullable) NSString *wdTraits;
+@property (nonatomic, strong, readwrite, nullable) NSString *wdCustomActions;
 
 - (void)resolve;
 - (id _Nonnull)fb_standardSnapshot;

package/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m

@@ -25,6 +25,7 @@
     self.wdValue = @"magicValue";
     self.wdPlaceholderValue = @"testPlaceholderValue";
     self.wdTraits = @"testTraits";
+    self.wdCustomActions = nil;
     self.wdVisible = YES;
     self.wdAccessible = YES;
     self.wdEnabled = YES;

package/WebDriverAgentTests/UnitTests/FBXPathTests.m

@@ -14,6 +14,7 @@
 #import "XCUIElementDouble.h"
 #import "XCElementSnapshotDouble.h"
 #import "FBXCElementSnapshotWrapper+Helpers.h"
+#import "XCTestPrivateSymbols.h"
 
 @interface FBXPathTests : XCTestCase
 @end
@@ -68,7 +69,7 @@
   XCTAssertTrue([resultXml isEqualToString: expectedXml]);
 }
 
-- (void)testtXPathPresentationWithSomeAttributesExcluded
+- (void)testXPathPresentationWithSomeAttributesExcluded
 {
   XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
   id<FBElement> element = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
@@ -85,12 +86,14 @@
   XCElementSnapshotDouble *snapshot = [XCElementSnapshotDouble new];
   snapshot.value = @"йоло<>&\"";
   snapshot.label = @"a\nb";
+  NSString *testCustomActions = @"Custom Action 1, Custom Action 2";
+  snapshot.additionalAttributes[FB_XCAXACustomActionsAttribute] = testCustomActions;
   id<FBElement> element = (id<FBElement>)[FBXCElementSnapshotWrapper ensureWrapped:(id)snapshot];
   NSString *resultXml = [self xmlStringWithElement:(id<FBXCElementSnapshot>)element
                                         xpathQuery:[NSString stringWithFormat:@"//%@[@*]", element.wdType]
                                excludingAttributes:@[@"visible"]];
-  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" hittable=\"%@\" traits=\"%@\" nativeFrame=\"%@\" private_indexPath=\"top\"/>\n",
-                           element.wdType, element.wdType, @"йоло&lt;&gt;&amp;&quot;", element.wdName, @"a&#10;b", FBBoolToString(element.wdEnabled), FBBoolToString(element.wdVisible), FBBoolToString(element.wdAccessible), element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex, FBBoolToString(element.wdHittable), element.wdTraits, NSStringFromCGRect(element.wdNativeFrame)];
+  NSString *expectedXml = [NSString stringWithFormat:@"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<%@ type=\"%@\" value=\"%@\" name=\"%@\" label=\"%@\" enabled=\"%@\" visible=\"%@\" accessible=\"%@\" x=\"%@\" y=\"%@\" width=\"%@\" height=\"%@\" index=\"%lu\" hittable=\"%@\" traits=\"%@\" nativeFrame=\"%@\" customActions=\"%@\" private_indexPath=\"top\"/>\n",
+                           element.wdType, element.wdType, @"йоло&lt;&gt;&amp;&quot;", element.wdName, @"a&#10;b", FBBoolToString(element.wdEnabled), FBBoolToString(element.wdVisible), FBBoolToString(element.wdAccessible), element.wdRect[@"x"], element.wdRect[@"y"], element.wdRect[@"width"], element.wdRect[@"height"], element.wdIndex, FBBoolToString(element.wdHittable), element.wdTraits, NSStringFromCGRect(element.wdNativeFrame), element.wdCustomActions];
   XCTAssertEqualObjects(expectedXml, resultXml);
 }
 

package/WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.h

@@ -34,6 +34,7 @@
 @property (copy, nonnull) NSArray *children;
 @property (nonatomic, readwrite, assign) XCUIElementType elementType;
 @property (nonatomic, readwrite, getter=isWDAccessibilityContainer) BOOL wdAccessibilityContainer;
+@property (nonatomic, strong, readwrite, nullable) NSString *wdCustomActions;
 
 - (void)resolve;
 - (id _Nonnull)fb_standardSnapshot;

package/WebDriverAgentTests/UnitTests_tvOS/Doubles/XCUIElementDouble.m

@@ -28,6 +28,7 @@
     self.wdSelected = YES;
     self.wdHittable = YES;
     self.wdIndex = 0;
+    self.wdCustomActions = nil;
 #if TARGET_OS_TV
     self.wdFocused = YES;
 #endif

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium-webdriveragent",
-  "version": "11.0.2",
+  "version": "11.1.0",
   "description": "Package bundling WebDriverAgent",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",