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

Implement Role.DropdownList via AccessibleRole.COMBO_BOX #822

Merged
merged 1 commit into from
Sep 18, 2023
Merged

Implement Role.DropdownList via AccessibleRole.COMBO_BOX #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions 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 @@ -388,6 +388,7 @@ internal class ComposeAccessible(
Role.Checkbox -> AccessibleRole.CHECK_BOX
Role.RadioButton -> AccessibleRole.RADIO_BUTTON
Role.Tab -> AccessibleRole.PAGE_TAB
Role.DropdownList -> AccessibleRole.COMBO_BOX
igordmn marked this conversation as resolved.
Show resolved Hide resolved
else -> null
// ?
// Role.Switch ->
Expand Down
31 changes: 27 additions & 4 deletions 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,12 +16,17 @@

package androidx.compose.ui.platform

import androidx.compose.material.Button
import androidx.compose.material.Tab
import androidx.compose.material.TabRow
import androidx.compose.material.Text
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.role
import androidx.compose.ui.semantics.semantics
import androidx.compose.ui.test.SemanticsNodeInteraction
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.compose.ui.test.onNodeWithTag
import javax.accessibility.AccessibleRole
Expand Down Expand Up @@ -75,10 +80,28 @@ class AccessibilityTest {
}
}

val node = rule.onNodeWithTag("tab").fetchSemanticsNode()
val accessibleNode = ComposeAccessible(node)
assertThat(accessibleNode.accessibleContext.accessibleRole)
.isEqualTo(AccessibleRole.PAGE_TAB)
rule.onNodeWithTag("tab").assertHasAccessibleRole(AccessibleRole.PAGE_TAB)
}

@Test
fun dropDownListRoleTranslatesToComboBoxAccessibleRole() {
rule.setContent {
Button(
modifier = Modifier
.semantics { role = Role.DropdownList }
.testTag("button"),
onClick = { }
) {
Text("Button")
}
}

rule.onNodeWithTag("button").assertHasAccessibleRole(AccessibleRole.COMBO_BOX)
}

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

}