appium-webdriveragent 9.9.0 → 9.10.1

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## [9.10.1](https://github.com/appium/WebDriverAgent/compare/v9.10.0...v9.10.1) (2025-05-30)
+
+### Miscellaneous Chores
+
+* Make sure the same import style is used everywhere ([#1024](https://github.com/appium/WebDriverAgent/issues/1024)) ([1c50072](https://github.com/appium/WebDriverAgent/commit/1c50072457a8b82eec3684029386ccfa9432eccc))
+
+## [9.10.0](https://github.com/appium/WebDriverAgent/compare/v9.9.0...v9.10.0) (2025-05-27)
+
+### Features
+
+* Add accessibility traits of the element ([#1020](https://github.com/appium/WebDriverAgent/issues/1020)) ([9465aaf](https://github.com/appium/WebDriverAgent/commit/9465aafd5e81ef57be7f78e9f2e188d3c1ba1bee))
+
+### Bug Fixes
+
+* Use native snapshots if hittable attribute is requested in xPath ([#1023](https://github.com/appium/WebDriverAgent/issues/1023)) ([49d26cb](https://github.com/appium/WebDriverAgent/commit/49d26cb02a8515d1a1b52b65b7cb65512dfd749b))
+
 ## [9.9.0](https://github.com/appium/WebDriverAgent/compare/v9.8.0...v9.9.0) (2025-05-26)
 
 ### Features

package/WebDriverAgent.xcodeproj/project.pbxproj

@@ -21,12 +21,12 @@
 		13DE7A4A287C4005003243C6 /* FBXCDeviceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A47287C4005003243C6 /* FBXCDeviceEvent.h */; };
 		13DE7A4B287C4005003243C6 /* FBXCDeviceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A48287C4005003243C6 /* FBXCDeviceEvent.m */; };
 		13DE7A4C287C4005003243C6 /* FBXCDeviceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A48287C4005003243C6 /* FBXCDeviceEvent.m */; };
-		13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; };
-		13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; };
+		13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A4D287C46BB003243C6 /* FBXCElementSnapshot.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		13DE7A51287C46BB003243C6 /* FBXCElementSnapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A4E287C46BB003243C6 /* FBXCElementSnapshot.m */; };
 		13DE7A52287C46BB003243C6 /* FBXCElementSnapshot.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A4E287C46BB003243C6 /* FBXCElementSnapshot.m */; };
-		13DE7A55287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; };
-		13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; };
+		13DE7A55287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A53287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		13DE7A57287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A54287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m */; };
 		13DE7A58287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 13DE7A54287CA1EC003243C6 /* FBXCElementSnapshotWrapper.m */; };
 		13DE7A5B287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.h in Headers */ = {isa = PBXBuildFile; fileRef = 13DE7A59287CA444003243C6 /* FBXCElementSnapshotWrapper+Helpers.h */; };
@@ -539,6 +539,10 @@
 		ADBC39981D07842800327304 /* XCUIElementDouble.m in Sources */ = {isa = PBXBuildFile; fileRef = ADBC39971D07842800327304 /* XCUIElementDouble.m */; };
 		ADDA07241D6BB2BF001700AC /* FBScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ADDA07231D6BB2BF001700AC /* FBScrollViewController.m */; };
 		ADEF63AF1D09DEBE0070A7E3 /* FBRuntimeUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = ADEF63AE1D09DEBE0070A7E3 /* FBRuntimeUtilsTests.m */; };
+		B316351C2DDF0CF5007D9317 /* FBAccessibilityTraits.m in Sources */ = {isa = PBXBuildFile; fileRef = B316351B2DDF0CF5007D9317 /* FBAccessibilityTraits.m */; };
+		B316351D2DDF0CF5007D9317 /* FBAccessibilityTraits.m in Sources */ = {isa = PBXBuildFile; fileRef = B316351B2DDF0CF5007D9317 /* FBAccessibilityTraits.m */; };
+		B316351F2DDF0D0B007D9317 /* FBAccessibilityTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = B316351E2DDF0D0B007D9317 /* FBAccessibilityTraits.h */; };
+		B31635202DDF0D0B007D9317 /* FBAccessibilityTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = B316351E2DDF0D0B007D9317 /* FBAccessibilityTraits.h */; };
 		C845206222D5E79400EA68CB /* FBUnattachedAppLauncher.h in Headers */ = {isa = PBXBuildFile; fileRef = C8FB547722D4C1FC00B69954 /* FBUnattachedAppLauncher.h */; };
 		C845206322D5E79700EA68CB /* FBUnattachedAppLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = C8FB547822D4C1FC00B69954 /* FBUnattachedAppLauncher.m */; };
 		C8FB547422D3949C00B69954 /* LSApplicationWorkspace.h in Headers */ = {isa = PBXBuildFile; fileRef = C8FB547322D3949C00B69954 /* LSApplicationWorkspace.h */; };
@@ -1115,6 +1119,8 @@
 		ADDA07221D6BB2BF001700AC /* FBScrollViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBScrollViewController.h; sourceTree = "<group>"; };
 		ADDA07231D6BB2BF001700AC /* FBScrollViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBScrollViewController.m; sourceTree = "<group>"; };
 		ADEF63AE1D09DEBE0070A7E3 /* FBRuntimeUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FBRuntimeUtilsTests.m; sourceTree = "<group>"; };
+		B316351B2DDF0CF5007D9317 /* FBAccessibilityTraits.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBAccessibilityTraits.m; sourceTree = "<group>"; };
+		B316351E2DDF0D0B007D9317 /* FBAccessibilityTraits.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBAccessibilityTraits.h; sourceTree = "<group>"; };
 		C8FB547322D3949C00B69954 /* LSApplicationWorkspace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LSApplicationWorkspace.h; sourceTree = "<group>"; };
 		C8FB547722D4C1FC00B69954 /* FBUnattachedAppLauncher.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FBUnattachedAppLauncher.h; sourceTree = "<group>"; };
 		C8FB547822D4C1FC00B69954 /* FBUnattachedAppLauncher.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FBUnattachedAppLauncher.m; sourceTree = "<group>"; };
@@ -1979,6 +1985,8 @@
 				EE6B64FC1D0F86EF00E85F5D /* XCTestPrivateSymbols.m */,
 				633E904A220DEE7F007CADF9 /* XCUIApplicationProcessDelay.h */,
 				6385F4A5220A40760095BBDB /* XCUIApplicationProcessDelay.m */,
+				B316351B2DDF0CF5007D9317 /* FBAccessibilityTraits.m */,
+				B316351E2DDF0D0B007D9317 /* FBAccessibilityTraits.h */,
 			);
 			name = Utilities;
 			path = WebDriverAgentLib/Utilities;
@@ -2292,6 +2300,8 @@
 				641EE6392240C5CA00173FCB /* FBRouteRequest.h in Headers */,
 				648C10AC22AAAD9C00B81B9A /* UIKeyboardImpl.h in Headers */,
 				718226CD2587443700661B83 /* GCDAsyncSocket.h in Headers */,
+				13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
+				13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */,
 				71F3E7D525417FF400E0C22B /* FBSettings.h in Headers */,
 				641EE63A2240C5CA00173FCB /* XCTest.h in Headers */,
 				641EE63B2240C5CA00173FCB /* FBAlertsMonitor.h in Headers */,
@@ -2340,7 +2350,6 @@
 				641EE6632240C5CA00173FCB /* FBUnknownCommands.h in Headers */,
 				641EE7062240CDCF00173FCB /* XCUIElement+FBTVFocuse.h in Headers */,
 				71822738258744B800661B83 /* HTTPConnection.h in Headers */,
-				13DE7A56287CA1EC003243C6 /* FBXCElementSnapshotWrapper.h in Headers */,
 				641EE6642240C5CA00173FCB /* NSPredicate+FBFormat.h in Headers */,
 				641EE6652240C5CA00173FCB /* UILongPressGestureRecognizer-RecordingAdditions.h in Headers */,
 				641EE6662240C5CA00173FCB /* XCTestCase.h in Headers */,
@@ -2420,6 +2429,7 @@
 				641EE6A62240C5CA00173FCB /* FBImageProcessor.h in Headers */,
 				641EE6A72240C5CA00173FCB /* FBSession-Private.h in Headers */,
 				641EE6A82240C5CA00173FCB /* NSString+FBXMLSafeString.h in Headers */,
+				B316351F2DDF0D0B007D9317 /* FBAccessibilityTraits.h in Headers */,
 				64E3502F2AC0B6FE005F3ACB /* NSDictionary+FBUtf8SafeDictionary.h in Headers */,
 				641EE6A92240C5CA00173FCB /* FBCommandStatus.h in Headers */,
 				71822702258744A400661B83 /* HTTPResponseProxy.h in Headers */,
@@ -2501,7 +2511,6 @@
 				641EE6E72240C5CA00173FCB /* XCUIElement+FBFind.h in Headers */,
 				641EE6E82240C5CA00173FCB /* XCTestManager_ManagerInterface-Protocol.h in Headers */,
 				641EE6E92240C5CA00173FCB /* FBFailureProofTestCase.h in Headers */,
-				13DE7A50287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
 				641EE6EA2240C5CA00173FCB /* XCTTestRunSessionDelegate-Protocol.h in Headers */,
 				641EE6EB2240C5CA00173FCB /* XCTestCaseSuite.h in Headers */,
 				641EE6EC2240C5CA00173FCB /* _XCInternalTestRun.h in Headers */,
@@ -2572,6 +2581,7 @@
 				EE35AD721E3B77D600A02D78 /* XCUIElementHitPointCoordinate.h in Headers */,
 				EE35AD3F1E3B77D600A02D78 /* XCTDarwinNotificationExpectation.h in Headers */,
 				EE35AD5F1E3B77D600A02D78 /* XCTRunnerAutomationSession.h in Headers */,
+				13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
 				71C9EAAC25E8415A00470CD8 /* FBScreenshot.h in Headers */,
 				EE35AD371E3B77D600A02D78 /* XCSourceCodeTreeNodeEnumerator.h in Headers */,
 				EE158AB01CBD456F00A3E3F0 /* XCUIElement+FBIsVisible.h in Headers */,
@@ -2669,7 +2679,6 @@
 				EE158AB81CBD456F00A3E3F0 /* FBAlertViewCommands.h in Headers */,
 				EE35AD651E3B77D600A02D78 /* XCTWaiter.h in Headers */,
 				EE35AD681E3B77D600A02D78 /* XCTWaiterManagement-Protocol.h in Headers */,
-				13DE7A4F287C46BB003243C6 /* FBXCElementSnapshot.h in Headers */,
 				EE35AD451E3B77D600A02D78 /* XCTestContext.h in Headers */,
 				EE35AD661E3B77D600A02D78 /* XCTWaiterDelegate-Protocol.h in Headers */,
 				EE35AD0E1E3B77D600A02D78 /* _XCTestExpectationImplementation.h in Headers */,
@@ -2712,6 +2721,7 @@
 				EE35AD571E3B77D600A02D78 /* XCTestSuiteRun.h in Headers */,
 				EE35AD701E3B77D600A02D78 /* XCUIElementAsynchronousHandlerWrapper.h in Headers */,
 				EE35AD4C1E3B77D600A02D78 /* XCTestLog.h in Headers */,
+				B31635202DDF0D0B007D9317 /* FBAccessibilityTraits.h in Headers */,
 				71BB58E82B96328700CB9BFE /* FBScreenRecordingRequest.h in Headers */,
 				EE35AD231E3B77D600A02D78 /* UITapGestureRecognizer-RecordingAdditions.h in Headers */,
 				EE35AD2A1E3B77D600A02D78 /* XCDebugLogDelegate-Protocol.h in Headers */,
@@ -3173,6 +3183,7 @@
 				641EE6082240C5CA00173FCB /* FBRuntimeUtils.m in Sources */,
 				641EE6092240C5CA00173FCB /* XCUIElement+FBUtilities.m in Sources */,
 				641EE60A2240C5CA00173FCB /* FBLogger.m in Sources */,
+				B316351D2DDF0CF5007D9317 /* FBAccessibilityTraits.m in Sources */,
 				641EE60B2240C5CA00173FCB /* FBCustomCommands.m in Sources */,
 				71BB58E42B9631F100CB9BFE /* FBScreenRecordingPromise.m in Sources */,
 				641EE60C2240C5CA00173FCB /* XCUIDevice+FBHelpers.m in Sources */,
@@ -3257,6 +3268,7 @@
 				71AE3CFA2D38EE8E0039FC36 /* XCUIElement+FBVisibleFrame.m in Sources */,
 				EEBBD48C1D47746D00656A81 /* XCUIElement+FBFind.m in Sources */,
 				EE158ADD1CBD456F00A3E3F0 /* FBResponsePayload.m in Sources */,
+				B316351C2DDF0CF5007D9317 /* FBAccessibilityTraits.m in Sources */,
 				E444DCB524913C220060D7EB /* RouteRequest.m in Sources */,
 				C8FB547A22D4C1FC00B69954 /* FBUnattachedAppLauncher.m in Sources */,
 				EE158ADF1CBD456F00A3E3F0 /* FBRoute.m in Sources */,

package/WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -48,6 +48,7 @@ static NSString* const FBExclusionAttributeAccessible = @"accessible";
 static NSString* const FBExclusionAttributeFocused = @"focused";
 static NSString* const FBExclusionAttributePlaceholderValue = @"placeholderValue";
 static NSString* const FBExclusionAttributeNativeFrame = @"nativeFrame";
+static NSString* const FBExclusionAttributeTraits = @"traits";
 
 _Nullable id extractIssueProperty(id issue, NSString *propertyName) {
   SEL selector = NSSelectorFromString(propertyName);
@@ -209,6 +210,7 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
                             FBExclusionAttributeFrame,
                             FBExclusionAttributePlaceholderValue,
                             FBExclusionAttributeNativeFrame,
+                            FBExclusionAttributeTraits,
                             nil];
 
   for (NSString *key in attributeBlocks) {
@@ -265,6 +267,9 @@ NSDictionary<NSString *, NSString *> *customExclusionAttributesMap(void) {
   },
     FBExclusionAttributeFocused: ^{
     return [@([wrappedSnapshot isWDFocused]) stringValue];
+  },
+    FBExclusionAttributeTraits: ^{
+    return wrappedSnapshot.wdTraits;
   }
   } mutableCopy];
   

package/WebDriverAgentLib/Categories/XCUIElement+FBAccessibility.h

@@ -8,7 +8,7 @@
  */
 
 #import <WebDriverAgentLib/XCUIElement.h>
-#import "FBXCElementSnapshotWrapper.h"
+#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/WebDriverAgentLib/Categories/XCUIElement+FBIsVisible.h

@@ -7,7 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import "FBXCElementSnapshotWrapper.h"
+#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/WebDriverAgentLib/Categories/XCUIElement+FBUtilities.h

@@ -9,7 +9,7 @@
 
 #import <XCTest/XCTest.h>
 #import <WebDriverAgentLib/FBElement.h>
-#import "FBXCElementSnapshot.h"
+#import <WebDriverAgentLib/FBXCElementSnapshot.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.h

@@ -9,7 +9,7 @@
 
 #import <WebDriverAgentLib/FBElement.h>
 #import <WebDriverAgentLib/XCUIElement.h>
-#import "FBXCElementSnapshotWrapper.h"
+#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

package/WebDriverAgentLib/Categories/XCUIElement+FBWebDriverAttributes.m

@@ -22,6 +22,7 @@
 #import "FBElementUtils.h"
 #import "XCTestPrivateSymbols.h"
 #import "XCUIHitPointResult.h"
+#import "FBAccessibilityTraits.h"
 
 #define BROKEN_RECT CGRectMake(-1, -1, 0, 0)
 
@@ -159,6 +160,22 @@
   return self.frame;
 }
 
+/**
+ Returns a comma-separated string of accessibility traits for the element.
+ This method converts the element's accessibility traits bitmask into human-readable strings
+ using FBAccessibilityTraitsToStringsArray. The traits represent various accessibility
+ characteristics of the element such as Button, Link, Image, etc.
+ You can find the list of possible traits in the Apple documentation:
+ https://developer.apple.com/documentation/uikit/uiaccessibilitytraits?language=objc
+ 
+ @return A comma-separated string of accessibility traits, or an empty string if no traits are set
+ */
+- (NSString *)wdTraits
+{
+  NSArray<NSString *> *traits = FBAccessibilityTraitsToStringsArray(self.snapshot.traits);
+  return [traits componentsJoinedByString:@", "];
+}
+
 - (BOOL)isWDVisible
 {
   return self.fb_isVisible;

package/WebDriverAgentLib/Info.plist

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

package/WebDriverAgentLib/Routing/FBElement.h

@@ -38,6 +38,9 @@ NS_ASSUME_NONNULL_BEGIN
 /*! Element's type */
 @property (nonatomic, readonly, copy) NSString *wdType;
 
+/*! Element's accessibility traits as a comma-separated string */
+@property (nonatomic, readonly, copy) NSString *wdTraits;
+
 /*! Element's value */
 @property (nonatomic, readonly, strong, nullable) NSString *wdValue;
 

package/WebDriverAgentLib/Utilities/FBAccessibilityTraits.h

@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import <XCTest/XCTest.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ Converts accessibility traits bitmask to an array of string representations
+ @param traits The accessibility traits bitmask
+ @return Array of strings representing the accessibility traits
+ */
+NSArray<NSString *> *FBAccessibilityTraitsToStringsArray(unsigned long long traits);
+
+NS_ASSUME_NONNULL_END

package/WebDriverAgentLib/Utilities/FBAccessibilityTraits.m

@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+#import "FBAccessibilityTraits.h"
+
+NSArray<NSString *> *FBAccessibilityTraitsToStringsArray(unsigned long long traits) {
+    NSMutableArray<NSString *> *traitStringsArray;
+    NSNumber *key;
+    
+    static NSDictionary<NSNumber *, NSString *> *traitsMapping;
+    static dispatch_once_t onceToken;
+
+    dispatch_once(&onceToken, ^{
+        NSMutableDictionary<NSNumber *, NSString *> *mapping = [@{
+            @(UIAccessibilityTraitNone): @"None",
+            @(UIAccessibilityTraitButton): @"Button",
+            @(UIAccessibilityTraitLink): @"Link",
+            @(UIAccessibilityTraitHeader): @"Header",
+            @(UIAccessibilityTraitSearchField): @"SearchField",
+            @(UIAccessibilityTraitImage): @"Image",
+            @(UIAccessibilityTraitSelected): @"Selected",
+            @(UIAccessibilityTraitPlaysSound): @"PlaysSound",
+            @(UIAccessibilityTraitKeyboardKey): @"KeyboardKey",
+            @(UIAccessibilityTraitStaticText): @"StaticText",
+            @(UIAccessibilityTraitSummaryElement): @"SummaryElement",
+            @(UIAccessibilityTraitNotEnabled): @"NotEnabled",
+            @(UIAccessibilityTraitUpdatesFrequently): @"UpdatesFrequently",
+            @(UIAccessibilityTraitStartsMediaSession): @"StartsMediaSession",
+            @(UIAccessibilityTraitAdjustable): @"Adjustable",
+            @(UIAccessibilityTraitAllowsDirectInteraction): @"AllowsDirectInteraction",
+            @(UIAccessibilityTraitCausesPageTurn): @"CausesPageTurn",
+            @(UIAccessibilityTraitTabBar): @"TabBar"
+        } mutableCopy];
+        
+        #if __clang_major__ >= 16
+        // Add iOS 17.0 specific traits if available
+        if (@available(iOS 17.0, *)) {
+            [mapping addEntriesFromDictionary:@{
+                @(UIAccessibilityTraitToggleButton): @"ToggleButton",
+                @(UIAccessibilityTraitSupportsZoom): @"SupportsZoom"
+            }];
+        }
+        #endif
+        
+        traitsMapping = [mapping copy];
+    });
+
+    traitStringsArray = [NSMutableArray array];
+    for (key in traitsMapping) {
+      if (traits & [key unsignedLongLongValue] && nil != traitsMapping[key]) {
+        [traitStringsArray addObject:(id)traitsMapping[key]];
+      }
+    }
+
+    return [traitStringsArray copy];
+}

package/WebDriverAgentLib/Utilities/FBXPath.h

@@ -9,7 +9,7 @@
 
 #import <XCTest/XCTest.h>
 #import <WebDriverAgentLib/FBElement.h>
-#import "FBXCElementSnapshot.h"
+#import <WebDriverAgentLib/FBXCElementSnapshot.h>
 
 #ifdef __clang__
 #pragma clang diagnostic push

package/WebDriverAgentLib/Utilities/FBXPath.m

@@ -146,7 +146,8 @@ static NSString *const topNodeIndexPath = @"top";
     }
 
     if (rc >= 0) {
-      rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root]
+      [self waitUntilStableWithElement:root];
+      rc = [self xmlRepresentationWithRootElement:[self snapshotWithRoot:root useNative:NO]
                                            writer:writer
                                      elementStore:nil
                                             query:nil
@@ -196,17 +197,23 @@ static NSString *const topNodeIndexPath = @"top";
   int rc = xmlTextWriterStartDocument(writer, NULL, _UTF8Encoding, NULL);
   id<FBXCElementSnapshot> lookupScopeSnapshot = nil;
   id<FBXCElementSnapshot> contextRootSnapshot = nil;
+  BOOL useNativeSnapshot = nil == xpathQuery
+    ? NO
+    : [[self.class elementAttributesWithXPathQuery:xpathQuery] containsObject:FBHittableAttribute.class];
   if (rc < 0) {
     [FBLogger logFmt:@"Failed to invoke libxml2>xmlTextWriterStartDocument. Error code: %d", rc];
   } else {
+    [self waitUntilStableWithElement:root];
     if (FBConfiguration.limitXpathContextScope) {
-      lookupScopeSnapshot = [self snapshotWithRoot:root];
+      lookupScopeSnapshot = [self snapshotWithRoot:root useNative:useNativeSnapshot];
     } else {
       if ([root isKindOfClass:XCUIElement.class]) {
-        lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]];
+        lookupScopeSnapshot = [self snapshotWithRoot:[(XCUIElement *)root application]
+                                           useNative:useNativeSnapshot];
         contextRootSnapshot = [root isKindOfClass:XCUIApplication.class]
           ? nil
-          : ([(XCUIElement *)root lastSnapshot] ?: [(XCUIElement *)root fb_customSnapshot]);
+          : ([(XCUIElement *)root lastSnapshot] ?: [self snapshotWithRoot:(XCUIElement *)root
+                                                                useNative:useNativeSnapshot]);
       } else {
         lookupScopeSnapshot = (id<FBXCElementSnapshot>)root;
         contextRootSnapshot = nil == lookupScopeSnapshot.parent ? nil : (id<FBXCElementSnapshot>)root;
@@ -483,19 +490,29 @@ static NSString *const topNodeIndexPath = @"top";
 }
 
 + (id<FBXCElementSnapshot>)snapshotWithRoot:(id<FBElement>)root
+                                  useNative:(BOOL)useNative
 {
   if (![root isKindOfClass:XCUIElement.class]) {
     return (id<FBXCElementSnapshot>)root;
   }
 
-  // If the app is not idle state while we retrieve the visiblity state
-  // then the snapshot retrieval operation might freeze and time out
-  [[(XCUIElement *)root application] fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  if (useNative) {
+    return [(XCUIElement *)root fb_nativeSnapshot];
+  }
   return [root isKindOfClass:XCUIApplication.class]
     ? [(XCUIElement *)root fb_standardSnapshot]
     : [(XCUIElement *)root fb_customSnapshot];
 }
 
++ (void)waitUntilStableWithElement:(id<FBElement>)root
+{
+  if ([root isKindOfClass:XCUIElement.class]) {
+    // If the app is not idle state while we retrieve the visiblity state
+    // then the snapshot retrieval operation might freeze and time out
+    [[(XCUIElement *)root application] fb_waitUntilStableWithTimeout:FBConfiguration.animationCoolOffTimeout];
+  }
+}
+
 @end
 
 

package/WebDriverAgentLib/WebDriverAgentLib.h

@@ -15,6 +15,7 @@ FOUNDATION_EXPORT double WebDriverAgentLib_VersionNumber;
 //! Project version string for WebDriverAgentLib_.
 FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 
+#import <WebDriverAgentLib/CDStructures.h>
 #import <WebDriverAgentLib/FBAlert.h>
 #import <WebDriverAgentLib/FBCommandHandler.h>
 #import <WebDriverAgentLib/FBCommandStatus.h>
@@ -38,9 +39,17 @@ FOUNDATION_EXPORT const unsigned char WebDriverAgentLib_VersionString[];
 #import <WebDriverAgentLib/FBRuntimeUtils.h>
 #import <WebDriverAgentLib/FBSession.h>
 #import <WebDriverAgentLib/FBWebServer.h>
+#import <WebDriverAgentLib/FBXCElementSnapshot.h>
+#import <WebDriverAgentLib/FBXCElementSnapshotWrapper.h>
+#import <WebDriverAgentLib/FBXPath.h>
+#import <WebDriverAgentLib/WebDriverAgentLib.h>
+#import <WebDriverAgentLib/XCDebugLogDelegate-Protocol.h>
+#import <WebDriverAgentLib/XCTestCase.h>
+#import <WebDriverAgentLib/XCTIssue+FBPatcher.h>
 #import <WebDriverAgentLib/XCUIApplication+FBHelpers.h>
 #import <WebDriverAgentLib/XCUIDevice+FBHelpers.h>
 #import <WebDriverAgentLib/XCUIDevice+FBRotation.h>
+#import <WebDriverAgentLib/XCUIElement.h>
 #import <WebDriverAgentLib/XCUIElement+FBAccessibility.h>
 #import <WebDriverAgentLib/XCUIElement+FBFind.h>
 #import <WebDriverAgentLib/XCUIElement+FBIsVisible.h>

package/WebDriverAgentTests/IntegrationTests/FBElementAttributeTests.m

@@ -96,6 +96,52 @@
   XCTAssertEqual(element2.wdIndex, 0);
 }
 
+- (void)testAccessibilityTraits
+{
+  XCUIElement *button = self.testedApplication.buttons.firstMatch;
+  XCTAssertTrue(button.exists);
+  NSArray *buttonTraits = [button.wdTraits componentsSeparatedByString:@", "];
+  NSArray *expectedButtonTraits = @[@"Button"];
+  XCTAssertEqual(buttonTraits.count, expectedButtonTraits.count, @"Button should have exactly 1 trait");
+  XCTAssertEqualObjects(buttonTraits, expectedButtonTraits);
+  XCTAssertEqualObjects(button.wdType, @"XCUIElementTypeButton");
+  
+  XCUIElement *toggle = self.testedApplication.switches.firstMatch;
+  XCTAssertTrue(toggle.exists);
+  
+  // iOS 17.0 specific traits if available
+  NSArray *toggleTraits = [toggle.wdTraits componentsSeparatedByString:@", "];
+  NSArray *expectedToggleTraits;
+  
+  #if __clang_major__ >= 16
+  if (@available(iOS 17.0, *)) {
+    expectedToggleTraits = @[@"ToggleButton", @"Button"];
+    XCTAssertEqual(toggleTraits.count, 2, @"Toggle should have exactly 2 traits on iOS 17+");
+  }
+  #else
+  expectedToggleTraits = @[@"Button"];
+  XCTAssertEqual(toggleTraits.count, 1, @"Toggle should have exactly 1 trait on iOS < 17");
+  #endif
+  XCTAssertEqualObjects(toggleTraits, expectedToggleTraits);
+  XCTAssertEqualObjects(toggle.wdType, @"XCUIElementTypeSwitch");
+  
+  XCUIElement *slider = self.testedApplication.sliders.firstMatch;
+  XCTAssertTrue(slider.exists);
+  NSArray *sliderTraits = [slider.wdTraits componentsSeparatedByString:@", "];
+  NSArray *expectedSliderTraits = @[@"Adjustable"];
+  XCTAssertEqual(sliderTraits.count, expectedSliderTraits.count, @"Slider should have exactly 1 trait");
+  XCTAssertEqualObjects(sliderTraits, expectedSliderTraits);
+  XCTAssertEqualObjects(slider.wdType, @"XCUIElementTypeSlider");
+  
+  XCUIElement *picker = self.testedApplication.pickerWheels.firstMatch;
+  XCTAssertTrue(picker.exists);
+  NSArray *pickerTraits = [picker.wdTraits componentsSeparatedByString:@", "];
+  NSArray *expectedPickerTraits = @[@"Adjustable"];
+  XCTAssertEqual(pickerTraits.count, expectedPickerTraits.count, @"Picker should have exactly 1 trait");
+  XCTAssertEqualObjects(pickerTraits, expectedPickerTraits);
+  XCTAssertEqualObjects(picker.wdType, @"XCUIElementTypePickerWheel");
+}
+
 - (void)testTextFieldAttributes
 {
   XCUIElement *element = self.testedApplication.textFields[@"Value"];

package/WebDriverAgentTests/IntegrationTests/XCUIElementFBFindTests.m

@@ -461,4 +461,13 @@
   XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
 }
 
+- (void)testNonHittableDescendantWithXPathQuery
+{
+  NSArray<XCUIElement *> *matchingSnapshots = [self.testedApplication fb_descendantsMatchingXPathQuery:@"//XCUIElementTypeStaticText[@hittable='false']"
+                                                                           shouldReturnAfterFirstMatch:NO];
+  XCTAssertGreaterThan(matchingSnapshots.count, 1);
+  XCTAssertEqual(matchingSnapshots.lastObject.elementType, XCUIElementTypeStaticText);
+  XCTAssertFalse(matchingSnapshots.lastObject.fb_isVisible);
+}
+
 @end

package/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.h

@@ -28,6 +28,7 @@
 @property (nonatomic, strong, readwrite, nullable) NSString *wdValue;
 @property (nonatomic, readwrite, getter=isWDEnabled) BOOL wdEnabled;
 @property (nonatomic, readwrite, getter=isWDSelected) BOOL wdSelected;
+@property (nonatomic, readwrite, assign) CGRect wdNativeFrame;
 @property (nonatomic, readwrite) NSUInteger wdIndex;
 @property (nonatomic, readwrite, getter=isWDVisible) BOOL wdVisible;
 @property (nonatomic, readwrite, getter=isWDAccessible) BOOL wdAccessible;
@@ -37,6 +38,7 @@
 @property (copy, nonnull) NSArray *children;
 @property (nonatomic, readwrite, assign) XCUIElementType elementType;
 @property (nonatomic, readwrite, getter=isWDAccessibilityContainer) BOOL wdAccessibilityContainer;
+@property (nonatomic, copy, readwrite, nullable) NSString *wdTraits;
 
 - (void)resolve;
 - (id _Nonnull)fb_standardSnapshot;

package/WebDriverAgentTests/UnitTests/Doubles/XCUIElementDouble.m

@@ -19,11 +19,13 @@
 {
   self = [super init];
   if (self) {
-    self.wdFrame = CGRectMake(0, 0, 0, 0);
+    self.wdFrame = CGRectZero;
+    self.wdNativeFrame = CGRectZero;
     self.wdName = @"testName";
     self.wdLabel = @"testLabel";
     self.wdValue = @"magicValue";
     self.wdPlaceholderValue = @"testPlaceholderValue";
+    self.wdTraits = @"testTraits";
     self.wdVisible = YES;
     self.wdAccessible = YES;
     self.wdEnabled = YES;
@@ -94,4 +96,9 @@
   return self.wdUID;
 }
 
+- (NSString *)wdTraits
+{
+  return self.wdTraits;
+}
+
 @end

package/package.json

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