a11y] Let links discovered by dataDetectorType be accessible (#50914)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/50914

The URL spans generated by Linkify are not actually accessible because we do not update the delegate's virtual views.

I also had to change how AccessibilityLinks get generated, since it does not work well if it includes spans that are not `ReactClickableSpans`

Changelog: [Internal]

Reviewed By: NickGerleman

Differential Revision: D73612119

fbshipit-source-id: 0c6028a7473e0484216300863f2d7a043fb2ea85
This commit is contained in:
Joe Vilches authored and Facebook GitHub Bot committed 2025-05-01 01:52:46 -07:00
1 parent 70aced5eb1
commit 69f41ca367
3 files changed
+9 -21

No files matched your search

@@ -31,7 +31,6 @@ import com.facebook.react.uimanager.style.BorderStyle
import com.facebook.react.uimanager.style.LogicalEdge
import com.facebook.react.uimanager.style.Overflow
import com.facebook.react.views.text.ReactTextViewAccessibilityDelegate.AccessibilityLinks
import com.facebook.react.views.text.internal.span.ReactClickableSpan
import java.util.HashMap
@ReactModule(name = PreparedLayoutTextViewManager.REACT_CLASS)
@@ -71,12 +70,10 @@ internal class PreparedLayoutTextViewManager :
// delegate so that these can be picked up by the accessibility system.
if (layout.text is Spanned) {
val spannedText = layout.text as Spanned
val clickableSpans =
spannedText.getSpans(0, layout.text.length, ReactClickableSpan::class.java)
val accessibilityLinks = AccessibilityLinks(spannedText)
view.setTag(
R.id.accessibility_links,
if (clickableSpans.size > 0) AccessibilityLinks(clickableSpans, spannedText) else null)
if (accessibilityLinks.size() > 0) accessibilityLinks else null)
ReactTextViewAccessibilityDelegate.resetDelegate(
view, view.isFocusable, view.importantForAccessibility)
}
@@ -269,11 +269,13 @@ internal class ReactTextViewAccessibilityDelegate : ReactAccessibilityDelegate {
return null
}
public class AccessibilityLinks(spans: Array<out ClickableSpan>, text: Spanned) {
public class AccessibilityLinks(text: Spanned) {
private val links: List<AccessibleLink>
init {
val accessibleLinks = mutableListOf<AccessibleLink>()
val spans = text.getSpans(0, text.length, ClickableSpan::class.java)
spans.sortBy { text.getSpanStart(it) }
for (i in spans.indices) {
val span = spans[i]
val start = text.getSpanStart(span)
@@ -287,14 +289,7 @@ internal class ReactTextViewAccessibilityDelegate : ReactAccessibilityDelegate {
link.description = text.subSequence(start, end).toString()
link.start = start
link.end = end
// ID is the reverse of what is expected, since the ClickableSpans are returned in reverse
// order due to being added in reverse order. If we don't do this, focus will move to the
// last link first and move backwards.
//
// If this approach becomes unreliable, we should instead look at their start position and
// order them manually.
link.id = spans.size - 1 - i
link.id = i
accessibleLinks.add(link)
}
links = accessibleLinks
@@ -26,7 +26,6 @@ import com.facebook.react.uimanager.ReactStylesDiffMap;
import com.facebook.react.uimanager.StateWrapper;
import com.facebook.react.uimanager.ThemedReactContext;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.views.text.internal.span.ReactClickableSpan;
import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
import com.facebook.yoga.YogaMeasureMode;
import java.util.HashMap;
@@ -106,13 +105,10 @@ public class ReactTextViewManager extends ReactTextAnchorViewManager<ReactTextSh
// If this text view contains any clickable spans, set a view tag and reset the accessibility
// delegate so that these can be picked up by the accessibility system.
ReactClickableSpan[] clickableSpans =
spannable.getSpans(0, update.getText().length(), ReactClickableSpan.class);
ReactTextViewAccessibilityDelegate.AccessibilityLinks accessibilityLinks =
new ReactTextViewAccessibilityDelegate.AccessibilityLinks(spannable);
view.setTag(
R.id.accessibility_links,
clickableSpans.length > 0
? new ReactTextViewAccessibilityDelegate.AccessibilityLinks(clickableSpans, spannable)
: null);
R.id.accessibility_links, accessibilityLinks.size() > 0 ? accessibilityLinks : null);
ReactTextViewAccessibilityDelegate.Companion.resetDelegate(
view, view.isFocusable(), view.getImportantForAccessibility());
}