Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,11 @@ export type AccessibilityActionName =
* Generated when a screen reader user decrements an adjustable component.
*/
| 'decrement'
/**
* Generated when an accessibility service sets an adjustable component to a specific value.
* @platform android
*/
| 'setProgress'
/**
* Generated when a TalkBack user places accessibility focus on the component and double taps and holds one finger on the screen.
* @platform android
Expand All @@ -162,7 +167,7 @@ export type AccessibilityActionInfo = Readonly<{

// The info included in the event sent to onAccessibilityAction
export type AccessibilityActionEvent = NativeSyntheticEvent<
Readonly<{actionName: string, ...}>,
Readonly<{actionName: string, value?: number, ...}>,
>;

export type AccessibilityState = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import android.os.Message
import android.view.View
import android.view.ViewGroup
import android.view.accessibility.AccessibilityEvent
import android.view.accessibility.AccessibilityNodeInfo
import android.widget.EditText
import androidx.core.view.ViewCompat
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
Expand Down Expand Up @@ -227,6 +228,15 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
if (accessibilityActionsMap.containsKey(action)) {
val eventData = createMap()
eventData.putString("actionName", accessibilityActionsMap[action])
if (
action == AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS.id &&
args?.containsKey(AccessibilityNodeInfo.ACTION_ARGUMENT_PROGRESS_VALUE) == true
) {
eventData.putDouble(
"value",
args.getFloat(AccessibilityNodeInfo.ACTION_ARGUMENT_PROGRESS_VALUE).toDouble(),
)
}
val reactContext = host.context as ReactContext
if (reactContext.hasActiveReactInstance()) {
val reactTag = host.id
Expand Down Expand Up @@ -576,6 +586,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
"longpress" to AccessibilityActionCompat.ACTION_LONG_CLICK.id,
"increment" to AccessibilityActionCompat.ACTION_SCROLL_FORWARD.id,
"decrement" to AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.id,
"setProgress" to AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS.id,
"expand" to AccessibilityActionCompat.ACTION_EXPAND.id,
"collapse" to AccessibilityActionCompat.ACTION_COLLAPSE.id,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,32 @@
package com.facebook.react.uimanager

import android.os.Bundle
import android.view.accessibility.AccessibilityNodeInfo
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat
import com.facebook.react.R
import com.facebook.react.bridge.BridgeReactContext
import com.facebook.react.bridge.JavaOnlyArray
import com.facebook.react.bridge.JavaOnlyMap
import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
import com.facebook.react.bridge.UIManager
import com.facebook.react.bridge.WritableMap
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
import com.facebook.react.uimanager.common.UIManagerType
import com.facebook.react.uimanager.events.Event
import com.facebook.react.uimanager.events.EventDispatcher
import com.facebook.react.uimanager.events.RCTEventEmitter
import com.facebook.react.views.view.ReactViewGroup
import com.facebook.testutils.shadows.ShadowArguments
import org.assertj.core.api.Assertions.assertThat
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.mockStatic
import org.mockito.kotlin.argumentCaptor
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
import org.mockito.kotlin.whenever
import org.robolectric.RobolectricTestRunner
import org.robolectric.RuntimeEnvironment
import org.robolectric.annotation.Config
Expand All @@ -38,6 +52,7 @@ class ReactAccessibilityDelegateTest {
fun setUp() {
ReactNativeFeatureFlagsForTests.setUp()
reactContext = BridgeReactContext(RuntimeEnvironment.getApplication())
reactContext.initializeWithInstance(createMockCatalystInstance())
themedReactContext = ThemedReactContext(reactContext, reactContext, null, -1)
view = ReactViewGroup(themedReactContext).apply { id = 100 }
accessibilityDelegate = ReactAccessibilityDelegate(view, false, 0)
Expand Down Expand Up @@ -231,6 +246,58 @@ class ReactAccessibilityDelegateTest {
)
}

@Test
fun testPerformAccessibilityAction_setProgressAction_isExposedAndHandled() {
val accessibilityActions = JavaOnlyArray()
val action = JavaOnlyMap().apply { putString("name", "setProgress") }
accessibilityActions.pushMap(action)
view.setTag(R.id.accessibility_actions, accessibilityActions)

val nodeInfo = AccessibilityNodeInfoCompat.obtain()
accessibilityDelegate.onInitializeAccessibilityNodeInfo(view, nodeInfo)

assertThat(nodeInfo.actionList.map { it.id })
.contains(AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS.id)

val args =
Bundle().apply { putFloat(AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE, 42f) }
val eventDispatcher = mock<EventDispatcher>()
val uiManager = mock<UIManager>()
whenever(uiManager.eventDispatcher).thenReturn(eventDispatcher)
val uiManagerHelper = mockStatic(UIManagerHelper::class.java)
try {
uiManagerHelper
.`when`<UIManager?> {
UIManagerHelper.getUIManager(themedReactContext, UIManagerType.FABRIC)
}
.thenReturn(uiManager)

val result =
accessibilityDelegate.performAccessibilityAction(
view,
AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS.id,
args,
)

assertThat(result).isTrue()
val eventCaptor = argumentCaptor<Event<*>>()
verify(eventDispatcher).dispatchEvent(eventCaptor.capture())
val eventEmitter = mock<RCTEventEmitter>()
eventCaptor.firstValue.dispatch(eventEmitter)
val eventDataCaptor = argumentCaptor<WritableMap>()
verify(eventEmitter)
.receiveEvent(
eq(view.id),
eq(ReactAccessibilityDelegate.TOP_ACCESSIBILITY_ACTION_EVENT),
eventDataCaptor.capture(),
)
assertThat(eventDataCaptor.firstValue.getString("actionName")).isEqualTo("setProgress")
assertThat(eventDataCaptor.firstValue.getDouble("value")).isEqualTo(42.0)
} finally {
uiManagerHelper.close()
}
}

@Test
fun testPerformAccessibilityAction_adjustableRoleWithTextValue_doesNotScheduleEvent() {
val accessibilityActions = JavaOnlyArray()
Expand Down
Loading
Loading