diff --git a/packages/react-native/ReactAndroid/api/ReactAndroid.api b/packages/react-native/ReactAndroid/api/ReactAndroid.api index f05157f9262..4d0e582d353 100644 --- a/packages/react-native/ReactAndroid/api/ReactAndroid.api +++ b/packages/react-native/ReactAndroid/api/ReactAndroid.api @@ -3630,6 +3630,7 @@ public final class com/facebook/react/uimanager/ReactAccessibilityDelegate$Acces public static final field SUMMARY Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; public static final field SWITCH Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; public static final field TAB Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; + public static final field TABBAR Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; public static final field TABLIST Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; public static final field TEXT Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; public static final field TIMER Lcom/facebook/react/uimanager/ReactAccessibilityDelegate$AccessibilityRole; diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt index c56a5201e91..e6c12f6368e 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.kt @@ -437,6 +437,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac SPINBUTTON, SWITCH, TAB, + TABBAR, TABLIST, TIMER, LIST, @@ -491,6 +492,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac RADIOGROUP, SCROLLBAR, TAB, + TABBAR, TABLIST, TIMER, TOOLBAR -> "android.view.View" diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt index 8b7c303bdf7..30d16023d7e 100644 --- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt +++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/ReactAccessibilityDelegateTest.kt @@ -347,6 +347,15 @@ class ReactAccessibilityDelegateTest { assertThat(view.getTag(R.id.accessibility_state_expanded)).isEqualTo(true) } + @Test + fun testAccessibilityRole_fromValue_tabbar_resolvesInsteadOfThrowing() { + val role = ReactAccessibilityDelegate.AccessibilityRole.fromValue("tabbar") + + assertThat(role).isEqualTo(ReactAccessibilityDelegate.AccessibilityRole.TABBAR) + assertThat(ReactAccessibilityDelegate.AccessibilityRole.getValue(role)) + .isEqualTo("android.view.View") + } + @Test fun testPerformAccessibilityAction_collapseAction_fromAccessibilityActions() { val accessibilityActions = JavaOnlyArray()