Skip to content

Commit 885cd2e

Browse files
committed
Use hideFromAccessibility() for decorative attachment-picker children
Replaces empty-block clearAndSetSemantics {} on the picker checkmark/radio icons, the video duration badge, and the file-type label with the more intent-revealing semantics { hideFromAccessibility() }. Non-empty clearAndSetSemantics {…} sites that replace semantics with a clean set are left as-is — hideFromAccessibility() would hide the node entirely.
1 parent 2e270e1 commit 885cd2e

3 files changed

Lines changed: 9 additions & 8 deletions

File tree

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/files/FileTypeIcon.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ import androidx.compose.ui.Alignment
3131
import androidx.compose.ui.Modifier
3232
import androidx.compose.ui.platform.LocalDensity
3333
import androidx.compose.ui.res.painterResource
34-
import androidx.compose.ui.semantics.clearAndSetSemantics
34+
import androidx.compose.ui.semantics.hideFromAccessibility
35+
import androidx.compose.ui.semantics.semantics
3536
import androidx.compose.ui.text.font.FontWeight
3637
import androidx.compose.ui.tooling.preview.Preview
3738
import androidx.compose.ui.unit.dp
@@ -59,7 +60,7 @@ internal fun FileTypeIcon(data: FileIconData, modifier: Modifier = Modifier) {
5960
color = StreamPrimitiveColors.baseWhite,
6061
modifier = Modifier
6162
.padding(bottom = 4.dp)
62-
.clearAndSetSemantics {},
63+
.semantics { hideFromAccessibility() },
6364
)
6465
}
6566
}

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/files/FilesPicker.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import androidx.compose.ui.platform.testTag
3535
import androidx.compose.ui.res.painterResource
3636
import androidx.compose.ui.res.stringResource
3737
import androidx.compose.ui.semantics.Role
38-
import androidx.compose.ui.semantics.clearAndSetSemantics
38+
import androidx.compose.ui.semantics.hideFromAccessibility
3939
import androidx.compose.ui.semantics.role
4040
import androidx.compose.ui.semantics.selected
4141
import androidx.compose.ui.semantics.semantics
@@ -174,13 +174,13 @@ internal fun DefaultFilesPickerItem(
174174

175175
if (allowMultipleSelection) {
176176
RadioCheck(
177-
modifier = Modifier.clearAndSetSemantics {},
177+
modifier = Modifier.semantics { hideFromAccessibility() },
178178
checked = fileItem.isSelected,
179179
onCheckedChange = null,
180180
)
181181
} else {
182182
RadioButton(
183-
modifier = Modifier.clearAndSetSemantics {},
183+
modifier = Modifier.semantics { hideFromAccessibility() },
184184
checked = fileItem.isSelected,
185185
onCheckedChange = null,
186186
)

stream-chat-android-compose/src/main/java/io/getstream/chat/android/compose/ui/components/attachments/images/ImagesPicker.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import androidx.compose.ui.platform.testTag
3939
import androidx.compose.ui.res.painterResource
4040
import androidx.compose.ui.res.stringResource
4141
import androidx.compose.ui.semantics.Role
42-
import androidx.compose.ui.semantics.clearAndSetSemantics
4342
import androidx.compose.ui.semantics.contentDescription
43+
import androidx.compose.ui.semantics.hideFromAccessibility
4444
import androidx.compose.ui.semantics.role
4545
import androidx.compose.ui.semantics.selected
4646
import androidx.compose.ui.semantics.semantics
@@ -171,7 +171,7 @@ internal fun DefaultImagesPickerItem(
171171
modifier = Modifier
172172
.align(Alignment.TopEnd)
173173
.padding(StreamTokens.spacingXs)
174-
.clearAndSetSemantics {},
174+
.semantics { hideFromAccessibility() },
175175
borderColor = ChatTheme.colors.borderCoreOnAccent,
176176
checked = imageItem.isSelected,
177177
onCheckedChange = null,
@@ -182,7 +182,7 @@ internal fun DefaultImagesPickerItem(
182182
modifier = Modifier
183183
.align(Alignment.BottomStart)
184184
.padding(StreamTokens.spacingXs)
185-
.clearAndSetSemantics {},
185+
.semantics { hideFromAccessibility() },
186186
durationInSeconds = attachmentMetaData.videoLength,
187187
)
188188
}

0 commit comments

Comments
 (0)