Skip to content
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

Jump to bottom

Possibly solve the issue with TalkBack order #47213

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+30 −21
Open

Possibly solve the issue with TalkBack order #47213

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
51 changes: 30 additions & 21 deletions ...e/ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,22 @@ public void handleMessage(Message msg) {
@Override
public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCompat info) {
super.onInitializeAccessibilityNodeInfo(host, info);

final Object accessibilityLabelledBy = host.getTag(R.id.labelled_by);
if (accessibilityLabelledBy != null) {
mAccessibilityLabelledBy =
ReactFindViewUtil.findView(host.getRootView(), (String) accessibilityLabelledBy);
if (mAccessibilityLabelledBy != null) {
info.setLabeledBy(mAccessibilityLabelledBy);
}
}

// state is changeable.
final ReadableMap accessibilityState = (ReadableMap) host.getTag(R.id.accessibility_state);
if (accessibilityState != null) {
setState(info, accessibilityState, host.getContext());
}

if (host.getTag(R.id.accessibility_state_expanded) != null) {
final boolean accessibilityStateExpanded =
(boolean) host.getTag(R.id.accessibility_state_expanded);
Expand All @@ -421,6 +437,7 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo
? AccessibilityNodeInfoCompat.ACTION_COLLAPSE
: AccessibilityNodeInfoCompat.ACTION_EXPAND);
}

final AccessibilityRole accessibilityRole = AccessibilityRole.fromViewTag(host);
final String accessibilityHint = (String) host.getTag(R.id.accessibility_hint);
if (accessibilityRole != null) {
Expand All @@ -431,20 +448,6 @@ public void onInitializeAccessibilityNodeInfo(View host, AccessibilityNodeInfoCo
info.setTooltipText(accessibilityHint);
}

final Object accessibilityLabelledBy = host.getTag(R.id.labelled_by);
if (accessibilityLabelledBy != null) {
mAccessibilityLabelledBy =
ReactFindViewUtil.findView(host.getRootView(), (String) accessibilityLabelledBy);
if (mAccessibilityLabelledBy != null) {
info.setLabeledBy(mAccessibilityLabelledBy);
}
}

// state is changeable.
final ReadableMap accessibilityState = (ReadableMap) host.getTag(R.id.accessibility_state);
if (accessibilityState != null) {
setState(info, accessibilityState, host.getContext());
}
final ReadableArray accessibilityActions =
(ReadableArray) host.getTag(R.id.accessibility_actions);

Expand Down Expand Up @@ -1188,22 +1191,28 @@ public static CharSequence getTalkbackDescription(

StringBuilder talkbackSegments = new StringBuilder();

// EditText's prioritize their own text content over a contentDescription so skip this
if (!TextUtils.isEmpty(contentDescription) && (!isEditText || !hasNodeText)) {
// next add content description
talkbackSegments.append(contentDescription);
return talkbackSegments;
}

// EditText
//Prioritize their own text
if (hasNodeText) {
// skipped status checks above for EditText

// description
talkbackSegments.append(nodeText);
if (!TextUtils.isEmpty(contentDescription) && !isEditText) {
// next add content description
talkbackSegments.append(contentDescription);
}

return talkbackSegments;
}

// EditText's prioritize their own text content over a contentDescription so skip this
// if (!TextUtils.isEmpty(contentDescription) && !isEditText) {
// // next add content description
// talkbackSegments.append(contentDescription);
// return talkbackSegments;
// }

// If there are child views and no contentDescription the text of all non-focusable children,
// comma separated, becomes the description.
if (view instanceof ViewGroup) {
Expand Down
Loading