From 4361182b0ea00f35bd1002c3f9f4c3dbe5f6a9d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Resul=20=C3=96v=C3=BCr?= <92828257+ovurrsl@users.noreply.github.com> Date: Thu, 22 Oct 2026 16:35:11 +0300 Subject: [PATCH] fix(ui): stop touch-blocking dialog and drawer containers from merging descendant semantics (#1145) Co-authored-by: ovurrsl --- .../com/droiddeck/launcher/ui/AddAppDialog.kt | 4 +- .../droiddeck/launcher/ui/SessionLoading.kt | 5 +-- .../droiddeck/launcher/ui/SessionOverlay.kt | 16 ++++--- .../droiddeck/launcher/ui/SettingsWidgets.kt | 7 ++++ .../launcher/ui/StoreAchievementsUi.kt | 4 +- .../launcher/ui/DialogSemanticsTest.kt | 42 +++++++++++++++++++ 6 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt diff --git a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt index ccd7fd05e3..bee26dd0dc 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/AddAppDialog.kt @@ -315,7 +315,7 @@ internal fun AppDialog( Box( contentAlignment = Alignment.Center, modifier = Modifier.fillMaxSize().imePadding() - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = close), + .tapOutside(close), ) { AnimatedVisibility( visibleState = shown, @@ -340,7 +340,7 @@ internal fun AppDialog( .clip(Shape16) .background(pal.surfaceVariant.copy(alpha = 0.97f)) .border(1.dp, pal.signal.copy(alpha = 0.22f), Shape16) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} + .blockTouches() .controllerBack(back ?: close) .then(modifier) .then(if (scrollable) Modifier.verticalScroll(rememberScrollState()) else Modifier) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt index 38bbb76cf9..4a0adea2d4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionLoading.kt @@ -221,7 +221,7 @@ fun LoadingOverlay( modifier = Modifier .fillMaxSize() .background(colors.background) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {}, + .blockTouches(), ) { CapsuleWall(games, driftMs = 65_000, modifier = Modifier.alpha(0.3f)) Box( @@ -350,7 +350,6 @@ private fun CancelHint(onCancel: () -> Unit, modifier: Modifier = Modifier) { fun SessionPausedOverlay(title: String = stringResource(R.string.load_steam_paused), onResume: () -> Unit) { val colors = MaterialTheme.colorScheme val pal = LocalPalette.current - val interactionSource = remember { MutableInteractionSource() } val resumeFocus = remember { FocusRequester() } LaunchedEffect(Unit) { androidx.compose.runtime.withFrameNanos { } @@ -360,7 +359,7 @@ fun SessionPausedOverlay(title: String = stringResource(R.string.load_steam_paus modifier = Modifier .fillMaxSize() .background(pal.background.copy(alpha = 0.94f)) - .clickable(interactionSource = interactionSource, indication = null) {}, + .blockTouches(), contentAlignment = Alignment.Center, ) { Column( diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt index d32e1e3ea4..ef55dd2882 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SessionOverlay.kt @@ -103,6 +103,7 @@ import androidx.compose.animation.slideOutHorizontally import androidx.compose.foundation.LocalIndication import androidx.compose.foundation.border import androidx.compose.foundation.focusable +import androidx.compose.ui.focus.focusProperties import androidx.compose.foundation.hoverable import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState @@ -384,10 +385,15 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont focus.request(first) } } - if (open || veil > 0.01f) Box( - modifier = Modifier.fillMaxSize() - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) { host.open = null; a.onClose() }, - ) + if (open || veil > 0.01f) { + val closeLabel = stringResource(R.string.common_close) + Box( + modifier = Modifier.fillMaxSize() + .focusProperties { canFocus = false } + .semantics { contentDescription = closeLabel } + .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClickLabel = closeLabel) { host.open = null; a.onClose() }, + ) + } androidx.compose.foundation.layout.BoxWithConstraints(modifier = Modifier.fillMaxSize().exposeTestTags(), contentAlignment = Alignment.CenterEnd) { val short = maxHeight < 440.dp val sheetWidth = minOf(360.dp, maxWidth * 0.92f) @@ -401,7 +407,7 @@ internal fun SessionDrawer(open: Boolean, requestedPage: SessionDrawerPage, cont modifier = Modifier .fillMaxSize() .background(pal.background.copy(alpha = 0.97f)) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} + .blockTouches() .focusGroup() .controllerBack { if (host.open != null) host.open = null else a.onClose() diff --git a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt index 87fa58ace4..40619ee940 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/SettingsWidgets.kt @@ -34,7 +34,9 @@ import androidx.compose.foundation.Canvas import androidx.compose.foundation.background import androidx.compose.foundation.border import androidx.compose.foundation.clickable +import androidx.compose.foundation.gestures.detectTapGestures import androidx.compose.foundation.hoverable +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.foundation.interaction.MutableInteractionSource import androidx.compose.foundation.interaction.collectIsFocusedAsState import androidx.compose.foundation.interaction.collectIsHoveredAsState @@ -141,6 +143,11 @@ internal fun Modifier.controllerBack(onBack: () -> Unit): Modifier = onPreviewKe } } +internal fun Modifier.blockTouches(): Modifier = pointerInput(Unit) { detectTapGestures { } } + +internal fun Modifier.tapOutside(onTap: () -> Unit): Modifier = + pointerInput(onTap) { detectTapGestures(onTap = { onTap() }) } + internal fun Modifier.bumpers(onPrevious: () -> Unit, onNext: () -> Unit): Modifier = onPreviewKeyEvent { event -> val keyEvent = event.nativeKeyEvent val previous = keyEvent.keyCode == KeyEvent.KEYCODE_BUTTON_L1 diff --git a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt index e0d5099a74..4f71f68b38 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/StoreAchievementsUi.kt @@ -303,7 +303,7 @@ internal fun SessionAchievementsPanel(label: String, state: AchievementsState, t val slide = remember { MutableTransitionState(false).apply { targetState = true } } BoxWithConstraints( Modifier.fillMaxSize().background(veil) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null, onClick = onClose), + .tapOutside(onClose), contentAlignment = Alignment.CenterEnd, ) { val short = maxHeight < 440.dp @@ -312,7 +312,7 @@ internal fun SessionAchievementsPanel(label: String, state: AchievementsState, t (if (floating) Modifier.padding(12.dp).fillMaxHeight().width(minOf(420.dp, maxWidth * 0.92f)).clip(RoundedCornerShape(20.dp)) .background(pal.background).border(1.dp, pal.line2, RoundedCornerShape(20.dp)) else Modifier.fillMaxHeight().width(minOf(420.dp, maxWidth * 0.92f)).background(pal.background.copy(alpha = 0.97f))) - .clickable(interactionSource = remember { MutableInteractionSource() }, indication = null) {} + .blockTouches() .controllerBack(onClose) .then(if (kinds.isEmpty()) Modifier else Modifier.bumpers({ pick = (pick + kinds.size - 1) % kinds.size }, { pick = (pick + 1) % kinds.size })) .padding(if (short) 12.dp else 16.dp), diff --git a/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt new file mode 100644 index 0000000000..c08c0f2341 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/DialogSemanticsTest.kt @@ -0,0 +1,42 @@ +package com.droiddeck.launcher.ui + +import androidx.compose.animation.core.MutableTransitionState +import androidx.compose.material3.Text +import androidx.compose.runtime.remember +import androidx.compose.ui.test.assertHasNoClickAction +import androidx.compose.ui.test.onNodeWithText +import androidx.compose.ui.test.performClick +import org.junit.Assert.assertEquals +import org.junit.Rule +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@RunWith(RobolectricTestRunner::class) +@Config(sdk = [28]) +class DialogSemanticsTest { + @get:Rule val compose = createRobolectricComposeRule() + + @Test fun dialogTextNodesStaySeparateAndNonClickableInMergedSemanticsTree() { + var closed = 0 + compose.setContent { + DroidDeckTheme { + val shown = remember { MutableTransitionState(true) } + AppDialog(shown = shown, close = { closed++ }, label = "testDialog", wide = false) { + Text("Dialog Title") + Text("Dialog Hint") + Text("Body Copy") + } + } + } + compose.onNodeWithText("Dialog Title").assertExists().assertHasNoClickAction() + compose.onNodeWithText("Dialog Hint").assertExists().assertHasNoClickAction() + compose.onNodeWithText("Body Copy").assertExists().assertHasNoClickAction() + + compose.onNodeWithText("Dialog Title").performClick() + compose.onNodeWithText("Body Copy").performClick() + compose.waitForIdle() + assertEquals(0, closed) + } +}