DON-335: Additional changes

Author: yurareutskiy

Backpack-SwiftUI/AppSearchModal/Classes/AppSearchModalContentView.swift

@@ -45,6 +45,7 @@ struct AppSearchModalContentView: View {
         BPKSingleSelectChipGroup(
             chips: shortcuts.map({ BPKSingleSelectChipGroup.ChipItem( text: $0.text, icon: $0.icon) }),
             selectedIndex: .constant(nil),
+            accessibilityPrefix: "shortcuts",
             onItemClick: { shortcuts[$0].onShortcutSelected() }
         )
         .insetPadding(.horizontal, .base)
@@ -56,16 +57,20 @@ struct AppSearchModalContentView: View {
                 HStack {
                     BPKText(heading.title, style: .label1)
                         .accessibilityAddTraits(.isHeader)
+                        .accessibilityIdentifier("\(section.accessibilityPrefix)-header-text")
                     Spacer()
                     if let action = heading.action {
                         BPKButton(action.text, action: action.onActionSelected)
                             .buttonStyle(.link)
+                            .accessibilityIdentifier("\(section.accessibilityPrefix)-header-action")
                     }
                 }
                 .padding(.horizontal, .base)
             }
-            ForEach(section.items, id: \.self) { item in
-                ItemCell(item: item)
+            ForEach(Array(section.items.enumerated()), id: \.element) { index, item in
+                ItemCell(
+                    item: item,
+                    accessibilityID: itemAccessibilityID(prefix: section.accessibilityPrefix, index: index))
             }
         }
     }
@@ -75,6 +80,8 @@ struct AppSearchModalContentView: View {
 
         let item: BPKAppSearchModalContent.Item
 
+        let accessibilityID: String
+        
         var body: some View {
             Button(action: item.onItemSelected) {
                 HStack(spacing: .base) {
@@ -100,6 +107,7 @@ struct AppSearchModalContentView: View {
                 .contentShape(Rectangle())
             }
             .buttonStyle(ItemCellButtonStyle())
+            .accessibilityIdentifier(accessibilityID)
         }
 
         private func subtitleLineLimit() -> Int? {
@@ -117,6 +125,10 @@ struct AppSearchModalContentView: View {
                 .background(configuration.isPressed ? .canvasContrastColor : .canvasContrastColor.withAlphaComponent(0))
         }
     }
+        
+    private func itemAccessibilityID(prefix: String, index: Int) -> String {
+        return "\(prefix.trimmingCharacters(in: .whitespacesAndNewlines))-\(index)"
+    }
 }
 
 struct AppSearchModalContentView_Previews: PreviewProvider {
@@ -130,7 +142,8 @@ struct AppSearchModalContentView_Previews: PreviewProvider {
     static func buildSection(with index: Int) -> BPKAppSearchModalContent.Section {
         return .init(
             heading: .init(title: "Section \(index + 1)", action: .init(text: "Action", onActionSelected: { })),
-            items: (0..<3).map(buildItem)
+            items: (0..<3).map(buildItem),
+            accessibilityPrefix: "section-\(index)"
         )
     }
 

Backpack-SwiftUI/AppSearchModal/Classes/BPKAppSearchModal.swift

@@ -161,7 +161,7 @@ struct BPKAppSearchModal_Previews: PreviewProvider {
     static func buildSection(with index: Int) -> BPKAppSearchModalContent.Section {
         return .init(
             heading: .init(title: "Section \(index + 1)", action: .init(text: "Action", onActionSelected: { })),
-            items: (0..<1).map(buildItem)
+            items: (0..<1).map(buildItem), accessibilityPrefix: "section-\(index)"
         )
     }
 

Backpack-SwiftUI/AppSearchModal/Classes/BPKAppSearchModalResults.swift

@@ -48,10 +48,16 @@ public struct BPKAppSearchModalContent: Equatable {
     public struct Section: Hashable {
         let heading: SectionHeading?
         let items: [Item]
-        
-        public init(heading: SectionHeading?, items: [Item]) {
+        let accessibilityPrefix: String
+
+        public init(
+            heading: SectionHeading?,
+            items: [Item],
+            accessibilityPrefix: String
+        ) {
             self.heading = heading
             self.items = items
+            self.accessibilityPrefix = accessibilityPrefix
         }
     }
 

Backpack-SwiftUI/ChipGroup/Classes/BPKSingleSelectChipGroup.swift

@@ -25,6 +25,7 @@ public struct BPKSingleSelectChipGroup: View {
     private let type: BPKChipGroupType
     private let onItemClick: (_ index: Int) -> Void
     private var insetSpacing: (Edge.Set, BPKSpacing)
+    private var accessibilityPrefix: String
 
     @Binding private var selectedIndex: Int?
 
@@ -33,13 +34,15 @@ public struct BPKSingleSelectChipGroup: View {
         style: BPKChipStyle = .default,
         selectedIndex: Binding<Int?>,
         type: BPKChipGroupType = .rail,
+        accessibilityPrefix: String? = nil,
         onItemClick: @escaping (_ index: Int) -> Void
     ) {
         self.chips = chips
         self.style = style
         self._selectedIndex = selectedIndex
         self.type = type
         self.insetSpacing = (.all, .none)
+        self.accessibilityPrefix = accessibilityPrefix ?? "chipgroup"
         self.onItemClick = onItemClick
     }
 
@@ -81,6 +84,12 @@ public struct BPKSingleSelectChipGroup: View {
             selectedIndex = index
             onItemClick(index)
         }
+        .accessibilityIdentifier(formAccessibilityIdentifier(for: index))
+    }
+    
+    private func formAccessibilityIdentifier(for index: Int) -> String {
+        let identifier = [accessibilityPrefix, "chip", String(index)].compactMap({ $0 }).joined(separator: "-")
+        return identifier
     }
 }
 

Backpack-SwiftUI/Tests/AppSearchModal/BPKAppSearchModalTests.swift

@@ -98,14 +98,19 @@ class BPKAppSearchModalTests: XCTestCase {
     private func givenContentState() -> BPKAppSearchModalContent {
         return .init(
             sections: [
-                .init(heading: nil, items: [buildItem(with: 0)]),
-                .init(heading: .init(title: "Section 2", action: nil), items: (0..<3).map(buildItem)),
+                .init(heading: nil, items: [buildItem(with: 0)], accessibilityPrefix: "Section 1"),
+                .init(
+                    heading: .init(title: "Section 2", action: nil),
+                    items: (0..<3).map(buildItem),
+                    accessibilityPrefix: "Section 2"
+                ),
                 .init(
                     heading: .init(
                         title: "Section 3",
                         action: .init(text: "Action", onActionSelected: { })
                     ),
-                    items: (0..<3).map(buildItem)
+                    items: (0..<3).map(buildItem),
+                    accessibilityPrefix: "Section 3"
                 )
             ],
             shortcuts: (0..<4).map(buildShortcut)

Example/Backpack/SwiftUI/Components/AppSearchModal/AppSearchModalExampleView.swift

@@ -94,7 +94,7 @@ struct AppSearchModalExampleView: View {
                     }
                 )
             ),
-            items: (0..<3).map { buildItem(with: $0, section: index) }
+            items: (0..<3).map { buildItem(with: $0, section: index) }, accessibilityPrefix: "section-\(index)"
         )
     }