react-native-tvos 0.75.3-0 → 0.76.0-0

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

@@ -8,6 +8,8 @@
 package com.facebook.react.views.text;
 
 import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.ThemedReactContext;
@@ -32,6 +34,12 @@ public class ReactRawTextManager extends ViewManager<View, ReactRawTextShadowNod
     throw new IllegalStateException("Attempt to create a native view for RCTRawText");
   }
 
+  @Override
+  protected @Nullable View prepareToRecycleView(
+      @NonNull ThemedReactContext reactContext, @NonNull View view) {
+    throw new IllegalStateException("Attempt to recycle a native view for RCTRawText");
+  }
+
   @Override
   public void updateExtraData(View view, Object extraData) {}
 

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

@@ -13,17 +13,25 @@ import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.view.Gravity;
 import android.view.View;
+import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
+import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
+import com.facebook.react.uimanager.BackgroundStyleApplicator;
 import com.facebook.react.uimanager.BaseViewManager;
+import com.facebook.react.uimanager.LengthPercentage;
+import com.facebook.react.uimanager.LengthPercentageType;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.Spacing;
 import com.facebook.react.uimanager.ViewDefaults;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.annotations.ReactPropGroup;
-import com.facebook.yoga.YogaConstants;
+import com.facebook.react.uimanager.style.BorderRadiusProp;
+import com.facebook.react.uimanager.style.BorderStyle;
+import com.facebook.react.uimanager.style.LogicalEdge;
 
 /**
  * Abstract class for anchor {@code <Text>}-ish spannable views, such as {@link TextView} or {@link
@@ -38,7 +46,13 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
     extends BaseViewManager<T, C> {
 
   private static final int[] SPACING_TYPES = {
-    Spacing.ALL, Spacing.LEFT, Spacing.RIGHT, Spacing.TOP, Spacing.BOTTOM,
+    Spacing.ALL,
+    Spacing.LEFT,
+    Spacing.RIGHT,
+    Spacing.TOP,
+    Spacing.BOTTOM,
+    Spacing.START,
+    Spacing.END
   };
   private static final String TAG = "ReactTextAnchorViewManager";
 
@@ -137,22 +151,38 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
         ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
         ViewProps.BORDER_BOTTOM_LEFT_RADIUS
       },
-      defaultFloat = YogaConstants.UNDEFINED)
+      defaultFloat = Float.NaN)
   public void setBorderRadius(ReactTextView view, int index, float borderRadius) {
-    if (!YogaConstants.isUndefined(borderRadius)) {
-      borderRadius = PixelUtil.toPixelFromDIP(borderRadius);
-    }
-
-    if (index == 0) {
-      view.setBorderRadius(borderRadius);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      @Nullable
+      LengthPercentage radius =
+          Float.isNaN(borderRadius)
+              ? null
+              : new LengthPercentage(borderRadius, LengthPercentageType.POINT);
+      BackgroundStyleApplicator.setBorderRadius(view, BorderRadiusProp.values()[index], radius);
     } else {
-      view.setBorderRadius(borderRadius, index - 1);
+      if (!Float.isNaN(borderRadius)) {
+        borderRadius = PixelUtil.toPixelFromDIP(borderRadius);
+      }
+
+      if (index == 0) {
+        view.setBorderRadius(borderRadius);
+      } else {
+        view.setBorderRadius(borderRadius, index - 1);
+      }
     }
   }
 
   @ReactProp(name = "borderStyle")
   public void setBorderStyle(ReactTextView view, @Nullable String borderStyle) {
-    view.setBorderStyle(borderStyle);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      @Nullable
+      BorderStyle parsedBorderStyle =
+          borderStyle == null ? null : BorderStyle.fromString(borderStyle);
+      BackgroundStyleApplicator.setBorderStyle(view, parsedBorderStyle);
+    } else {
+      view.setBorderStyle(borderStyle);
+    }
   }
 
   @ReactPropGroup(
@@ -162,13 +192,19 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
         ViewProps.BORDER_RIGHT_WIDTH,
         ViewProps.BORDER_TOP_WIDTH,
         ViewProps.BORDER_BOTTOM_WIDTH,
+        ViewProps.BORDER_START_WIDTH,
+        ViewProps.BORDER_END_WIDTH,
       },
-      defaultFloat = YogaConstants.UNDEFINED)
+      defaultFloat = Float.NaN)
   public void setBorderWidth(ReactTextView view, int index, float width) {
-    if (!YogaConstants.isUndefined(width)) {
-      width = PixelUtil.toPixelFromDIP(width);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderWidth(view, LogicalEdge.values()[index], width);
+    } else {
+      if (!Float.isNaN(width)) {
+        width = PixelUtil.toPixelFromDIP(width);
+      }
+      view.setBorderWidth(SPACING_TYPES[index], width);
     }
-    view.setBorderWidth(SPACING_TYPES[index], width);
   }
 
   @ReactPropGroup(
@@ -180,11 +216,12 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
         "borderBottomColor"
       },
       customType = "Color")
-  public void setBorderColor(ReactTextView view, int index, Integer color) {
-    float rgbComponent =
-        color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
-    float alphaComponent = color == null ? YogaConstants.UNDEFINED : (float) ((int) color >>> 24);
-    view.setBorderColor(SPACING_TYPES[index], rgbComponent, alphaComponent);
+  public void setBorderColor(ReactTextView view, int index, @Nullable Integer color) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderColor(view, LogicalEdge.ALL, color);
+    } else {
+      view.setBorderColor(SPACING_TYPES[index], color);
+    }
   }
 
   @ReactProp(name = ViewProps.INCLUDE_FONT_PADDING, defaultBoolean = true)
@@ -224,4 +261,20 @@ public abstract class ReactTextAnchorViewManager<T extends View, C extends React
   public void setNotifyOnInlineViewLayout(ReactTextView view, boolean notifyOnInlineViewLayout) {
     view.setNotifyOnInlineViewLayout(notifyOnInlineViewLayout);
   }
+
+  @ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
+  public void setBoxShadow(ReactTextView view, @Nullable ReadableArray shadows) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBoxShadow(view, shadows);
+    }
+  }
+
+  @Override
+  public void setBackgroundColor(T view, @ColorInt int backgroundColor) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBackgroundColor(view, backgroundColor);
+    } else {
+      super.setBackgroundColor(view, backgroundColor);
+    }
+  }
 }

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

@@ -35,12 +35,21 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.common.ReactConstants;
+import com.facebook.react.internal.SystraceSection;
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
+import com.facebook.react.uimanager.BackgroundStyleApplicator;
+import com.facebook.react.uimanager.LengthPercentage;
+import com.facebook.react.uimanager.LengthPercentageType;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactCompoundView;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.ViewDefaults;
 import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
+import com.facebook.react.uimanager.style.BorderRadiusProp;
+import com.facebook.react.uimanager.style.BorderStyle;
+import com.facebook.react.uimanager.style.LogicalEdge;
+import com.facebook.react.uimanager.style.Overflow;
 import com.facebook.react.views.text.internal.span.ReactTagSpan;
 import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
@@ -69,6 +78,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   private boolean mNotifyOnInlineViewLayout;
   private boolean mTextIsSelectable;
   private boolean mShouldAdjustSpannableFontSize;
+  private Overflow mOverflow = Overflow.VISIBLE;
 
   private ReactViewBackgroundManager mReactBackgroundManager;
   private Spannable mSpanned;
@@ -88,7 +98,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
       // make sure old background manager doesn't have any references back to this View
       mReactBackgroundManager.cleanup();
     }
-
     mReactBackgroundManager = new ReactViewBackgroundManager(this);
 
     mNumberOfLines = ViewDefaults.NUMBER_OF_LINES;
@@ -101,7 +110,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     mFontSize = Float.NaN;
     mMinimumFontSize = Float.NaN;
     mLetterSpacing = 0.f;
-
+    mOverflow = Overflow.VISIBLE;
     mSpanned = null;
   }
 
@@ -109,6 +118,10 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     // Set default field values
     initView();
 
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.reset(this);
+    }
+
     // Defaults for these fields:
     // https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/java/android/widget/TextView.java#L1061
     setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE);
@@ -363,79 +376,96 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
   @Override
   protected void onDraw(Canvas canvas) {
-    if (mAdjustsFontSizeToFit && getSpanned() != null && mShouldAdjustSpannableFontSize) {
-      mShouldAdjustSpannableFontSize = false;
-      TextLayoutManager.adjustSpannableFontToFit(
-          getSpanned(),
-          getWidth(),
-          YogaMeasureMode.EXACTLY,
-          getHeight(),
-          YogaMeasureMode.EXACTLY,
-          mMinimumFontSize,
-          mNumberOfLines,
-          getIncludeFontPadding(),
-          getBreakStrategy(),
-          getHyphenationFrequency(),
-          // always passing ALIGN_NORMAL here should be fine, since this method doesn't depend on
-          // how exacly lines are aligned, just their width
-          Layout.Alignment.ALIGN_NORMAL);
-      setText(getSpanned());
-    }
-
-    mReactBackgroundManager.maybeClipToPaddingBox(canvas);
-
-    super.onDraw(canvas);
+    try (SystraceSection s = new SystraceSection("ReactTextView.onDraw")) {
+      if (mAdjustsFontSizeToFit && getSpanned() != null && mShouldAdjustSpannableFontSize) {
+        mShouldAdjustSpannableFontSize = false;
+        TextLayoutManager.adjustSpannableFontToFit(
+            getSpanned(),
+            getWidth(),
+            YogaMeasureMode.EXACTLY,
+            getHeight(),
+            YogaMeasureMode.EXACTLY,
+            mMinimumFontSize,
+            mNumberOfLines,
+            getIncludeFontPadding(),
+            getBreakStrategy(),
+            getHyphenationFrequency(),
+            // always passing ALIGN_NORMAL here should be fine, since this method doesn't depend on
+            // how exacly lines are aligned, just their width
+            Layout.Alignment.ALIGN_NORMAL);
+        setText(getSpanned());
+      }
+
+      if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+        if (mOverflow != Overflow.VISIBLE) {
+          BackgroundStyleApplicator.clipToPaddingBox(this, canvas);
+        }
+      } else {
+        mReactBackgroundManager.maybeClipToPaddingBox(canvas);
+      }
+
+      super.onDraw(canvas);
+    }
   }
 
-  public void setText(ReactTextUpdate update) {
-    mContainsImages = update.containsImages();
-    // Android's TextView crashes when it tries to relayout if LayoutParams are
-    // null; explicitly set the LayoutParams to prevent this crash. See:
-    // https://github.com/facebook/react-native/pull/7011
-    if (getLayoutParams() == null) {
-      setLayoutParams(EMPTY_LAYOUT_PARAMS);
-    }
-    Spannable spannable = update.getText();
-    if (mLinkifyMaskType > 0) {
-      Linkify.addLinks(spannable, mLinkifyMaskType);
-      setMovementMethod(LinkMovementMethod.getInstance());
-    }
-    setText(spannable);
-    float paddingLeft = update.getPaddingLeft();
-    float paddingTop = update.getPaddingTop();
-    float paddingRight = update.getPaddingRight();
-    float paddingBottom = update.getPaddingBottom();
-
-    // In Fabric padding is set by the update of Layout Metrics and not as part of the "setText"
-    // operation
-    // TODO T56559197: remove this condition when we migrate 100% to Fabric
-    if (paddingLeft != ReactConstants.UNSET
-        && paddingTop != ReactConstants.UNSET
-        && paddingRight != ReactConstants.UNSET
-        && paddingBottom != ReactConstants.UNSET) {
-
-      setPadding(
-          (int) Math.floor(paddingLeft),
-          (int) Math.floor(paddingTop),
-          (int) Math.floor(paddingRight),
-          (int) Math.floor(paddingBottom));
-    }
-
-    int nextTextAlign = update.getTextAlign();
-    if (nextTextAlign != getGravityHorizontal()) {
-      setGravityHorizontal(nextTextAlign);
-    }
-    if (getBreakStrategy() != update.getTextBreakStrategy()) {
-      setBreakStrategy(update.getTextBreakStrategy());
+  @Override
+  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    try (SystraceSection s = new SystraceSection("ReactTextView.onMeasure")) {
+      super.onMeasure(widthMeasureSpec, heightMeasureSpec);
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-      if (getJustificationMode() != update.getJustificationMode()) {
-        setJustificationMode(update.getJustificationMode());
+  }
+
+  public void setText(ReactTextUpdate update) {
+    try (SystraceSection s = new SystraceSection("ReactTextView.setText(ReactTextUpdate)")) {
+      mContainsImages = update.containsImages();
+      // Android's TextView crashes when it tries to relayout if LayoutParams are
+      // null; explicitly set the LayoutParams to prevent this crash. See:
+      // https://github.com/facebook/react-native/pull/7011
+      if (getLayoutParams() == null) {
+        setLayoutParams(EMPTY_LAYOUT_PARAMS);
+      }
+      Spannable spannable = update.getText();
+      if (mLinkifyMaskType > 0) {
+        Linkify.addLinks(spannable, mLinkifyMaskType);
+        setMovementMethod(LinkMovementMethod.getInstance());
+      }
+      setText(spannable);
+      float paddingLeft = update.getPaddingLeft();
+      float paddingTop = update.getPaddingTop();
+      float paddingRight = update.getPaddingRight();
+      float paddingBottom = update.getPaddingBottom();
+
+      // In Fabric padding is set by the update of Layout Metrics and not as part of the "setText"
+      // operation
+      // TODO T56559197: remove this condition when we migrate 100% to Fabric
+      if (paddingLeft != ReactConstants.UNSET
+          && paddingTop != ReactConstants.UNSET
+          && paddingRight != ReactConstants.UNSET
+          && paddingBottom != ReactConstants.UNSET) {
+
+        setPadding(
+            (int) Math.floor(paddingLeft),
+            (int) Math.floor(paddingTop),
+            (int) Math.floor(paddingRight),
+            (int) Math.floor(paddingBottom));
       }
-    }
 
-    // Ensure onLayout is called so the inline views can be repositioned.
-    requestLayout();
+      int nextTextAlign = update.getTextAlign();
+      if (nextTextAlign != getGravityHorizontal()) {
+        setGravityHorizontal(nextTextAlign);
+      }
+      if (getBreakStrategy() != update.getTextBreakStrategy()) {
+        setBreakStrategy(update.getTextBreakStrategy());
+      }
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+        if (getJustificationMode() != update.getJustificationMode()) {
+          setJustificationMode(update.getJustificationMode());
+        }
+      }
+
+      // Ensure onLayout is called so the inline views can be repositioned.
+      requestLayout();
+    }
   }
 
   @Override
@@ -679,27 +709,55 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
   @Override
   public void setBackgroundColor(int color) {
-    mReactBackgroundManager.setBackgroundColor(color);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBackgroundColor(this, color);
+    } else {
+      mReactBackgroundManager.setBackgroundColor(color);
+    }
   }
 
   public void setBorderWidth(int position, float width) {
-    mReactBackgroundManager.setBorderWidth(position, width);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderWidth(
+          this, LogicalEdge.values()[position], PixelUtil.toDIPFromPixel(width));
+    } else {
+      mReactBackgroundManager.setBorderWidth(position, width);
+    }
   }
 
-  public void setBorderColor(int position, float color, float alpha) {
-    mReactBackgroundManager.setBorderColor(position, color, alpha);
+  public void setBorderColor(int position, @Nullable Integer color) {
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderColor(this, LogicalEdge.values()[position], color);
+    } else {
+      mReactBackgroundManager.setBorderColor(position, color);
+    }
   }
 
   public void setBorderRadius(float borderRadius) {
-    mReactBackgroundManager.setBorderRadius(borderRadius);
+    setBorderRadius(borderRadius, BorderRadiusProp.BORDER_RADIUS.ordinal());
   }
 
   public void setBorderRadius(float borderRadius, int position) {
-    mReactBackgroundManager.setBorderRadius(borderRadius, position);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      @Nullable
+      LengthPercentage radius =
+          Float.isNaN(borderRadius)
+              ? null
+              : new LengthPercentage(
+                  PixelUtil.toDIPFromPixel(borderRadius), LengthPercentageType.POINT);
+      BackgroundStyleApplicator.setBorderRadius(this, BorderRadiusProp.values()[position], radius);
+    } else {
+      mReactBackgroundManager.setBorderRadius(borderRadius, position);
+    }
   }
 
   public void setBorderStyle(@Nullable String style) {
-    mReactBackgroundManager.setBorderStyle(style);
+    if (ReactNativeFeatureFlags.enableBackgroundStyleApplicator()) {
+      BackgroundStyleApplicator.setBorderStyle(
+          this, style == null ? null : BorderStyle.fromString(style));
+    } else {
+      mReactBackgroundManager.setBorderStyle(style);
+    }
   }
 
   public void setSpanned(Spannable spanned) {
@@ -745,6 +803,14 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   }
 
   public void setOverflow(@Nullable String overflow) {
+    if (overflow == null) {
+      mOverflow = Overflow.VISIBLE;
+    } else {
+      @Nullable Overflow parsedOverflow = Overflow.fromString(overflow);
+      mOverflow = parsedOverflow == null ? Overflow.VISIBLE : parsedOverflow;
+    }
+
     mReactBackgroundManager.setOverflow(overflow);
+    invalidate();
   }
 }

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

@@ -17,6 +17,7 @@ import com.facebook.react.R;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.annotations.VisibleForTesting;
 import com.facebook.react.common.mapbuffer.MapBuffer;
+import com.facebook.react.internal.SystraceSection;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.IViewManagerWithChildren;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
@@ -61,17 +62,16 @@ public class ReactTextViewManager
   }
 
   @Override
-  protected ReactTextView prepareToRecycleView(
+  protected @Nullable ReactTextView prepareToRecycleView(
       @NonNull ThemedReactContext reactContext, ReactTextView view) {
     // BaseViewManager
-    super.prepareToRecycleView(reactContext, view);
-
-    // Resets background and borders
-    view.recycleView();
-
-    // Defaults from ReactTextAnchorViewManager
-    setSelectionColor(view, null);
-
+    ReactTextView preparedView = super.prepareToRecycleView(reactContext, view);
+    if (preparedView != null) {
+      // Resets background and borders
+      preparedView.recycleView();
+      // Defaults from ReactTextAnchorViewManager
+      setSelectionColor(preparedView, null);
+    }
     return view;
   }
 
@@ -87,24 +87,26 @@ public class ReactTextViewManager
 
   @Override
   public void updateExtraData(ReactTextView view, Object extraData) {
-    ReactTextUpdate update = (ReactTextUpdate) extraData;
-    Spannable spannable = update.getText();
-    if (update.containsImages()) {
-      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());
+    try (SystraceSection s = new SystraceSection("ReactTextViewManager.updateExtraData")) {
+      ReactTextUpdate update = (ReactTextUpdate) extraData;
+      Spannable spannable = update.getText();
+      if (update.containsImages()) {
+        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());
+      }
     }
   }
 
@@ -136,11 +138,13 @@ public class ReactTextViewManager
   @Override
   public Object updateState(
       ReactTextView view, ReactStylesDiffMap props, StateWrapper stateWrapper) {
-    MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
-    if (stateMapBuffer != null) {
-      return getReactTextUpdate(view, props, stateMapBuffer);
-    } else {
-      return null;
+    try (SystraceSection s = new SystraceSection("ReactTextViewManager.updateState")) {
+      MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
+      if (stateMapBuffer != null) {
+        return getReactTextUpdate(view, props, stateMapBuffer);
+      } else {
+        return null;
+      }
     }
   }
 

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

@@ -84,6 +84,7 @@ public class TextAttributeProps {
   protected int mColor;
   protected boolean mIsBackgroundColorSet = false;
   protected int mBackgroundColor;
+  protected float mOpacity = Float.NaN;
 
   protected int mNumberOfLines = ReactConstants.UNSET;
   protected int mFontSize = ReactConstants.UNSET;
@@ -161,6 +162,7 @@ public class TextAttributeProps {
           result.setBackgroundColor(entry.getIntValue());
           break;
         case TA_KEY_OPACITY:
+          result.setOpacity((float) entry.getDoubleValue());
           break;
         case TA_KEY_FONT_FAMILY:
           result.setFontFamily(entry.getStringValue());
@@ -251,6 +253,7 @@ public class TextAttributeProps {
         props.hasKey(ViewProps.BACKGROUND_COLOR)
             ? props.getInt(ViewProps.BACKGROUND_COLOR, 0)
             : null);
+    result.setOpacity(getFloatProp(props, ViewProps.OPACITY, Float.NaN));
     result.setFontFamily(getStringProp(props, ViewProps.FONT_FAMILY));
     result.setFontWeight(getStringProp(props, ViewProps.FONT_WEIGHT));
     result.setFontStyle(getStringProp(props, ViewProps.FONT_STYLE));
@@ -453,6 +456,14 @@ public class TextAttributeProps {
     // }
   }
 
+  public float getOpacity() {
+    return mOpacity;
+  }
+
+  private void setOpacity(float opacity) {
+    mOpacity = opacity;
+  }
+
   public boolean isBackgroundColorSet() {
     return mIsBackgroundColorSet;
   }