From 99427102079ac41e3799322f5dfc796bb9ec3432 Mon Sep 17 00:00:00 2001 From: Marco Romano Date: Thu, 24 Aug 2023 17:11:13 +0200 Subject: [PATCH] ListItem: Don't apply clickable modifier if onClick is null. (#1146) If it is applied but disabled (like before this PR) it will hijack all touch input from the view and no other component in it can respond to clicks. --- .../android/libraries/designsystem/theme/components/ListItem.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt index 6be9089d11..f51414307a 100644 --- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt +++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/ListItem.kt @@ -119,7 +119,7 @@ fun ListItem( androidx.compose.material3.ListItem( headlineContent = decoratedHeadlineContent, - modifier = Modifier.clickable(enabled = enabled && onClick != null, onClick = onClick ?: {}).then(modifier), + modifier = if (onClick != null) Modifier.clickable(enabled = enabled, onClick = onClick).then(modifier) else modifier, overlineContent = null, supportingContent = decoratedSupportingContent, leadingContent = decoratedLeadingContent,