dandri/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2026-05-26 07:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Section: suppress hover on rows whose action is an inline control (switch/dropdown)

Browse Source 
sectionItemHover used to show on every row inside a section card. But
rows where the action is an inline control (switch via PreferenceToggle,
dropdown via ExposedDropDownSettingRow) are not "interactive as a row"
— the user has to hit the actual control, not the whole row. Showing
hover on the whole row was misleading.

Add `clickable: Boolean = true` param to sectionItemHover; suppress when
false. SectionItemView and SectionItemViewSpaceBetween pass
`clickable = click != null`. SectionItemViewLongClickable keeps the
default (its click is non-nullable, always interactive).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
another-simple-pixel
2026-05-16 11:46:41 -07:00
parent 8862e05b7f
commit f75bbf9059
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/Section.kt
+8 -6
View File
@@ -40,11 +40,13 @@ private val LocalInSectionCard = staticCompositionLocalOf { false }
// against the off-white LIGHT canvas (where the default 0.04-alpha ripple hover
// blends in). Click ripple is still provided by Modifier.clickable's own
// indication — this only handles the persistent hover overlay.
// `enabled = false` suppresses the hover state entirely (used for disabled
// items, which should not visually respond to hover).
// `enabled = false` suppresses hover for disabled items.
// `clickable = false` suppresses hover for rows whose action is an inline
// control (switch, dropdown) rather than navigating the whole row — those
// rows aren't "interactive as a whole", so hover feedback is misleading.
@Composable
private fun Modifier.sectionItemHover(enabled: Boolean = true): Modifier {
if (!enabled || !LocalInSectionCard.current) return this
private fun Modifier.sectionItemHover(enabled: Boolean = true, clickable: Boolean = true): Modifier {
if (!enabled || !clickable || !LocalInSectionCard.current) return this
val interactionSource = remember { MutableInteractionSource() }
val isHovered by interactionSource.collectIsHoveredAsState()
val hoverColor = if (isHovered) MaterialTheme.colors.onBackground.copy(alpha = 0.05f) else Color.Transparent
@@ -202,7 +204,7 @@ fun SectionItemView(
val modifier = Modifier
.fillMaxWidth()
.sizeIn(minHeight = minHeight)
.sectionItemHover(enabled = !disabled)
.sectionItemHover(enabled = !disabled, clickable = click != null)
.sectionItemDivider()
Row(
if (click == null || disabled) modifier.padding(padding) else modifier.clickable(onClick = click).padding(padding),
@@ -269,7 +271,7 @@ fun SectionItemViewSpaceBetween(
val modifier = Modifier
.fillMaxWidth()
.sizeIn(minHeight = minHeight)
.sectionItemHover(enabled = !disabled)
.sectionItemHover(enabled = !disabled, clickable = click != null)
.sectionItemDivider()
Row(
if (click == null || disabled) modifier.padding(padding).padding(vertical = DEFAULT_MIN_SECTION_ITEM_PADDING_VERTICAL) else modifier