diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt index bbeb2b019ad..6f21f8413e8 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/PreparedLayoutTextViewManager.kt @@ -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) } 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 4be9717aaa5..1d3b185d682 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 @@ -269,11 +269,13 @@ internal class ReactTextViewAccessibilityDelegate : ReactAccessibilityDelegate { return null } - public class AccessibilityLinks(spans: Array, text: Spanned) { + public class AccessibilityLinks(text: Spanned) { private val links: List init { val accessibleLinks = mutableListOf() + 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 diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java index 48657552172..7ab73cd18ac 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java @@ -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 0 - ? new ReactTextViewAccessibilityDelegate.AccessibilityLinks(clickableSpans, spannable) - : null); + R.id.accessibility_links, accessibilityLinks.size() > 0 ? accessibilityLinks : null); ReactTextViewAccessibilityDelegate.Companion.resetDelegate( view, view.isFocusable(), view.getImportantForAccessibility()); }