diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt index 95e7b33d314..b23e2d5b190 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextView.kt @@ -52,11 +52,6 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) { clickableSpans = value?.text?.let { filterClickableSpans(it) } ?: emptyList() - // T221698736: This and `accessible` prop can clobber each other, and ShadowTree does not - // know - // about this. Need to figure out desired behavior for controlling implicit focusability. - isFocusable = clickableSpans.isNotEmpty() - field = value invalidate() } @@ -92,7 +87,6 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context) { public fun recycleView(): Unit { initView() BackgroundStyleApplicator.reset(this) - isFocusable = false overflow = Overflow.HIDDEN } diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt index 3cefcb95012..47abeda2009 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt @@ -174,6 +174,15 @@ internal class ReactTextViewAccessibilityDelegate : ReactAccessibilityDelegate { } } + override fun onInitializeAccessibilityNodeInfo(host: View, info: AccessibilityNodeInfoCompat) { + super.onInitializeAccessibilityNodeInfo(host, info) + // PreparedLayoutTextView isn't actually a TextView, so we need to teach it about its text that + // it is holding so TalkBack knows what to announce when focusing it. + if (host is PreparedLayoutTextView) { + info.text = host.text + } + } + @Suppress("DEPRECATION") override fun onPopulateNodeForVirtualView(virtualViewId: Int, node: AccessibilityNodeInfoCompat) { // If we get an invalid virtualViewId for some reason (which is known to happen in API 19 and