mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Let LinkMovementMethod take precedence over accessibility delegate when dataDetector is present (#50887)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/50887 There is currently a bug with the recent changes to keyboard accessibility with Text and nested links. If something with nested links has a `dataDetectorType` prop then we have 2 different selections when we navigate with arrow keys since the drawing behind the 2 are separate. Removing LinkMovementMethod is not possible since it allows for clicking the links it detects As a result, lets just allow it to take precedence over the delegate when handling link navigation in the cases its present. Changelog: [Android][Fixed] - Double selection with dataDetectorType and links Reviewed By: NickGerleman Differential Revision: D73549839 fbshipit-source-id: bbe37470e78841bb119fa68e197b327023031c7e
This commit is contained in:
1 parent
0f5eeb6970
commit
70aced5eb1
1 file changed
+11
-1
+11
-1
@@ -734,6 +734,14 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
return super.dispatchHoverEvent(event);
|
||||
}
|
||||
|
||||
/**
|
||||
* Note that if we have a movement method then we DO NOT forward these events to the accessibility
|
||||
* delegate. This is because the movement method should handle the focus highlighting and
|
||||
* changing. If we don't do this then we have mutliple selections happening at once. We cannot get
|
||||
* rid of movement method since links found by Linkify will not be clickable. Also, putting this
|
||||
* gating in the accessibility delegate itself will break screen reader accessibility more
|
||||
* generally, since we still need to register virtual views.
|
||||
*/
|
||||
@Override
|
||||
public final void onFocusChanged(
|
||||
boolean gainFocus, int direction, @Nullable Rect previouslyFocusedRect) {
|
||||
@@ -741,7 +749,8 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
AccessibilityDelegateCompat accessibilityDelegateCompat =
|
||||
ViewCompat.getAccessibilityDelegate(this);
|
||||
if (accessibilityDelegateCompat != null
|
||||
&& accessibilityDelegateCompat instanceof ReactTextViewAccessibilityDelegate) {
|
||||
&& accessibilityDelegateCompat instanceof ReactTextViewAccessibilityDelegate
|
||||
&& getMovementMethod() == null) {
|
||||
((ReactTextViewAccessibilityDelegate) accessibilityDelegateCompat)
|
||||
.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
|
||||
}
|
||||
@@ -752,6 +761,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
AccessibilityDelegateCompat accessibilityDelegateCompat =
|
||||
ViewCompat.getAccessibilityDelegate(this);
|
||||
return (accessibilityDelegateCompat != null
|
||||
&& getMovementMethod() == null
|
||||
&& accessibilityDelegateCompat instanceof ReactTextViewAccessibilityDelegate
|
||||
&& ((ReactTextViewAccessibilityDelegate) accessibilityDelegateCompat)
|
||||
.dispatchKeyEvent(event))
|
||||
|
||||
Reference in new issue
Block a user