Skip to content

Commit d8823e5

Browse files
committed
removing not required logic
- add date TtsSpan - remove ids.xml and setTag logic - remove changes to AccessibilityLinks
1 parent 7e264da commit d8823e5

File tree

7 files changed

+20
-17
lines changed

7 files changed

+20
-17
lines changed

Libraries/Components/View/ViewAccessibility.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ export type AccessibilityRole =
1919
| 'togglebutton'
2020
| 'link'
2121
| 'verbatim'
22+
| 'date'
2223
| 'search'
2324
| 'image'
2425
| 'keyboardkey'

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactAccessibilityDelegate.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
import com.facebook.react.uimanager.events.Event;
4545
import com.facebook.react.uimanager.events.EventDispatcher;
4646
import com.facebook.react.uimanager.util.ReactFindViewUtil;
47-
import com.facebook.react.views.text.ReactSpan;
4847
import com.facebook.react.views.text.ReactTtsSpan;
4948
import java.util.ArrayList;
5049
import java.util.HashMap;
@@ -101,6 +100,7 @@ public enum AccessibilityRole {
101100
TOGGLEBUTTON,
102101
LINK,
103102
VERBATIM,
103+
DATE,
104104
SEARCH,
105105
IMAGE,
106106
IMAGEBUTTON,
@@ -160,6 +160,8 @@ public static String getValue(AccessibilityRole role) {
160160
return "android.widget.GridView";
161161
case VERBATIM:
162162
return ReactTtsSpan.TYPE_VERBATIM;
163+
case DATE:
164+
return ReactTtsSpan.TYPE_DATE;
163165
case NONE:
164166
case LINK:
165167
case SUMMARY:
@@ -652,10 +654,10 @@ protected boolean onPerformActionForVirtualView(
652654
public static class AccessibilityLinks {
653655
private final List<AccessibleLink> mLinks;
654656

655-
public AccessibilityLinks(ReactSpan[] spans, Spannable text) {
657+
public AccessibilityLinks(ClickableSpan[] spans, Spannable text) {
656658
ArrayList<AccessibleLink> links = new ArrayList<>();
657659
for (int i = 0; i < spans.length; i++) {
658-
ReactSpan span = spans[i];
660+
ClickableSpan span = spans[i];
659661
int start = text.getSpanStart(span);
660662
int end = text.getSpanEnd(span);
661663
// zero length spans, and out of range spans should not be included.

ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextViewManager.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,6 @@ public void updateExtraData(ReactTextView view, Object extraData) {
9494
ReactClickableSpan[] clickableSpans =
9595
spannable.getSpans(0, update.getText().length(), ReactClickableSpan.class);
9696

97-
ReactTtsSpan[] ttsSpans = spannable.getSpans(0, update.getText().length(), ReactTtsSpan.class);
98-
if (ttsSpans.length > 0) {
99-
view.setTag(
100-
R.id.accessibility_spans,
101-
new ReactAccessibilityDelegate.AccessibilityLinks(ttsSpans, spannable));
102-
ReactAccessibilityDelegate.resetDelegate(
103-
view, view.isFocusable(), view.getImportantForAccessibility());
104-
}
105-
10697
if (clickableSpans.length > 0) {
10798
view.setTag(
10899
R.id.accessibility_links,

ReactAndroid/src/main/res/views/uimanager/values/ids.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
<!-- tag is used to store accessibilityRole tag-->
1616
<item type="id" name="accessibility_role"/>
17-
<item type="id" name="accessibility_unit"/>
1817

1918
<!-- tag is used to store accessibilityCollection -->
2019
<item type="id" name="accessibility_collection"/>
@@ -37,8 +36,6 @@
3736
<!-- tag is used to store accessibilityLinks tag -->
3837
<item type="id" name="accessibility_links"/>
3938

40-
<item type="id" name="accessibility_spans"/>
41-
4239
<!-- tag is used to store accessibilityLabelledBy tag -->
4340
<item type="id" name="labelled_by"/>
4441

ReactCommon/react/renderer/attributedstring/conversions.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,8 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
575575
return "link";
576576
case AccessibilityRole::Verbatim:
577577
return "verbatim";
578+
case AccessibilityRole::Date:
579+
return "date";
578580
case AccessibilityRole::Search:
579581
return "search";
580582
case AccessibilityRole::Image:
@@ -648,6 +650,8 @@ inline void fromRawValue(
648650
result = AccessibilityRole::Link;
649651
} else if (string == "verbatim") {
650652
result = AccessibilityRole::Verbatim;
653+
} else if (string == "date") {
654+
result = AccessibilityRole::Date;
651655
} else if (string == "search") {
652656
result = AccessibilityRole::Search;
653657
} else if (string == "image") {

ReactCommon/react/renderer/attributedstring/primitives.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ enum class AccessibilityRole {
9797
Button,
9898
Link,
9999
Verbatim,
100+
Date,
100101
Search,
101102
Image,
102103
Imagebutton,

packages/rn-tester/js/examples/Text/TextAdjustsDynamicLayoutExample.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ export default function TextAdjustsDynamicLayoutExample(props: {}): React.Node {
1717
return (
1818
<>
1919
<View>
20-
<Text accessibilityRole="verbatim" accessible={true}>
21-
please spell
20+
<Text accessible={true}>
21+
My number is{' '}
22+
<Text
23+
accessibilityRole="date"
24+
accessible={true}
25+
style={{backgroundColor: 'red'}}>
26+
02/07/1987
27+
</Text>
28+
.
2229
</Text>
2330
</View>
2431
</>

0 commit comments

Comments
 (0)