refactoring logic parsing accRole to TtsSpan TYPES

Author: fabOnReact

Libraries/Components/View/ViewAccessibility.js

@@ -12,7 +12,6 @@
 
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
 
-export type AccessibilityUnit = 'none' | 'verbatim';
 // This must be kept in sync with the AccessibilityRolesMask in RCTViewManager.m
 export type AccessibilityRole =
   | 'none'

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

@@ -45,6 +45,7 @@
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
 import com.facebook.react.views.text.ReactSpan;
+import com.facebook.react.views.text.ReactTtsSpan;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -158,7 +159,7 @@ public static String getValue(AccessibilityRole role) {
         case GRID:
           return "android.widget.GridView";
         case VERBATIM:
-          return "android.type.verbatim";
+          return ReactTtsSpan.TYPE_VERBATIM;
         case NONE:
         case LINK:
         case SUMMARY:

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

@@ -25,6 +25,7 @@
 import com.facebook.react.uimanager.LayoutShadowNode;
 import com.facebook.react.uimanager.NativeViewHierarchyOptimizer;
 import com.facebook.react.uimanager.PixelUtil;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactShadowNode;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
@@ -184,10 +185,10 @@ private static void buildSpannedFromShadowNode(
         ops.add(
             new SetSpanOperation(start, end, new ReactClickableSpan(textShadowNode.getReactTag())));
       }
-      if (textShadowNode.mIsAccessibilityUnit && Build.VERSION.SDK_INT >= 21) {
+      if (textShadowNode.mAccessibilityUnit != null && Build.VERSION.SDK_INT >= 21) {
         ops.add(
             new SetSpanOperation(
-                start, end, new ReactTtsSpan.Builder(textShadowNode.mAccessibilityRole).build()));
+                start, end, new ReactTtsSpan.Builder(textShadowNode.mAccessibilityUnit).build()));
       }
       float effectiveLetterSpacing = textAttributes.getEffectiveLetterSpacing();
       if (!Float.isNaN(effectiveLetterSpacing)
@@ -330,9 +331,8 @@ protected Spannable spannedFromShadowNode(
   protected int mColor;
   protected boolean mIsBackgroundColorSet = false;
   protected int mBackgroundColor;
-  protected String mAccessibilityRole;
+  protected @Nullable String mAccessibilityUnit = null;
   protected boolean mIsAccessibilityLink = false;
-  protected boolean mIsAccessibilityUnit;
 
   protected int mNumberOfLines = UNSET;
   protected int mTextAlign = Gravity.NO_GRAVITY;
@@ -507,10 +507,11 @@ public void setBackgroundColor(@Nullable Integer color) {
   @ReactProp(name = ViewProps.ACCESSIBILITY_ROLE)
   public void setIsAccessibilityLink(@Nullable String accessibilityRole) {
     if (isVirtual()) {
-      mAccessibilityRole = accessibilityRole;
+      String roleClassName =
+          AccessibilityRole.getValue(AccessibilityRole.fromValue(accessibilityRole));
       mIsAccessibilityLink = Objects.equals(accessibilityRole, "link");
-      Set<String> TYPES = Set.of("verbatim", "date");
-      mIsAccessibilityUnit = TYPES.contains(accessibilityRole);
+      Set<String> UNIT_TYPES = Set.of(ReactTtsSpan.TYPE_VERBATIM, ReactTtsSpan.TYPE_DATE);
+      mAccessibilityUnit = UNIT_TYPES.contains(roleClassName) ? roleClassName : null;
       markUpdated();
     }
   }

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

@@ -28,13 +28,7 @@ public static class Builder<C extends Builder<?>> {
     private PersistableBundle mArgs = new PersistableBundle();
 
     public Builder(String type) {
-      if (type == "verbatim") {
-        mType = TYPE_VERBATIM;
-      } else if (type == "date") {
-        mType = TYPE_DATE;
-      } else {
-        mType = TYPE_TEXT;
-      }
+      mType = type;
     }
 
     public ReactTtsSpan build() {