adding all TtsSpan, no comp errors

Author: fabOnReact

Libraries/Components/View/ViewAccessibility.js

@@ -19,7 +19,20 @@ export type AccessibilityRole =
   | 'togglebutton'
   | 'link'
   | 'verbatim'
+  | 'cardinal'
+  | 'ordinal'
+  | 'decimal'
+  | 'fraction'
+  | 'cardinal'
+  | 'measure'
+  | 'time'
   | 'date'
+  | 'telephone'
+  | 'electronic'
+  | 'decimal'
+  | 'money'
+  | 'digits'
+  | 'verbatim'
   | 'search'
   | 'image'
   | 'keyboardkey'

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

@@ -99,8 +99,18 @@ public enum AccessibilityRole {
     BUTTON,
     TOGGLEBUTTON,
     LINK,
-    VERBATIM,
+    CARDINAL,
+    ORDINAL,
+    DECIMAL,
+    FRACTION,
+    MEASURE,
+    TIME,
     DATE,
+    TELEPHONE,
+    ELECTRONIC,
+    MONEY,
+    DIGITS,
+    VERBATIM,
     SEARCH,
     IMAGE,
     IMAGEBUTTON,
@@ -158,17 +168,34 @@ public static String getValue(AccessibilityRole role) {
           return "android.widget.AbsListView";
         case GRID:
           return "android.widget.GridView";
-        case VERBATIM:
-          return ReactTtsSpan.TYPE_VERBATIM;
+        case ORDINAL:
+          return ReactTtsSpan.TYPE_ORDINAL;
+        case DECIMAL:
+          return ReactTtsSpan.TYPE_DECIMAL;
+        case FRACTION:
+          return ReactTtsSpan.TYPE_FRACTION;
+        case CARDINAL:
+          return ReactTtsSpan.TYPE_CARDINAL;
+        case MEASURE:
+          return ReactTtsSpan.TYPE_MEASURE;
+        case TIME:
+          return ReactTtsSpan.TYPE_TIME;
         case DATE:
           return ReactTtsSpan.TYPE_DATE;
-        case NONE:
+        case TELEPHONE:
+          return ReactTtsSpan.TYPE_TELEPHONE;
+        case ELECTRONIC:
+          return ReactTtsSpan.TYPE_ELECTRONIC;
+        case MONEY:
+          return ReactTtsSpan.TYPE_MONEY;
+        case DIGITS:
+          return ReactTtsSpan.TYPE_DIGITS;
+        case VERBATIM:
+          return ReactTtsSpan.TYPE_VERBATIM;
         case LINK:
         case SUMMARY:
-        case HEADER:
         case ALERT:
         case COMBOBOX:
-        case MENU:
         case MENUBAR:
         case MENUITEM:
         case PROGRESSBAR:

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

@@ -14,10 +14,35 @@
 
 /*
  * Wraps {@link TtsSpan} as a {@link ReactSpan}.
+ * A span that supplies additional meta-data for the associated text intended
+ * for text-to-speech engines. If the text is being processed by a
+ * text-to-speech engine, the engine may use the data in this span in addition
+ * to or instead of its associated text.
+ *
+ * Each instance of a TtsSpan has a type, for example {@link #TYPE_DATE}
+ * or {@link #TYPE_MEASURE}. And a list of arguments, provided as
+ * key-value pairs in a bundle.
+ *
+ * The inner classes are there for convenience and provide builders for each
+ * TtsSpan type.
  */
 public class ReactTtsSpan extends TtsSpan implements ReactSpan {
+
   // supported TYPES in react-native
-  public static Set<String> SUPPORTED_UNIT_TYPES = Set.of(TYPE_VERBATIM, TYPE_DATE);
+  public static Set<String> SUPPORTED_UNIT_TYPES =
+      Set.of(
+          TYPE_CARDINAL,
+          TYPE_ORDINAL,
+          TYPE_DECIMAL,
+          TYPE_FRACTION,
+          TYPE_MEASURE,
+          TYPE_TIME,
+          TYPE_DATE,
+          TYPE_TELEPHONE,
+          TYPE_ELECTRONIC,
+          TYPE_MONEY,
+          TYPE_DIGITS,
+          TYPE_VERBATIM);
 
   public ReactTtsSpan(String type, PersistableBundle args) {
     super(type, args);

ReactCommon/react/renderer/attributedstring/conversions.h

@@ -573,10 +573,30 @@ inline std::string toString(const AccessibilityRole &accessibilityRole) {
       return "button";
     case AccessibilityRole::Link:
       return "link";
-    case AccessibilityRole::Verbatim:
-      return "verbatim";
     case AccessibilityRole::Date:
       return "date";
+    case AccessibilityRole::Ordinal:
+      return "ordinal";
+    case AccessibilityRole::Decimal:
+      return "decimal";
+    case AccessibilityRole::Fraction:
+      return "fraction";
+    case AccessibilityRole::Cardinal:
+      return "cardinal";
+    case AccessibilityRole::Measure:
+      return "measure";
+    case AccessibilityRole::Time:
+      return "time";
+    case AccessibilityRole::Telephone:
+      return "telephone";
+    case AccessibilityRole::Electronic:
+      return "electronic";
+    case AccessibilityRole::Money:
+      return "money";
+    case AccessibilityRole::Digits:
+      return "digits";
+    case AccessibilityRole::Verbatim:
+      return "verbatim";
     case AccessibilityRole::Search:
       return "search";
     case AccessibilityRole::Image:
@@ -652,6 +672,28 @@ inline void fromRawValue(
       result = AccessibilityRole::Verbatim;
     } else if (string == "date") {
       result = AccessibilityRole::Date;
+    } else if (string == "cardinal") {
+      result = AccessibilityRole::Cardinal;
+    } else if (string == "ordinal") {
+      result = AccessibilityRole::Ordinal;
+    } else if (string == "decimal") {
+      result = AccessibilityRole::Decimal;
+    } else if (string == "fraction") {
+      result = AccessibilityRole::Fraction;
+    } else if (string == "measure") {
+      result = AccessibilityRole::Measure;
+    } else if (string == "time") {
+      result = AccessibilityRole::Time;
+    } else if (string == "telephone") {
+      result = AccessibilityRole::Telephone;
+    } else if (string == "electronic") {
+      result = AccessibilityRole::Electronic;
+    } else if (string == "money") {
+      result = AccessibilityRole::Money;
+    } else if (string == "digits") {
+      result = AccessibilityRole::Digits;
+    } else if (string == "verbatim") {
+      result = AccessibilityRole::Verbatim;
     } else if (string == "search") {
       result = AccessibilityRole::Search;
     } else if (string == "image") {

ReactCommon/react/renderer/attributedstring/primitives.h

@@ -96,8 +96,18 @@ enum class AccessibilityRole {
   None,
   Button,
   Link,
-  Verbatim,
+  Cardinal,
+  Ordinal,
+  Decimal,
+  Fraction,
+  Measure,
+  Time,
   Date,
+  Telephone,
+  Electronic,
+  Money,
+  Digits,
+  Verbatim,
   Search,
   Image,
   Imagebutton,

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

@@ -17,12 +17,9 @@ export default function TextAdjustsDynamicLayoutExample(props: {}): React.Node {
   return (
     <>
       <View>
-        <Text accessible={true}>
+        <Text accessibilityRole="date" accessible={true}>
           My number is{' '}
-          <Text
-            accessibilityRole="date"
-            accessible={true}
-            style={{backgroundColor: 'red'}}>
+          <Text accessible={true} style={{backgroundColor: 'red'}}>
             02/07/1987
           </Text>
           .