refactor: extract attribute block building logic into helper method

Moved the logic for constructing attribute blocks into a separate method
for clarity and future extensibility. Also replaced direct type checks
with a reusable fb_supportsPlaceholder helper on FBXCElementSnapshotWrapper.

Author: ikharebashviliGD

WebDriverAgentLib/Categories/FBXCElementSnapshotWrapper+Helpers.h

@@ -96,6 +96,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (nullable NSValue *)fb_hitPoint;
 
+/**
+ @return YES,  if the element type is one that supports placeholder text
+ */
+- (BOOL)fb_supportsPlaceholder;
+
 @end
 
 NS_ASSUME_NONNULL_END

WebDriverAgentLib/Categories/FBXCElementSnapshotWrapper+Helpers.m

@@ -162,6 +162,13 @@ - (NSValue *)fb_hitPoint
   return [NSValue valueWithCGPoint:result.hitPoint];
 }
 
+- (BOOL)fb_supportsPlaceholder {
+  XCUIElementType elementType = self.elementType;
+  return elementType == XCUIElementTypeTextField
+    || elementType == XCUIElementTypeSearchField
+    || elementType == XCUIElementTypeSecureTextField;
+}
+
 @end
 
 inline static BOOL isSnapshotTypeAmongstGivenTypes(id<FBXCElementSnapshot> snapshot, NSArray<NSNumber *> *types)

WebDriverAgentLib/Categories/XCUIApplication+FBHelpers.m

@@ -202,46 +202,11 @@ + (NSDictionary *)dictionaryForElement:(id<FBXCElementSnapshot>)snapshot
   info[@"label"] = FBValueOrNull(wrappedSnapshot.wdLabel);
   info[@"rect"] = wrappedSnapshot.wdRect;
 
-  // Define the base attribute blocks that apply to all elements.
-  NSDictionary<NSString *, NSString * (^)(void)> *baseAttributeBlocks = @{
-      FBExclusionAttributeFrame: ^{
-          return NSStringFromCGRect(wrappedSnapshot.wdFrame);
-      },
-      FBExclusionAttributeEnabled: ^{
-          return [@([wrappedSnapshot isWDEnabled]) stringValue];
-      },
-      FBExclusionAttributeVisible: ^{
-          return [@([wrappedSnapshot isWDVisible]) stringValue];
-      },
-      FBExclusionAttributeAccessible: ^{
-          return [@([wrappedSnapshot isWDAccessible]) stringValue];
-      },
-      FBExclusionAttributeFocused: ^{
-          return [@([wrappedSnapshot isWDFocused]) stringValue];
-      }
-  };
-  
-  NSMutableDictionary<NSString *, NSString *(^)(void)> *attributeBlocks;
-  
-  // Add placeholderValue only for elements where it is meaningful (e.g., text input fields).
-  switch (snapshot.elementType) {
-      case XCUIElementTypeTextField:
-      case XCUIElementTypeSecureTextField:
-      case XCUIElementTypeSearchField: {
-          // Copy base attributes to a mutable dictionary so we can add placeholderValue.
-          attributeBlocks = [baseAttributeBlocks mutableCopy];
-          attributeBlocks[FBExclusionAttributePlaceholderValue] = ^{
-            return (NSString *)FBValueOrNull(wrappedSnapshot.wdPlaceholderValue);
-        };
-          break;
-      }
-      default:
-          // Use the base attributes as-is if placeholderValue is not applicable.
-          attributeBlocks = [baseAttributeBlocks copy];
-          break;
-  }
+  NSMutableDictionary<NSString *, NSString *(^)(void)> *attributeBlocks = [self attributeBlockMapForSnapshot:snapshot
+                                                                                wrappedSnapshot:wrappedSnapshot];
 
-  NSSet *nonPrefixedKeys = [NSSet setWithObjects:FBExclusionAttributeFrame, FBExclusionAttributePlaceholderValue, nil];
+  NSSet *nonPrefixedKeys = [NSSet setWithObjects:FBExclusionAttributeFrame,
+                            FBExclusionAttributePlaceholderValue, nil];
 
   for (NSString *key in attributeBlocks) {
       if (excludedAttributes == nil || ![excludedAttributes containsObject:key]) {
@@ -272,6 +237,41 @@ + (NSDictionary *)dictionaryForElement:(id<FBXCElementSnapshot>)snapshot
   return info;
 }
 
+// Private helper that builds all attribute blocks for a given snapshot.
+// Includes both base attributes and any element-specific ones (e.g. placeholder for text inputs, etc.).
++ (NSMutableDictionary<NSString *, NSString *(^)(void)> *)attributeBlockMapForSnapshot:(id<FBXCElementSnapshot>)snapshot
+                                                                       wrappedSnapshot:(FBXCElementSnapshotWrapper *)wrappedSnapshot
+{
+  // Base attributes common to every element
+  NSMutableDictionary<NSString *, NSString *(^)(void)> *blocks =
+  [@{
+    FBExclusionAttributeFrame: ^{
+    return NSStringFromCGRect(wrappedSnapshot.wdFrame);
+  },
+    FBExclusionAttributeEnabled: ^{
+    return [@([wrappedSnapshot isWDEnabled]) stringValue];
+  },
+    FBExclusionAttributeVisible: ^{
+    return [@([wrappedSnapshot isWDVisible]) stringValue];
+  },
+    FBExclusionAttributeAccessible: ^{
+    return [@([wrappedSnapshot isWDAccessible]) stringValue];
+  },
+    FBExclusionAttributeFocused: ^{
+    return [@([wrappedSnapshot isWDFocused]) stringValue];
+  }
+  } mutableCopy];
+  
+  // Text-input placeholder (only for elements that support inner text)
+  if ([wrappedSnapshot fb_supportsPlaceholder]) {
+    blocks[FBExclusionAttributePlaceholderValue] = ^{
+      return (NSString *)FBValueOrNull(wrappedSnapshot.wdPlaceholderValue);
+    };
+  }
+  
+  return blocks;
+}
+
 + (NSDictionary *)accessibilityInfoForElement:(id<FBXCElementSnapshot>)snapshot
 {
   FBXCElementSnapshotWrapper *wrappedSnapshot = [FBXCElementSnapshotWrapper ensureWrapped:snapshot];