react-native 0.68.2 → 0.69.0-rc.2

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java

@@ -23,10 +23,10 @@ public class ScrollEvent extends Event<ScrollEvent> {
   private static final Pools.SynchronizedPool<ScrollEvent> EVENTS_POOL =
       new Pools.SynchronizedPool<>(3);
 
-  private int mScrollX;
-  private int mScrollY;
-  private double mXVelocity;
-  private double mYVelocity;
+  private float mScrollX;
+  private float mScrollY;
+  private float mXVelocity;
+  private float mYVelocity;
   private int mContentWidth;
   private int mContentHeight;
   private int mScrollViewWidth;
@@ -37,8 +37,8 @@ public class ScrollEvent extends Event<ScrollEvent> {
   public static ScrollEvent obtain(
       int viewTag,
       ScrollEventType scrollEventType,
-      int scrollX,
-      int scrollY,
+      float scrollX,
+      float scrollY,
       float xVelocity,
       float yVelocity,
       int contentWidth,
@@ -63,8 +63,8 @@ public class ScrollEvent extends Event<ScrollEvent> {
       int surfaceId,
       int viewTag,
       ScrollEventType scrollEventType,
-      int scrollX,
-      int scrollY,
+      float scrollX,
+      float scrollY,
       float xVelocity,
       float yVelocity,
       int contentWidth,
@@ -107,8 +107,8 @@ public class ScrollEvent extends Event<ScrollEvent> {
       int surfaceId,
       int viewTag,
       ScrollEventType scrollEventType,
-      int scrollX,
-      int scrollY,
+      float scrollX,
+      float scrollY,
       float xVelocity,
       float yVelocity,
       int contentWidth,

package/ReactAndroid/src/main/java/com/facebook/react/views/slider/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     visibility = [
         "PUBLIC",
     ],

package/ReactAndroid/src/main/java/com/facebook/react/views/slider/ReactSliderManager.java

@@ -16,7 +16,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.SeekBar;
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
 import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.AccessibilityActionCompat;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableMap;
@@ -150,7 +149,8 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider>
   @Override
   protected ReactSlider createViewInstance(ThemedReactContext context) {
     final ReactSlider slider = new ReactSlider(context, null, STYLE);
-    ViewCompat.setAccessibilityDelegate(slider, new ReactSliderAccessibilityDelegate());
+    ReactSliderAccessibilityDelegate.setDelegate(
+        slider, slider.isFocusable(), slider.getImportantForAccessibility());
     return slider;
   }
 
@@ -310,6 +310,11 @@ public class ReactSliderManager extends SimpleViewManager<ReactSlider>
   }
 
   protected class ReactSliderAccessibilityDelegate extends ReactAccessibilityDelegate {
+    public ReactSliderAccessibilityDelegate(
+        final View view, boolean originalFocus, int originalImportantForAccessibility) {
+      super(view, originalFocus, originalImportantForAccessibility);
+    }
+
     private boolean isSliderAction(int action) {
       return (action == AccessibilityActionCompat.ACTION_SCROLL_FORWARD.getId())
           || (action == AccessibilityActionCompat.ACTION_SCROLL_BACKWARD.getId())

package/ReactAndroid/src/main/java/com/facebook/react/views/swiperefresh/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:annotation"),
         react_native_dep("third-party/android/androidx:core"),

package/ReactAndroid/src/main/java/com/facebook/react/views/switchview/BUCK

@@ -5,7 +5,10 @@ rn_android_library(
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
     provided_deps = [
         react_native_dep("third-party/android/androidx:appcompat"),
         react_native_dep("third-party/android/androidx:core"),

package/ReactAndroid/src/main/java/com/facebook/react/views/text/BUCK

@@ -1,11 +1,19 @@
-load("//tools/build_defs/oss:rn_defs.bzl", "YOGA_TARGET", "react_native_dep", "react_native_target", "rn_android_library")
+load("//tools/build_defs/oss:rn_defs.bzl", "IS_OSS_BUILD", "YOGA_TARGET", "react_native_android_toplevel_dep", "react_native_dep", "react_native_target", "rn_android_library")
+
+# TODO(T115916830): Remove when Kotlin files are used in this module
+KOTLIN_STDLIB_DEPS = [react_native_android_toplevel_dep("third-party/kotlin:kotlin-stdlib")] if IS_OSS_BUILD else []
 
 rn_android_library(
     name = "text",
     srcs = glob(["*.java"]),
     autoglob = False,
     is_androidx = True,
-    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    labels = [
+        "pfh:ReactNative_CommonInfrastructurePlaceholder",
+        "supermodule:xplat/default/public.react_native.infra",
+    ],
+    language = "KOTLIN",
+    pure_kotlin = False,
     required_for_source_only_abi = True,
     visibility = [
         "PUBLIC",
@@ -29,5 +37,6 @@ rn_android_library(
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/uimanager/annotations:annotations"),
         react_native_target("java/com/facebook/react/views/view:view"),
-    ],
+        react_native_target("res:uimanager"),
+    ] + KOTLIN_STDLIB_DEPS,
 )

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

@@ -35,6 +35,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /**
  * {@link ReactShadowNode} abstract class for spannable text nodes.
@@ -178,6 +179,10 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
             new SetSpanOperation(
                 start, end, new ReactBackgroundColorSpan(textShadowNode.mBackgroundColor)));
       }
+      if (textShadowNode.mIsAccessibilityLink) {
+        ops.add(
+            new SetSpanOperation(start, end, new ReactClickableSpan(textShadowNode.getReactTag())));
+      }
       float effectiveLetterSpacing = textAttributes.getEffectiveLetterSpacing();
       if (!Float.isNaN(effectiveLetterSpacing)
           && (parentTextAttributes == null
@@ -319,6 +324,7 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
   protected int mColor;
   protected boolean mIsBackgroundColorSet = false;
   protected int mBackgroundColor;
+  protected boolean mIsAccessibilityLink = false;
 
   protected int mNumberOfLines = UNSET;
   protected int mTextAlign = Gravity.NO_GRAVITY;
@@ -490,6 +496,14 @@ public abstract class ReactBaseTextShadowNode extends LayoutShadowNode {
     }
   }
 
+  @ReactProp(name = ViewProps.ACCESSIBILITY_ROLE)
+  public void setIsAccessibilityLink(@Nullable String accessibilityRole) {
+    if (isVirtual()) {
+      mIsAccessibilityLink = Objects.equals(accessibilityRole, "link");
+      markUpdated();
+    }
+  }
+
   @ReactProp(name = ViewProps.FONT_FAMILY)
   public void setFontFamily(@Nullable String fontFamily) {
     mFontFamily = fontFamily;

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java

@@ -39,11 +39,9 @@ import com.facebook.react.views.view.ViewGroupClickEvent;
 class ReactClickableSpan extends ClickableSpan implements ReactSpan {
 
   private final int mReactTag;
-  private final int mForegroundColor;
 
-  ReactClickableSpan(int reactTag, int foregroundColor) {
+  ReactClickableSpan(int reactTag) {
     mReactTag = reactTag;
-    mForegroundColor = foregroundColor;
   }
 
   @Override
@@ -59,9 +57,8 @@ class ReactClickableSpan extends ClickableSpan implements ReactSpan {
 
   @Override
   public void updateDrawState(@NonNull TextPaint ds) {
-    super.updateDrawState(ds);
-    ds.setColor(mForegroundColor);
-    ds.setUnderlineText(false);
+    // no-op to make sure we don't change the link color or add an underline by default, as the
+    // superclass does.
   }
 
   public int getReactTag() {

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextAnchorViewManager.java

@@ -43,6 +43,11 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
   };
   private static final String TAG = "ReactTextAnchorViewManager";
 
+  @ReactProp(name = "accessible")
+  public void setAccessible(ReactTextView view, boolean accessible) {
+    view.setFocusable(accessible);
+  }
+
   // maxLines can only be set in master view (block), doesn't really make sense to set in a span
   @ReactProp(name = ViewProps.NUMBER_OF_LINES, defaultInt = ViewDefaults.NUMBER_OF_LINES)
   public void setNumberOfLines(ReactTextView view, int numberOfLines) {

package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -19,11 +19,15 @@ import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
 import android.text.util.Linkify;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.appcompat.widget.TintContextWrapper;
+import androidx.core.view.AccessibilityDelegateCompat;
+import androidx.core.view.ViewCompat;
+import androidx.customview.widget.ExploreByTouchHelper;
 import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.Arguments;
@@ -551,4 +555,20 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   public void setLinkifyMask(int mask) {
     mLinkifyMaskType = mask;
   }
+
+  @Override
+  protected boolean dispatchHoverEvent(MotionEvent event) {
+    // if this view has an accessibility delegate set, and that delegate supports virtual view
+    // children (used for links), pass the hover event along to it so that touching and holding on
+    // this text will properly move focus to the virtual children.
+    if (ViewCompat.hasAccessibilityDelegate(this)) {
+      AccessibilityDelegateCompat delegate = ViewCompat.getAccessibilityDelegate(this);
+      if (delegate instanceof ExploreByTouchHelper) {
+        return ((ExploreByTouchHelper) delegate).dispatchHoverEvent(event)
+            || super.dispatchHoverEvent(event);
+      }
+    }
+
+    return super.dispatchHoverEvent(event);
+  }
 }

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

@@ -10,14 +10,16 @@ package com.facebook.react.views.text;
 import android.content.Context;
 import android.text.Spannable;
 import androidx.annotation.Nullable;
+import com.facebook.react.R;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.annotations.VisibleForTesting;
-import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.IViewManagerWithChildren;
+import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -57,16 +59,29 @@ public class ReactTextViewManager
   @Override
   public void updateExtraData(ReactTextView view, Object extraData) {
     ReactTextUpdate update = (ReactTextUpdate) extraData;
+    Spannable spannable = update.getText();
     if (update.containsImages()) {
-      Spannable spannable = update.getText();
       TextInlineImageSpan.possiblyUpdateInlineImageSpans(spannable, view);
     }
     view.setText(update);
+
+    // If this text view contains any clickable spans, set a view tag and reset the accessibility
+    // delegate so that these can be picked up by the accessibility system.
+    ReactClickableSpan[] clickableSpans =
+        spannable.getSpans(0, update.getText().length(), ReactClickableSpan.class);
+
+    if (clickableSpans.length > 0) {
+      view.setTag(
+          R.id.accessibility_links,
+          new ReactAccessibilityDelegate.AccessibilityLinks(clickableSpans, spannable));
+      ReactAccessibilityDelegate.resetDelegate(
+          view, view.isFocusable(), view.getImportantForAccessibility());
+    }
   }
 
   @Override
   public ReactTextShadowNode createShadowNodeInstance() {
-    return new ReactTextShadowNode();
+    return new ReactTextShadowNode(mReactTextViewManagerCallback);
   }
 
   public ReactTextShadowNode createShadowNodeInstance(
@@ -97,7 +112,7 @@ public class ReactTextViewManager
     }
 
     if (ReactFeatureFlags.isMapBufferSerializationEnabled()) {
-      ReadableMapBuffer stateMapBuffer = stateWrapper.getStatDataMapBuffer();
+      MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
       if (stateMapBuffer != null) {
         return getReactTextUpdate(view, props, stateMapBuffer);
       }
@@ -127,11 +142,10 @@ public class ReactTextViewManager
         TextAttributeProps.getJustificationMode(props));
   }
 
-  private Object getReactTextUpdate(
-      ReactTextView view, ReactStylesDiffMap props, ReadableMapBuffer state) {
+  private Object getReactTextUpdate(ReactTextView view, ReactStylesDiffMap props, MapBuffer state) {
 
-    ReadableMapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
-    ReadableMapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
+    MapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
+    MapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
     Spannable spanned =
         TextLayoutManagerMapBuffer.getOrCreateSpannableForText(
             view.getContext(), attributedString, mReactTextViewManagerCallback);
@@ -175,7 +189,6 @@ public class ReactTextViewManager
       float height,
       YogaMeasureMode heightMode,
       @Nullable float[] attachmentsPositions) {
-
     return TextLayoutManager.measureText(
         context,
         localData,
@@ -188,6 +201,29 @@ public class ReactTextViewManager
         attachmentsPositions);
   }
 
+  @Override
+  public long measure(
+      Context context,
+      MapBuffer localData,
+      MapBuffer props,
+      @Nullable MapBuffer state,
+      float width,
+      YogaMeasureMode widthMode,
+      float height,
+      YogaMeasureMode heightMode,
+      @Nullable float[] attachmentsPositions) {
+    return TextLayoutManagerMapBuffer.measureText(
+        context,
+        localData,
+        props,
+        width,
+        widthMode,
+        height,
+        heightMode,
+        mReactTextViewManagerCallback,
+        attachmentsPositions);
+  }
+
   @Override
   public void setPadding(ReactTextView view, int left, int top, int right, int bottom) {
     view.setPadding(left, top, right, bottom);

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.java

@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.common.mapbuffer.ReadableMapBuffer;
+import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
@@ -48,7 +48,7 @@ public class TextAttributeProps {
   public static final short TA_KEY_TEXT_DECORATION_COLOR = 14;
   public static final short TA_KEY_TEXT_DECORATION_LINE = 15;
   public static final short TA_KEY_TEXT_DECORATION_STYLE = 16;
-  public static final short TA_KEY_TEXT_SHADOW_RAIDUS = 18;
+  public static final short TA_KEY_TEXT_SHADOW_RADIUS = 18;
   public static final short TA_KEY_TEXT_SHADOW_COLOR = 19;
   public static final short TA_KEY_IS_HIGHLIGHTED = 20;
   public static final short TA_KEY_LAYOUT_DIRECTION = 21;
@@ -102,6 +102,7 @@ public class TextAttributeProps {
 
   protected @Nullable ReactAccessibilityDelegate.AccessibilityRole mAccessibilityRole = null;
   protected boolean mIsAccessibilityRoleSet = false;
+  protected boolean mIsAccessibilityLink = false;
 
   protected int mFontStyle = UNSET;
   protected int mFontWeight = UNSET;
@@ -136,51 +137,48 @@ public class TextAttributeProps {
 
   private TextAttributeProps() {}
 
-  /**
-   * Build a TextAttributeProps using data from the {@link ReadableMapBuffer} received as a
-   * parameter.
-   */
-  public static TextAttributeProps fromReadableMapBuffer(ReadableMapBuffer props) {
+  /** Build a TextAttributeProps using data from the {@link MapBuffer} received as a parameter. */
+  public static TextAttributeProps fromMapBuffer(MapBuffer props) {
     TextAttributeProps result = new TextAttributeProps();
 
     // TODO T83483191: Review constants that are not being set!
-    Iterator<ReadableMapBuffer.MapBufferEntry> iterator = props.iterator();
+    Iterator<MapBuffer.Entry> iterator = props.iterator();
     while (iterator.hasNext()) {
-      ReadableMapBuffer.MapBufferEntry entry = iterator.next();
+      MapBuffer.Entry entry = iterator.next();
       switch (entry.getKey()) {
         case TA_KEY_FOREGROUND_COLOR:
-          result.setColor(entry.getInt());
+          result.setColor(entry.getIntValue());
           break;
         case TA_KEY_BACKGROUND_COLOR:
-          result.setBackgroundColor(entry.getInt());
+          result.setBackgroundColor(entry.getIntValue());
           break;
         case TA_KEY_OPACITY:
           break;
         case TA_KEY_FONT_FAMILY:
-          result.setFontFamily(entry.getString());
+          result.setFontFamily(entry.getStringValue());
           break;
         case TA_KEY_FONT_SIZE:
-          result.setFontSize((float) entry.getDouble());
+          result.setFontSize((float) entry.getDoubleValue());
           break;
         case TA_KEY_FONT_SIZE_MULTIPLIER:
           break;
         case TA_KEY_FONT_WEIGHT:
-          result.setFontWeight(entry.getString());
+          result.setFontWeight(entry.getStringValue());
           break;
         case TA_KEY_FONT_STYLE:
-          result.setFontStyle(entry.getString());
+          result.setFontStyle(entry.getStringValue());
           break;
         case TA_KEY_FONT_VARIANT:
-          result.setFontVariant(entry.getReadableMapBuffer());
+          result.setFontVariant(entry.getMapBufferValue());
           break;
         case TA_KEY_ALLOW_FONT_SCALING:
-          result.setAllowFontScaling(entry.getBoolean());
+          result.setAllowFontScaling(entry.getBooleanValue());
           break;
         case TA_KEY_LETTER_SPACING:
-          result.setLetterSpacing((float) entry.getDouble());
+          result.setLetterSpacing((float) entry.getDoubleValue());
           break;
         case TA_KEY_LINE_HEIGHT:
-          result.setLineHeight((float) entry.getDouble());
+          result.setLineHeight((float) entry.getDoubleValue());
           break;
         case TA_KEY_ALIGNMENT:
           break;
@@ -189,23 +187,23 @@ public class TextAttributeProps {
         case TA_KEY_TEXT_DECORATION_COLOR:
           break;
         case TA_KEY_TEXT_DECORATION_LINE:
-          result.setTextDecorationLine(entry.getString());
+          result.setTextDecorationLine(entry.getStringValue());
           break;
         case TA_KEY_TEXT_DECORATION_STYLE:
           break;
-        case TA_KEY_TEXT_SHADOW_RAIDUS:
-          result.setTextShadowRadius(entry.getInt());
+        case TA_KEY_TEXT_SHADOW_RADIUS:
+          result.setTextShadowRadius((float) entry.getDoubleValue());
           break;
         case TA_KEY_TEXT_SHADOW_COLOR:
-          result.setTextShadowColor(entry.getInt());
+          result.setTextShadowColor(entry.getIntValue());
           break;
         case TA_KEY_IS_HIGHLIGHTED:
           break;
         case TA_KEY_LAYOUT_DIRECTION:
-          result.setLayoutDirection(entry.getString());
+          result.setLayoutDirection(entry.getStringValue());
           break;
         case TA_KEY_ACCESSIBILITY_ROLE:
-          result.setAccessibilityRole(entry.getString());
+          result.setAccessibilityRole(entry.getStringValue());
           break;
       }
     }
@@ -243,7 +241,7 @@ public class TextAttributeProps {
     result.setTextDecorationLine(getStringProp(props, ViewProps.TEXT_DECORATION_LINE));
     result.setTextShadowOffset(
         props.hasKey(PROP_SHADOW_OFFSET) ? props.getMap(PROP_SHADOW_OFFSET) : null);
-    result.setTextShadowRadius(getIntProp(props, PROP_SHADOW_RADIUS, 1));
+    result.setTextShadowRadius(getFloatProp(props, PROP_SHADOW_RADIUS, 1));
     result.setTextShadowColor(getIntProp(props, PROP_SHADOW_COLOR, DEFAULT_TEXT_SHADOW_COLOR));
     result.setTextTransform(getStringProp(props, PROP_TEXT_TRANSFORM));
     result.setLayoutDirection(getStringProp(props, ViewProps.LAYOUT_DIRECTION));
@@ -418,17 +416,17 @@ public class TextAttributeProps {
     mFontFeatureSettings = ReactTypefaceUtils.parseFontVariant(fontVariant);
   }
 
-  private void setFontVariant(@Nullable ReadableMapBuffer fontVariant) {
+  private void setFontVariant(@Nullable MapBuffer fontVariant) {
     if (fontVariant == null || fontVariant.getCount() == 0) {
       mFontFeatureSettings = null;
       return;
     }
 
     List<String> features = new ArrayList<>();
-    Iterator<ReadableMapBuffer.MapBufferEntry> iterator = fontVariant.iterator();
+    Iterator<MapBuffer.Entry> iterator = fontVariant.iterator();
     while (iterator.hasNext()) {
-      ReadableMapBuffer.MapBufferEntry entry = iterator.next();
-      String value = entry.getString();
+      MapBuffer.Entry entry = iterator.next();
+      String value = entry.getStringValue();
       if (value != null) {
         switch (value) {
           case "small-caps":
@@ -543,9 +541,11 @@ public class TextAttributeProps {
 
   private void setAccessibilityRole(@Nullable String accessibilityRole) {
     if (accessibilityRole != null) {
-      mIsAccessibilityRoleSet = accessibilityRole != null;
+      mIsAccessibilityRoleSet = true;
       mAccessibilityRole =
           ReactAccessibilityDelegate.AccessibilityRole.fromValue(accessibilityRole);
+      mIsAccessibilityLink =
+          mAccessibilityRole.equals(ReactAccessibilityDelegate.AccessibilityRole.LINK);
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java

@@ -31,8 +31,8 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
-import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.yoga.YogaConstants;
@@ -125,12 +125,10 @@ public class TextLayoutManager {
                 sb.length(),
                 new TextInlineViewPlaceholderSpan(reactTag, (int) width, (int) height)));
       } else if (end >= start) {
-        if (ReactAccessibilityDelegate.AccessibilityRole.LINK.equals(
-            textAttributes.mAccessibilityRole)) {
-          ops.add(
-              new SetSpanOperation(
-                  start, end, new ReactClickableSpan(reactTag, textAttributes.mColor)));
-        } else if (textAttributes.mIsColorSet) {
+        if (textAttributes.mIsAccessibilityLink) {
+          ops.add(new SetSpanOperation(start, end, new ReactClickableSpan(reactTag)));
+        }
+        if (textAttributes.mIsColorSet) {
           ops.add(
               new SetSpanOperation(
                   start, end, new ReactForegroundColorSpan(textAttributes.mColor)));
@@ -197,19 +195,25 @@ public class TextLayoutManager {
 
     Spannable preparedSpannableText;
 
-    synchronized (sSpannableCacheLock) {
-      preparedSpannableText = sSpannableCache.get((ReadableNativeMap) attributedString);
-      if (preparedSpannableText != null) {
-        return preparedSpannableText;
+    if (ReactFeatureFlags.enableSpannableCache) {
+      synchronized (sSpannableCacheLock) {
+        preparedSpannableText = sSpannableCache.get((ReadableNativeMap) attributedString);
+        if (preparedSpannableText != null) {
+          return preparedSpannableText;
+        }
       }
-    }
 
-    preparedSpannableText =
-        createSpannableFromAttributedString(
-            context, attributedString, reactTextViewManagerCallback);
+      preparedSpannableText =
+          createSpannableFromAttributedString(
+              context, attributedString, reactTextViewManagerCallback);
 
-    synchronized (sSpannableCacheLock) {
-      sSpannableCache.put((ReadableNativeMap) attributedString, preparedSpannableText);
+      synchronized (sSpannableCacheLock) {
+        sSpannableCache.put((ReadableNativeMap) attributedString, preparedSpannableText);
+      }
+    } else {
+      preparedSpannableText =
+          createSpannableFromAttributedString(
+              context, attributedString, reactTextViewManagerCallback);
     }
 
     return preparedSpannableText;