Skip to content

Commit 34ed14e

Browse files
fabOnReactfabOnReact
committed
Remove not supported TYPES from PR and move them to a separate branch
facebook#35130 (comment) https://github.com/facebook/react-native/compare/main...fabriziobertoglio1987:react-native:tts-span-additiona-types?expand=1
1 parent 7c80bdb commit 34ed14e

File tree

6 files changed

+44
-118
lines changed

6 files changed

+44
-118
lines changed

‎Libraries/Text/Text.d.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,8 @@ export interface TextPropsAndroid {
6060
| 'none'
6161
| 'cardinal'
6262
| 'ordinal'
63-
| 'decimal'
64-
| 'fraction'
6563
| 'measure'
66-
| 'time'
67-
| 'date'
6864
| 'telephone'
69-
| 'electronic'
70-
| 'money'
71-
| 'digits'
7265
| 'verbatim';
7366

7467
/**

‎Libraries/Text/TextProps.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,8 @@ export type TextProps = $ReadOnly<{|
206206
| 'none'
207207
| 'cardinal'
208208
| 'ordinal'
209-
| 'decimal'
210-
| 'fraction'
211209
| 'measure'
212-
| 'time'
213-
| 'date'
214210
| 'telephone'
215-
| 'electronic'
216-
| 'money'
217-
| 'digits'
218211
| 'verbatim'
219212
),
220213

‎ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTtsSpan.java

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import android.text.style.TtsSpan;
1212
import androidx.annotation.Nullable;
1313
import com.facebook.common.logging.FLog;
14-
import java.util.Currency;
1514

1615
/*
1716
* Wraps {@link TtsSpan} as a {@link ReactSpan}.
@@ -29,9 +28,6 @@
2928
*/
3029
public class ReactTtsSpan extends TtsSpan implements ReactSpan {
3130
private static final String TAG = ReactTtsSpan.class.getSimpleName();
32-
private static final String TYPE_MONEY_WARNING_MSG =
33-
"The accessibilityLabel format may not be compatible"
34-
+ " with the format supported ISO 4217 (for example 'USD').";
3531
private static final String TYPE_TELEPHONE_WARNING_MSG =
3632
"Failed to retrieve telephone number (for example '0112123432').";
3733
private static final String TYPE_MEASURE_WARNING_MSG =
@@ -46,15 +42,8 @@ public enum AccessibilitySpan {
4642
NONE,
4743
CARDINAL,
4844
ORDINAL,
49-
DECIMAL,
50-
FRACTION,
5145
MEASURE,
52-
TIME,
53-
DATE,
5446
TELEPHONE,
55-
ELECTRONIC,
56-
MONEY,
57-
DIGITS,
5847
VERBATIM;
5948

6049
public static String getValue(AccessibilitySpan accessibilitySpan) {
@@ -63,24 +52,10 @@ public static String getValue(AccessibilitySpan accessibilitySpan) {
6352
return ReactTtsSpan.TYPE_CARDINAL;
6453
case ORDINAL:
6554
return ReactTtsSpan.TYPE_ORDINAL;
66-
case DECIMAL:
67-
return ReactTtsSpan.TYPE_DECIMAL;
68-
case FRACTION:
69-
return ReactTtsSpan.TYPE_FRACTION;
7055
case MEASURE:
7156
return ReactTtsSpan.TYPE_MEASURE;
72-
case TIME:
73-
return ReactTtsSpan.TYPE_TIME;
74-
case DATE:
75-
return ReactTtsSpan.TYPE_DATE;
7657
case TELEPHONE:
7758
return ReactTtsSpan.TYPE_TELEPHONE;
78-
case ELECTRONIC:
79-
return ReactTtsSpan.TYPE_ELECTRONIC;
80-
case MONEY:
81-
return ReactTtsSpan.TYPE_MONEY;
82-
case DIGITS:
83-
return ReactTtsSpan.TYPE_DIGITS;
8459
case VERBATIM:
8560
return ReactTtsSpan.TYPE_VERBATIM;
8661
case NONE:
@@ -119,12 +94,6 @@ public Builder(AccessibilitySpan type, @Nullable String accessibilityLabel) {
11994
if (mType == TYPE_TEXT) {
12095
setStringArgument(ARG_TEXT, accessibilityLabel);
12196
}
122-
if (mType == TYPE_MONEY) {
123-
warningMessage = TYPE_MONEY_WARNING_MSG;
124-
Currency.getInstance(accessibilityLabel);
125-
setStringArgument(ARG_INTEGER_PART, "");
126-
setStringArgument(ARG_CURRENCY, accessibilityLabel);
127-
}
12897
if (mType == TYPE_TELEPHONE) {
12998
warningMessage = TYPE_TELEPHONE_WARNING_MSG;
13099
setStringArgument(ARG_NUMBER_PARTS, accessibilityLabel);
@@ -134,6 +103,9 @@ public Builder(AccessibilitySpan type, @Nullable String accessibilityLabel) {
134103
warningMessage = TYPE_MEASURE_WARNING_MSG;
135104
setStringArgument(ARG_UNIT, accessibilityLabel);
136105
}
106+
if (mType == TYPE_CARDINAL || mType == TYPE_ORDINAL) {
107+
setStringArgument(ARG_NUMBER, accessibilityLabel);
108+
}
137109
} catch (Exception e) {
138110
if (mType != TYPE_TEXT) {
139111
mType = TYPE_TEXT;

‎ReactCommon/react/renderer/attributedstring/conversions.h

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -792,24 +792,10 @@ inline std::string toString(const AccessibilitySpan &accessibilitySpan) {
792792
return "cardinal";
793793
case AccessibilitySpan::Ordinal:
794794
return "ordinal";
795-
case AccessibilitySpan::Decimal:
796-
return "decimal";
797-
case AccessibilitySpan::Fraction:
798-
return "fraction";
799795
case AccessibilitySpan::Measure:
800796
return "measure";
801-
case AccessibilitySpan::Time:
802-
return "time";
803-
case AccessibilitySpan::Date:
804-
return "date";
805797
case AccessibilitySpan::Telephone:
806798
return "telephone";
807-
case AccessibilitySpan::Electronic:
808-
return "electronic";
809-
case AccessibilitySpan::Money:
810-
return "money";
811-
case AccessibilitySpan::Digits:
812-
return "digits";
813799
case AccessibilitySpan::Verbatim:
814800
return "verbatim";
815801
case AccessibilitySpan::None:
@@ -833,24 +819,10 @@ inline void fromRawValue(
833819
result = AccessibilitySpan::Cardinal;
834820
} else if (string == "ordinal") {
835821
result = AccessibilitySpan::Ordinal;
836-
} else if (string == "decimal") {
837-
result = AccessibilitySpan::Decimal;
838-
} else if (string == "fraction") {
839-
result = AccessibilitySpan::Fraction;
840822
} else if (string == "measure") {
841823
result = AccessibilitySpan::Measure;
842-
} else if (string == "time") {
843-
result = AccessibilitySpan::Time;
844-
} else if (string == "date") {
845-
result = AccessibilitySpan::Date;
846824
} else if (string == "telephone") {
847825
result = AccessibilitySpan::Telephone;
848-
} else if (string == "electronic") {
849-
result = AccessibilitySpan::Electronic;
850-
} else if (string == "money") {
851-
result = AccessibilitySpan::Money;
852-
} else if (string == "digits") {
853-
result = AccessibilitySpan::Digits;
854826
} else if (string == "verbatim") {
855827
result = AccessibilitySpan::Verbatim;
856828
} else if (string == "none") {

‎ReactCommon/react/renderer/attributedstring/primitives.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,15 +141,8 @@ enum class AccessibilitySpan {
141141
None,
142142
Cardinal,
143143
Ordinal,
144-
Decimal,
145-
Fraction,
146144
Measure,
147-
Time,
148-
Date,
149145
Telephone,
150-
Electronic,
151-
Money,
152-
Digits,
153146
Verbatim,
154147
};
155148

‎packages/rn-tester/js/examples/Accessibility/AccessibilityExample.js

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,9 @@ class TtsSpanExamples extends React.Component<{}> {
288288
render(): React.Node {
289289
return (
290290
<>
291-
<RNTesterBlock title="Text with child Text and accessibilityLabel='a test label'">
291+
<RNTesterBlock title="Reads the accessibilityLabel">
292292
<Text accessible={true}>
293-
This text spells as
293+
This text spells as{' '}
294294
<Text
295295
accessibilityLabel="a test label"
296296
accessible={true}
@@ -299,9 +299,9 @@ class TtsSpanExamples extends React.Component<{}> {
299299
</Text>
300300
</Text>
301301
</RNTesterBlock>
302-
<RNTesterBlock title="Text with child Text and accessibilityRole='verbatim'">
302+
<RNTesterBlock title="Verbatim">
303303
<Text accessible={true}>
304-
Verbatim spells as
304+
Verbatim spells as{' '}
305305
<Text
306306
accessibilitySpan="verbatim"
307307
accessible={true}
@@ -310,18 +310,15 @@ class TtsSpanExamples extends React.Component<{}> {
310310
</Text>
311311
</Text>
312312
</RNTesterBlock>
313-
<RNTesterBlock title="Text with child Text and accessibilityRole='date'">
313+
<RNTesterBlock title="Date">
314314
<Text accessible={true}>
315-
Dates are spelled as
316-
<Text
317-
accessibilitySpan="date"
318-
accessible={true}
319-
style={styles.redBackground}>
315+
Dates are spelled as{' '}
316+
<Text accessible={true} style={styles.redBackground}>
320317
02/07/1987
321318
</Text>
322319
</Text>
323320
</RNTesterBlock>
324-
<RNTesterBlock title="Text with child Text and accessibilityRole='measure'">
321+
<RNTesterBlock title="Different type of measurement">
325322
<Text accessible={true}>
326323
Unit of Measure like meters are spelled as 60
327324
<Text
@@ -349,70 +346,76 @@ class TtsSpanExamples extends React.Component<{}> {
349346
</Text>
350347
</Text>
351348
</RNTesterBlock>
352-
<RNTesterBlock title="Text with child Text and accessibilitySpan='fraction'">
349+
<RNTesterBlock title="fraction">
353350
<Text accessible={true}>
354351
Fraction is spelled as
355352
<Text accessible={true} style={styles.redBackground}>
356353
1/2
357354
</Text>
358355
</Text>
359356
</RNTesterBlock>
360-
<RNTesterBlock title="Text with child Text and accessibilitySpan='decimal'">
357+
<RNTesterBlock title="cardinal">
361358
<Text accessible={true}>
362-
Decimal number is spelled as
359+
Cardinal number is spelled as{' '}
363360
<Text
364-
accessibilitySpan="decimal"
361+
accessibilitySpan="cardinal"
362+
accessibilityLabel="1"
365363
accessible={true}
366364
style={styles.redBackground}>
367-
10.20
365+
1
368366
</Text>
369367
</Text>
370368
</RNTesterBlock>
371-
<RNTesterBlock title="Text with child Text and accessibilitySpan='money' and accessibilityUnit='1, USD'">
369+
<RNTesterBlock title="ordinal">
372370
<Text accessible={true}>
373-
Money is spelled with the currency 1
371+
Ordinal number is spelled as{' '}
374372
<Text
375-
accessibilitySpan="money"
376-
accessibilityLabel="USD"
373+
accessibilitySpan="ordinal"
374+
accessibilityLabel="1"
377375
accessible={true}
378376
style={styles.redBackground}>
379-
US
377+
1
380378
</Text>
381379
</Text>
382380
</RNTesterBlock>
383-
<RNTesterBlock title="Text with child Text and accessibilitySpan='time' and accessibilityLabel='10:30'">
381+
<RNTesterBlock title="Digits">
384382
<Text accessible={true}>
385-
The time is
383+
Digits is spelled as{' '}
386384
<Text
387-
accessibilitySpan="time"
385+
accessibilityLabel="1 2 3 4 5 0"
388386
accessible={true}
389387
style={styles.redBackground}>
390-
10:30
388+
123450
391389
</Text>
392390
</Text>
393391
</RNTesterBlock>
394-
<RNTesterBlock title="Text with child Text and accessibilitySpan='telephone'">
392+
<RNTesterBlock title="Money">
395393
<Text accessible={true}>
396-
The telephone is
394+
Money is spelled{' '}
397395
<Text
398-
accessibilitySpan="telephone"
399-
accessibilityLabel="0118888888"
396+
accessibilityLabel="one million rupias"
397+
accessible={true}
400398
style={styles.redBackground}>
401-
0118888888
399+
1.000.000 IDR
402400
</Text>
403401
</Text>
404402
</RNTesterBlock>
405-
<RNTesterBlock title="accessibilityLabel is not correct and logcat includes debug log">
403+
<RNTesterBlock title="Time">
406404
<Text accessible={true}>
407-
Text with accessibilitySpan of type money, but accessibilityLabel
408-
USA does not correspond to a valid currency. TtsSpan defaults to
409-
TYPE_TEXT and reads the accessibilityLabel
405+
Time is spelled{' '}
406+
<Text accessible={true} style={styles.redBackground}>
407+
11:30
408+
</Text>
409+
</Text>
410+
</RNTesterBlock>
411+
<RNTesterBlock title="Text with child Text and accessibilitySpan='telephone'">
412+
<Text accessible={true}>
413+
The telephone is{' '}
410414
<Text
411-
accessibilitySpan="money"
412-
accessibilityLabel="USA"
413-
accessible={true}
415+
accessibilitySpan="telephone"
416+
accessibilityLabel="0118888888"
414417
style={styles.redBackground}>
415-
Some Text
418+
0118888888
416419
</Text>
417420
</Text>
418421
</RNTesterBlock>

0 commit comments

Comments
 (0)