Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix accessibility for dialogs #1678

Merged
merged 10 commits into from
Nov 6, 2024
Merged

Fix accessibility for dialogs #1678

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
72ab304
Fix accessibility layout reading for dialogs
ASalavei Nov 4, 2024
8ce1516
Revert platform insets usage
ASalavei Nov 4, 2024
a9384ee
Fix compilation
ASalavei Nov 4, 2024
ac851bd
Revert changes in Dialog, add delay to accessibility sync
ASalavei Nov 4, 2024
91f3750
Update messaging
ASalavei Nov 4, 2024
d6049ba
Update messaging
ASalavei Nov 4, 2024
90b1769
Add parameter label
ASalavei Nov 5, 2024
dab49bf
Add extra semantic tree reload
ASalavei Nov 5, 2024
a0daaae
Add extra semantic tree reload
ASalavei Nov 6, 2024
acc1fb8
Remove delay
ASalavei Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions compose/ui/ui/src/skikoMain/kotlin/androidx/compose/ui/window/Dialog.skiko.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@ package androidx.compose.ui.window
import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.setValue
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.BlendMode
Expand All @@ -32,6 +34,7 @@ import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.type
import androidx.compose.ui.input.pointer.PointerButton
import androidx.compose.ui.input.pointer.PointerEventType
import androidx.compose.ui.layout.EmptyLayout
import androidx.compose.ui.layout.Layout
import androidx.compose.ui.platform.LocalWindowInfo
import androidx.compose.ui.platform.PlatformInsets
Expand Down Expand Up @@ -193,6 +196,11 @@ private fun DialogLayout(
) {
val currentContent by rememberUpdatedState(content)

// HACK: The solution is taken from the popup implementation.
// Make the dialogue content reload a second time so that it can be indexed properly for accessibility.
var layoutParentBoundsInWindow: IntRect? by remember { mutableStateOf(null) }
EmptyLayout(Modifier.parentBoundsInWindow { layoutParentBoundsInWindow = it })
MatkovIvan marked this conversation as resolved.
Show resolved Hide resolved

val layer = rememberComposeSceneLayer(
focusable = true
)
Expand All @@ -201,12 +209,14 @@ private fun DialogLayout(
layer.setOutsidePointerEventListener(onOutsidePointerEvent)
layer.Content {
val platformInsets = properties.platformInsets
val parentBoundsInWindow = layoutParentBoundsInWindow ?: return@Content
val containerSize = LocalWindowInfo.current.containerSize
val measurePolicy = rememberDialogMeasurePolicy(
layer = layer,
properties = properties,
containerSize = containerSize,
platformInsets = platformInsets
platformInsets = platformInsets,
parentBoundsInWindow = parentBoundsInWindow
)
PlatformInsetsConfig.excludeInsets(
safeInsets = properties.usePlatformInsets,
Expand Down Expand Up @@ -241,8 +251,9 @@ private fun rememberDialogMeasurePolicy(
layer: ComposeSceneLayer,
properties: DialogProperties,
containerSize: IntSize,
platformInsets: PlatformInsets
) = remember(layer, properties, containerSize, platformInsets) {
platformInsets: PlatformInsets,
parentBoundsInWindow: IntRect
) = remember(layer, properties, containerSize, platformInsets, parentBoundsInWindow) {
RootMeasurePolicy(
platformInsets = platformInsets,
usePlatformDefaultWidth = properties.usePlatformDefaultWidth
Expand Down
Loading