From 2e2da47ee720a55f2b1e6df414f04a55101948b7 Mon Sep 17 00:00:00 2001
From: Yevhenii <evgeny.kotyrlo@gmail.com>
Date: Wed, 14 Oct 2026 16:49:34 +0300
Subject: [PATCH] Stop routing TalkBack's click to removed accessibility
 actions on Android

A view whose accessibilityActions declared activate kept dispatching it
on TalkBack's click after the actions were removed or replaced with an
empty list, so the view's own click never ran.
setAccessibilityActions returned before writing the tag when the prop
was null, and ReactAccessibilityDelegate routed an action through a map
of every action it had built node info with, never dropping one.

setAccessibilityActions now writes null to the tag, and the delegate
resolves an action against the view's current accessibilityActions.
---
 .../react/uimanager/BaseViewManager.java      |  6 +--
 .../uimanager/ReactAccessibilityDelegate.kt   | 23 ++++++--
 .../react/uimanager/BaseViewManagerTest.kt    | 54 +++++++++++++++++++
 3 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
index 55daec06a8c6..585e7748728d 100644
--- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
+++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java
@@ -473,11 +473,7 @@ private void updateViewContentDescription(@NonNull T view) {
   }
 
   @ReactProp(name = ViewProps.ACCESSIBILITY_ACTIONS)
-  public void setAccessibilityActions(T view, ReadableArray accessibilityActions) {
-    if (accessibilityActions == null) {
-      return;
-    }
-
+  public void setAccessibilityActions(T view, @Nullable ReadableArray accessibilityActions) {
     view.setTag(R.id.accessibility_actions, accessibilityActions);
   }
 
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 321a5897226d..8b7ad0d6936c 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
@@ -57,7 +57,6 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
           host?.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_SELECTED)
         }
       }
-  private val accessibilityActionsMap = HashMap<Int, String?>()
   private var accessibilityLabelledBy: View? = null
 
   init {
@@ -130,7 +129,6 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
         val actionId: Int =
             actionIdMap.get(actionName)
                 ?: customActionIdMap.getOrPut(actionName) { customActionCounter++ }
-        accessibilityActionsMap[actionId] = actionName
         val accessibilityAction = AccessibilityActionCompat(actionId, actionLabel)
         info.addAction(accessibilityAction)
       }
@@ -225,9 +223,10 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
     if (action == AccessibilityNodeInfoCompat.ACTION_EXPAND) {
       host.setTag(R.id.accessibility_state_expanded, true)
     }
-    if (accessibilityActionsMap.containsKey(action)) {
+    val actionName = findDeclaredActionName(host, action)
+    if (actionName != null) {
       val eventData = createMap()
-      eventData.putString("actionName", accessibilityActionsMap[action])
+      eventData.putString("actionName", actionName)
       if (
           action == AccessibilityNodeInfo.AccessibilityAction.ACTION_SET_PROGRESS.id &&
               args?.containsKey(AccessibilityNodeInfo.ACTION_ARGUMENT_PROGRESS_VALUE) == true
@@ -273,6 +272,22 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
     return super.performAccessibilityAction(host, action, args)
   }
 
+  private fun findDeclaredActionName(host: View, actionId: Int): String? {
+    val accessibilityActions =
+        host.getTag(R.id.accessibility_actions) as ReadableArray? ?: return null
+    for (i in 0..<accessibilityActions.size()) {
+      val action = accessibilityActions.getMap(i)
+      if (action == null || !action.hasKey("name")) {
+        continue
+      }
+      val actionName = action.getString("name")
+      if ((actionIdMap[actionName] ?: customActionIdMap[actionName]) == actionId) {
+        return actionName
+      }
+    }
+    return null
+  }
+
   /**
    * Schedule a command for sending an accessibility event. Note: A command is used to ensure that
    * accessibility events are sent at most one in a given time frame to save system resources while
diff --git a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt
index 95e47b23e9a2..de978e60f3f4 100644
--- a/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt
+++ b/packages/react-native/ReactAndroid/src/test/java/com/facebook/react/uimanager/BaseViewManagerTest.kt
@@ -10,6 +10,7 @@
 package com.facebook.react.uimanager
 
 import android.view.View.OnFocusChangeListener
+import android.view.accessibility.AccessibilityNodeInfo
 import com.facebook.react.R
 import com.facebook.react.bridge.BridgeReactContext
 import com.facebook.react.bridge.DynamicFromObject
@@ -162,4 +163,57 @@ class BaseViewManagerTest {
     viewManager.setAccessibilityLabelledBy(view, DynamicFromObject(JavaOnlyArray()))
     Assertions.assertThat(view.getTag(R.id.labelled_by)).isNull()
   }
+
+  @Test
+  fun testDeclaredActivateActionTakesTheAccessibilityClick() {
+    applyAccessibilityActions(JavaOnlyArray.of(JavaOnlyMap.of("name", "activate")))
+    view.createAccessibilityNodeInfo()
+
+    Assertions.assertThat(performAccessibilityClick()).isEqualTo(0)
+  }
+
+  @Test
+  fun testRemovedAccessibilityActionsNoLongerTakeTheAccessibilityClick() {
+    applyAccessibilityActions(JavaOnlyArray.of(JavaOnlyMap.of("name", "activate")))
+    view.createAccessibilityNodeInfo()
+    applyAccessibilityActions(null)
+
+    Assertions.assertThat(performAccessibilityClick()).isEqualTo(1)
+  }
+
+  @Test
+  fun testEmptiedAccessibilityActionsNoLongerTakeTheAccessibilityClick() {
+    applyAccessibilityActions(JavaOnlyArray.of(JavaOnlyMap.of("name", "activate")))
+    view.createAccessibilityNodeInfo()
+    applyAccessibilityActions(JavaOnlyArray())
+
+    Assertions.assertThat(performAccessibilityClick()).isEqualTo(1)
+  }
+
+  @Test
+  fun testRemovedAccessibilityActionsLeaveTheNodeInfo() {
+    applyAccessibilityActions(
+        JavaOnlyArray.of(JavaOnlyMap.of("name", "openMenu", "label", "Open menu"))
+    )
+    applyAccessibilityActions(null)
+
+    Assertions.assertThat(
+            view.createAccessibilityNodeInfo().actionList.map { it.label?.toString() }
+        )
+        .doesNotContain("Open menu")
+  }
+
+  private fun applyAccessibilityActions(accessibilityActions: JavaOnlyArray?) {
+    viewManager.updateProperties(
+        view,
+        ReactStylesDiffMap(JavaOnlyMap.of(ViewProps.ACCESSIBILITY_ACTIONS, accessibilityActions)),
+    )
+  }
+
+  private fun performAccessibilityClick(): Int {
+    var clicks = 0
+    view.setOnClickListener { clicks++ }
+    view.performAccessibilityAction(AccessibilityNodeInfo.ACTION_CLICK, null)
+    return clicks
+  }
 }