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

Jump to bottom

Desktop. Don't use AccessibleRole.PANEL for root/unknown nodes (fixes issues on Windows) #885

Merged
merged 4 commits into from
Oct 20, 2023
Merged

Desktop. Don't use AccessibleRole.PANEL for root/unknown nodes (fixes issues on Windows) #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
436b34a
Remove Panel accessible role from the root node, and unknown nodes (f…
igordmn Oct 19, 2023
2f4e889
A test
igordmn Oct 20, 2023
e1d1694
Discussions
igordmn Oct 20, 2023
414d878
Discussions
igordmn Oct 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/ComposeAccessible.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,13 @@ internal class ComposeAccessible(
val progressBarRangeInfo
get() = semanticsNode.config.getOrNull(SemanticsProperties.ProgressBarRangeInfo)

val isContainer
@Suppress("DEPRECATION")
get() = semanticsNode.config.getOrNull(SemanticsProperties.IsContainer)

val isTraversalGroup
get() = semanticsNode.config.getOrNull(SemanticsProperties.IsTraversalGroup)

private fun makeScrollbarChild(
vertical: Boolean
): Accessible {
Expand Down Expand Up @@ -402,7 +409,9 @@ internal class ComposeAccessible(
setText != null -> AccessibleRole.TEXT
text != null -> AccessibleRole.LABEL
progressBarRangeInfo != null -> AccessibleRole.PROGRESS_BAR
else -> AccessibleRole.PANEL
isContainer != null -> AccessibleRole.GROUP_BOX
isTraversalGroup != null -> AccessibleRole.GROUP_BOX
else -> AccessibleRole.UNKNOWN
}
}

Expand Down
2 changes: 1 addition & 1 deletion compose/ui/ui/src/desktopMain/kotlin/androidx/compose/ui/platform/ComposeSceneAccessible.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ internal class ComposeSceneAccessible(
}

override fun getAccessibleRole(): AccessibleRole {
return AccessibleRole.PANEL
return AccessibleRole.UNKNOWN
}

override fun getAccessibleStateSet(): AccessibleStateSet {
Expand Down
45 changes: 44 additions & 1 deletion compose/ui/ui/src/desktopTest/kotlin/androidx/compose/ui/platform/AccessibilityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package androidx.compose.ui.platform

import androidx.compose.foundation.layout.Box
import androidx.compose.material.Button
import androidx.compose.material.LinearProgressIndicator
import androidx.compose.material.Tab
Expand All @@ -25,6 +26,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.assertThat
import androidx.compose.ui.isEqualTo
import androidx.compose.ui.semantics.Role
import androidx.compose.ui.semantics.isContainer
import androidx.compose.ui.semantics.isTraversalGroup
import androidx.compose.ui.semantics.role
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.test.SemanticsNodeInteraction
Expand Down Expand Up @@ -126,9 +129,49 @@ class AccessibilityTest {
}
}

@Test
fun boxHasUnknownRole() {
rule.setContent {
Box(Modifier.testTag("box"))
}

rule.onNodeWithTag("box").apply {
val context = ComposeAccessible(fetchSemanticsNode()).accessibleContext!!
assertThat(context.accessibleRole).isEqualTo(AccessibleRole.UNKNOWN)
}
}

@Suppress("DEPRECATION")
@Test
fun containerHasGroupRole() {
rule.setContent {
Box(Modifier.testTag("box").semantics {
isContainer = true
})
}

rule.onNodeWithTag("box").apply {
val context = ComposeAccessible(fetchSemanticsNode()).accessibleContext!!
assertThat(context.accessibleRole).isEqualTo(AccessibleRole.GROUP_BOX)
}
}

@Test
fun traversalGroupHasGroupRole() {
rule.setContent {
Box(Modifier.testTag("box").semantics {
isTraversalGroup = true
})
}

rule.onNodeWithTag("box").apply {
val context = ComposeAccessible(fetchSemanticsNode()).accessibleContext!!
assertThat(context.accessibleRole).isEqualTo(AccessibleRole.GROUP_BOX)
}
}

private fun SemanticsNodeInteraction.assertHasAccessibleRole(role: AccessibleRole) {
val accessibleContext = ComposeAccessible(fetchSemanticsNode()).accessibleContext!!
assertThat(accessibleContext.accessibleRole).isEqualTo(role)
}

}