Skip to content

Do not reset accessibility delegate if there was no delegate #54785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rozele wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Do not reset accessibility delegate if there was no delegate #54785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions ...Android/src/main/java/com/facebook/react/views/text/ReactTextViewAccessibilityDelegate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,20 @@ internal class ReactTextViewAccessibilityDelegate(
}

companion object {
fun needsDelegate(view: View): Boolean {
return view.getTag(R.id.accessibility_role) != null ||
view.getTag(R.id.accessibility_state) != null ||
view.getTag(R.id.accessibility_actions) != null ||
view.getTag(R.id.react_test_id) != null ||
view.getTag(R.id.accessibility_collection_item) != null ||
view.getTag(R.id.accessibility_links) != null ||
view.getTag(R.id.role) != null
}

fun setDelegate(view: View, originalFocus: Boolean, originalImportantForAccessibility: Int) {
// if a view already has an accessibility delegate, replacing it could cause
// problems,so leave it alone.
if (
!ViewCompat.hasAccessibilityDelegate(view) &&
(view.getTag(R.id.accessibility_role) != null ||
view.getTag(R.id.accessibility_state) != null ||
view.getTag(R.id.accessibility_actions) != null ||
view.getTag(R.id.react_test_id) != null ||
view.getTag(R.id.accessibility_collection_item) != null ||
view.getTag(R.id.accessibility_links) != null ||
view.getTag(R.id.role) != null)
) {
if (!ViewCompat.hasAccessibilityDelegate(view) && needsDelegate(view)) {
ViewCompat.setAccessibilityDelegate(
view,
ReactTextViewAccessibilityDelegate(
Expand All @@ -58,14 +59,16 @@ internal class ReactTextViewAccessibilityDelegate(
}

fun resetDelegate(view: View, originalFocus: Boolean, originalImportantForAccessibility: Int) {
ViewCompat.setAccessibilityDelegate(
view,
ReactTextViewAccessibilityDelegate(
view,
originalFocus,
originalImportantForAccessibility,
),
)
if (ViewCompat.hasAccessibilityDelegate(view) || needsDelegate(view)) {
ViewCompat.setAccessibilityDelegate(
view,
ReactTextViewAccessibilityDelegate(
view,
originalFocus,
originalImportantForAccessibility,
),
)
}
}
}

Expand Down
Loading