From b626e55a24e6ca226dd2027503d9cd93b8a3b34f Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 9 Jul 2025 16:47:23 +0200
Subject: [PATCH] [a11y] Make SelectedUser more accessible by grouping the text
 and the action to remove.

https://github.com/element-hq/customer-success/issues/566
---
 .../matrix/ui/components/SelectedUser.kt        | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
index 31cc724838..ad36ef9ced 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/SelectedUser.kt
@@ -23,6 +23,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.clearAndSetSemantics
+import androidx.compose.ui.semantics.contentDescription
+import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -48,9 +51,21 @@ fun SelectedUser(
     onUserRemove: (MatrixUser) -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val actionRemove = stringResource(id = CommonStrings.action_remove)
     Box(
         modifier = modifier
             .width(AvatarSize.SelectedUser.dp)
+            .clearAndSetSemantics {
+                contentDescription = matrixUser.getBestName()
+                if (canRemove) {
+                    // Note: this does not set the click effect to the whole Box
+                    // when talkback is not enabled
+                    onClick(
+                        label = actionRemove,
+                        action = { onUserRemove(matrixUser); true }
+                    )
+                }
+            }
     ) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
@@ -83,7 +98,7 @@ fun SelectedUser(
             ) {
                 Icon(
                     imageVector = CompoundIcons.Close(),
-                    contentDescription = stringResource(id = CommonStrings.action_remove),
+                    contentDescription = null,
                     tint = ElementTheme.colors.iconOnSolidPrimary,
                     modifier = Modifier.padding(2.dp)
                 )