From 63ac589ded27ce86147ecd2aee1062093c4e2160 Mon Sep 17 00:00:00 2001
From: Mauro Romito <mauro.romito@element.io>
Date: Mon, 21 Jul 2025 13:46:30 +0200
Subject: [PATCH] improve a11y in room change role selection screen

---
 .../View/RoomChangeRolesScreenSelectedItem.swift       | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift b/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift
index 600eb9d71..4c0b7b9c1 100644
--- a/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift
+++ b/ElementX/Sources/Screens/RoomChangeRolesScreen/View/RoomChangeRolesScreenSelectedItem.swift
@@ -21,6 +21,10 @@ struct RoomChangeRolesScreenSelectedItem: View {
                 .foregroundColor(.compound.textPrimary)
                 .lineLimit(1)
         }
+        .accessibilityElement(children: .combine)
+        .accessibilityAction(named: L10n.actionDismiss) {
+            dismissAction()
+        }
     }
     
     // MARK: - Private
@@ -31,6 +35,7 @@ struct RoomChangeRolesScreenSelectedItem: View {
                             contentID: member.id,
                             avatarSize: .user(on: .inviteUsers),
                             mediaProvider: mediaProvider)
+            .accessibilityHidden(true)
             .overlay(alignment: .topTrailing) {
                 if member.role != .administrator {
                     Button(action: dismissAction) {
@@ -39,7 +44,12 @@ struct RoomChangeRolesScreenSelectedItem: View {
                             .scaledFrame(size: 20)
                             .symbolRenderingMode(.palette)
                             .foregroundStyle(Color.compound.iconOnSolidPrimary, Color.compound.iconPrimary)
+                            // Increase hit area
+                            .padding(.leading, 5)
+                            .padding(.bottom, 5)
                     }
+                    // We will use the accessibility action
+                    .accessibilityHidden(true)
                     .offset(x: 4)
                 }
             }