react-native-tvos 0.73.7-1 → 0.74.0-0

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

@@ -7,8 +7,6 @@
 
 package com.facebook.react.views.text;
 
-import static com.facebook.react.views.text.TextAttributeProps.UNSET;
-
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
@@ -42,6 +40,9 @@ 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.views.text.internal.span.ReactTagSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
+import com.facebook.react.views.text.internal.span.TextInlineViewPlaceholderSpan;
 import com.facebook.react.views.view.ReactViewBackgroundManager;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52,14 +53,15 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   private static final ViewGroup.LayoutParams EMPTY_LAYOUT_PARAMS =
       new ViewGroup.LayoutParams(0, 0);
 
+  // https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/java/android/widget/TextView.java#L854
+  private static final int DEFAULT_GRAVITY = Gravity.TOP | Gravity.START;
+
   private boolean mContainsImages;
-  private final int mDefaultGravityHorizontal;
-  private final int mDefaultGravityVertical;
   private int mNumberOfLines;
   private TextUtils.TruncateAt mEllipsizeLocation;
   private boolean mAdjustsFontSizeToFit;
-  private float mFontSize = Float.NaN;
-  private float mLetterSpacing = Float.NaN;
+  private float mFontSize;
+  private float mLetterSpacing;
   private int mLinkifyMaskType;
   private boolean mNotifyOnInlineViewLayout;
   private boolean mTextIsSelectable;
@@ -69,11 +71,6 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
   public ReactTextView(Context context) {
     super(context);
-
-    // Get these defaults only during the constructor - these should never be set otherwise
-    mDefaultGravityHorizontal = getGravityHorizontal();
-    mDefaultGravityVertical = getGravity() & Gravity.VERTICAL_GRAVITY_MASK;
-
     initView();
   }
 
@@ -96,6 +93,8 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     mNotifyOnInlineViewLayout = false;
     mTextIsSelectable = false;
     mEllipsizeLocation = TextUtils.TruncateAt.END;
+    mFontSize = Float.NaN;
+    mLetterSpacing = 0.f;
 
     mSpanned = null;
   }
@@ -106,9 +105,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
     // Defaults for these fields:
     // https://github.com/aosp-mirror/platform_frameworks_base/blob/master/core/java/android/widget/TextView.java#L1061
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE);
-    }
+    setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE);
     setMovementMethod(getDefaultMovementMethod());
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       setJustificationMode(Layout.JUSTIFICATION_MODE_NONE);
@@ -117,10 +114,10 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     // reset text
     setLayoutParams(EMPTY_LAYOUT_PARAMS);
     super.setText(null);
+    applyTextAttributes();
 
     // Call setters to ensure that any super setters are called
-    setGravityHorizontal(mDefaultGravityHorizontal);
-    setGravityVertical(mDefaultGravityVertical);
+    setGravity(DEFAULT_GRAVITY);
     setNumberOfLines(mNumberOfLines);
     setAdjustFontSizeToFit(mAdjustsFontSizeToFit);
     setLinkifyMask(mLinkifyMaskType);
@@ -145,10 +142,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
       setFocusable(View.FOCUSABLE_AUTO);
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE);
-    }
-
+    setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NONE);
     updateView(); // call after changing ellipsizeLocation in particular
   }
 
@@ -383,10 +377,10 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     // 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 != UNSET
-        && paddingTop != UNSET
-        && paddingRight != UNSET
-        && paddingBottom != UNSET) {
+    if (paddingLeft != ReactConstants.UNSET
+        && paddingTop != ReactConstants.UNSET
+        && paddingRight != ReactConstants.UNSET
+        && paddingBottom != ReactConstants.UNSET) {
 
       setPadding(
           (int) Math.floor(paddingLeft),
@@ -399,10 +393,8 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     if (nextTextAlign != getGravityHorizontal()) {
       setGravityHorizontal(nextTextAlign);
     }
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      if (getBreakStrategy() != update.getTextBreakStrategy()) {
-        setBreakStrategy(update.getTextBreakStrategy());
-      }
+    if (getBreakStrategy() != update.getTextBreakStrategy()) {
+      setBreakStrategy(update.getTextBreakStrategy());
     }
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       if (getJustificationMode() != update.getJustificationMode()) {
@@ -562,7 +554,9 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
   /* package */ void setGravityHorizontal(int gravityHorizontal) {
     if (gravityHorizontal == 0) {
-      gravityHorizontal = mDefaultGravityHorizontal;
+      gravityHorizontal =
+          DEFAULT_GRAVITY
+              & (Gravity.HORIZONTAL_GRAVITY_MASK | Gravity.RELATIVE_HORIZONTAL_GRAVITY_MASK);
     }
     setGravity(
         (getGravity()
@@ -573,7 +567,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
   /* package */ void setGravityVertical(int gravityVertical) {
     if (gravityVertical == 0) {
-      gravityVertical = mDefaultGravityVertical;
+      gravityVertical = DEFAULT_GRAVITY & Gravity.VERTICAL_GRAVITY_MASK;
     }
     setGravity((getGravity() & ~Gravity.VERTICAL_GRAVITY_MASK) | gravityVertical);
   }

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

@@ -25,6 +25,8 @@ import com.facebook.react.uimanager.ReactStylesDiffMap;
 import com.facebook.react.uimanager.StateWrapper;
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.ViewProps;
+import com.facebook.react.views.text.internal.span.ReactClickableSpan;
+import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.yoga.YogaMeasureMode;
 import java.util.HashMap;
 import java.util.Map;

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

@@ -13,6 +13,7 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.ReactConstants;
 import com.facebook.react.common.assets.ReactFontManager;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,7 +46,7 @@ public class ReactTypefaceUtils {
           return 900;
       }
     }
-    return ReactFontManager.TypefaceStyle.UNSET;
+    return ReactConstants.UNSET;
   }
 
   public static int parseFontStyle(@Nullable String fontStyleString) {
@@ -57,7 +58,7 @@ public class ReactTypefaceUtils {
         return Typeface.NORMAL;
       }
     }
-    return ReactFontManager.TypefaceStyle.UNSET;
+    return ReactConstants.UNSET;
   }
 
   public static @Nullable String parseFontVariant(@Nullable ReadableArray fontVariantArray) {

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

@@ -12,6 +12,7 @@ import android.text.Layout;
 import android.text.TextUtils;
 import android.util.LayoutDirection;
 import android.view.Gravity;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.ReadableArray;
@@ -30,7 +31,7 @@ import java.util.List;
 // TODO: T63643819 refactor naming of TextAttributeProps to make explicit that this represents
 // TextAttributes and not TextProps. As part of this refactor extract methods that don't belong to
 // TextAttributeProps (e.g. TextAlign)
-public class TextAttributeProps {
+public class TextAttributeProps implements EffectiveTextAttributeProvider {
 
   // constants for Text Attributes serialization
   public static final short TA_KEY_FOREGROUND_COLOR = 0;
@@ -74,10 +75,8 @@ public class TextAttributeProps {
   private static final int DEFAULT_TEXT_SHADOW_COLOR = 0x55000000;
   private static final int DEFAULT_JUSTIFICATION_MODE =
       (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) ? 0 : Layout.JUSTIFICATION_MODE_NONE;
-  private static final int DEFAULT_BREAK_STRATEGY =
-      (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.BREAK_STRATEGY_HIGH_QUALITY;
-  private static final int DEFAULT_HYPHENATION_FREQUENCY =
-      (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) ? 0 : Layout.HYPHENATION_FREQUENCY_NONE;
+  private static final int DEFAULT_BREAK_STRATEGY = Layout.BREAK_STRATEGY_HIGH_QUALITY;
+  private static final int DEFAULT_HYPHENATION_FREQUENCY = Layout.HYPHENATION_FREQUENCY_NONE;
 
   protected float mLineHeight = Float.NaN;
   protected boolean mIsColorSet = false;
@@ -86,17 +85,17 @@ public class TextAttributeProps {
   protected boolean mIsBackgroundColorSet = false;
   protected int mBackgroundColor;
 
-  protected int mNumberOfLines = UNSET;
-  protected int mFontSize = UNSET;
-  protected float mFontSizeInput = UNSET;
-  protected float mLineHeightInput = UNSET;
+  protected int mNumberOfLines = ReactConstants.UNSET;
+  protected int mFontSize = ReactConstants.UNSET;
+  protected float mFontSizeInput = ReactConstants.UNSET;
+  protected float mLineHeightInput = ReactConstants.UNSET;
   protected float mLetterSpacingInput = Float.NaN;
   protected int mTextAlign = Gravity.NO_GRAVITY;
 
-  // `UNSET` is -1 and is the same as `LayoutDirection.UNDEFINED` but the symbol isn't available.
-  protected int mLayoutDirection = UNSET;
+  // `ReactConstants.UNSET` is -1, same as `LayoutDirection.UNDEFINED` (which is a hidden symbol)
+  protected int mLayoutDirection = ReactConstants.UNSET;
 
-  protected TextTransform mTextTransform = TextTransform.NONE;
+  @NonNull protected TextTransform mTextTransform = TextTransform.NONE;
 
   protected float mTextShadowOffsetDx = 0;
   protected float mTextShadowOffsetDy = 0;
@@ -110,8 +109,8 @@ public class TextAttributeProps {
   protected @Nullable AccessibilityRole mAccessibilityRole = null;
   protected @Nullable Role mRole = null;
 
-  protected int mFontStyle = UNSET;
-  protected int mFontWeight = UNSET;
+  protected int mFontStyle = ReactConstants.UNSET;
+  protected int mFontWeight = ReactConstants.UNSET;
   /**
    * NB: If a font family is used that does not have a style in a certain Android version (ie.
    * monospace bold pre Android 5.0), that style (ie. bold) will not be inherited by nested Text
@@ -235,11 +234,11 @@ public class TextAttributeProps {
 
   public static TextAttributeProps fromReadableMap(ReactStylesDiffMap props) {
     TextAttributeProps result = new TextAttributeProps();
-    result.setNumberOfLines(getIntProp(props, ViewProps.NUMBER_OF_LINES, UNSET));
-    result.setLineHeight(getFloatProp(props, ViewProps.LINE_HEIGHT, UNSET));
+    result.setNumberOfLines(getIntProp(props, ViewProps.NUMBER_OF_LINES, ReactConstants.UNSET));
+    result.setLineHeight(getFloatProp(props, ViewProps.LINE_HEIGHT, ReactConstants.UNSET));
     result.setLetterSpacing(getFloatProp(props, ViewProps.LETTER_SPACING, Float.NaN));
     result.setAllowFontScaling(getBooleanProp(props, ViewProps.ALLOW_FONT_SCALING, true));
-    result.setFontSize(getFloatProp(props, ViewProps.FONT_SIZE, UNSET));
+    result.setFontSize(getFloatProp(props, ViewProps.FONT_SIZE, ReactConstants.UNSET));
     result.setColor(props.hasKey(ViewProps.COLOR) ? props.getInt(ViewProps.COLOR, 0) : null);
     result.setColor(
         props.hasKey(ViewProps.FOREGROUND_COLOR)
@@ -345,6 +344,7 @@ public class TextAttributeProps {
 
   // Returns a line height which takes into account the requested line height
   // and the height of the inline images.
+  @Override
   public float getEffectiveLineHeight() {
     boolean useInlineViewHeight =
         !Float.isNaN(mLineHeight)
@@ -354,12 +354,12 @@ public class TextAttributeProps {
   }
 
   private void setNumberOfLines(int numberOfLines) {
-    mNumberOfLines = numberOfLines == 0 ? UNSET : numberOfLines;
+    mNumberOfLines = numberOfLines == 0 ? ReactConstants.UNSET : numberOfLines;
   }
 
   private void setLineHeight(float lineHeight) {
     mLineHeightInput = lineHeight;
-    if (lineHeight == UNSET) {
+    if (lineHeight == ReactConstants.UNSET) {
       mLineHeight = Float.NaN;
     } else {
       mLineHeight =
@@ -373,6 +373,12 @@ public class TextAttributeProps {
     mLetterSpacingInput = letterSpacing;
   }
 
+  @Override
+  @NonNull
+  public TextTransform getTextTransform() {
+    return mTextTransform;
+  }
+
   public float getLetterSpacing() {
     float letterSpacingPixels =
         mAllowFontScaling
@@ -388,6 +394,16 @@ public class TextAttributeProps {
     return letterSpacingPixels / mFontSize;
   }
 
+  @Override
+  public float getEffectiveLetterSpacing() {
+    return getLetterSpacing();
+  }
+
+  @Override
+  public int getEffectiveFontSize() {
+    return mFontSize;
+  }
+
   private void setAllowFontScaling(boolean allowFontScaling) {
     if (allowFontScaling != mAllowFontScaling) {
       mAllowFontScaling = allowFontScaling;
@@ -399,7 +415,7 @@ public class TextAttributeProps {
 
   private void setFontSize(float fontSize) {
     mFontSizeInput = fontSize;
-    if (fontSize != UNSET) {
+    if (fontSize != ReactConstants.UNSET) {
       fontSize =
           mAllowFontScaling
               ? (float) Math.ceil(PixelUtil.toPixelFromSP(fontSize))
@@ -408,6 +424,11 @@ public class TextAttributeProps {
     mFontSize = (int) fontSize;
   }
 
+  @Override
+  public int getColor() {
+    return mColor;
+  }
+
   private void setColor(@Nullable Integer color) {
     mIsColorSet = (color != null);
     if (mIsColorSet) {
@@ -415,6 +436,16 @@ public class TextAttributeProps {
     }
   }
 
+  @Override
+  public boolean isColorSet() {
+    return mIsColorSet;
+  }
+
+  @Override
+  public int getBackgroundColor() {
+    return mBackgroundColor;
+  }
+
   private void setBackgroundColor(Integer color) {
     // TODO: Don't apply background color to anchor TextView since it will be applied on the View
     // directly
@@ -426,6 +457,21 @@ public class TextAttributeProps {
     // }
   }
 
+  @Override
+  public boolean isBackgroundColorSet() {
+    return mIsBackgroundColorSet;
+  }
+
+  @Override
+  public int getFontStyle() {
+    return mFontStyle;
+  }
+
+  @Override
+  public String getFontFamily() {
+    return mFontFamily;
+  }
+
   private void setFontFamily(@Nullable String fontFamily) {
     mFontFamily = fontFamily;
   }
@@ -528,6 +574,16 @@ public class TextAttributeProps {
     mFontFeatureSettings = TextUtils.join(", ", features);
   }
 
+  @Override
+  public String getFontFeatureSettings() {
+    return mFontFeatureSettings;
+  }
+
+  @Override
+  public int getFontWeight() {
+    return mFontWeight;
+  }
+
   private void setFontWeight(@Nullable String fontWeightString) {
     mFontWeight = ReactTypefaceUtils.parseFontWeight(fontWeightString);
   }
@@ -554,6 +610,16 @@ public class TextAttributeProps {
     }
   }
 
+  @Override
+  public boolean isUnderlineTextDecorationSet() {
+    return mIsUnderlineTextDecorationSet;
+  }
+
+  @Override
+  public boolean isLineThroughTextDecorationSet() {
+    return mIsLineThroughTextDecorationSet;
+  }
+
   private void setTextShadowOffset(ReadableMap offsetMap) {
     mTextShadowOffsetDx = 0;
     mTextShadowOffsetDy = 0;
@@ -572,10 +638,20 @@ public class TextAttributeProps {
     }
   }
 
+  @Override
+  public float getTextShadowOffsetDx() {
+    return mTextShadowOffsetDx;
+  }
+
   private void setTextShadowOffsetDx(float dx) {
     mTextShadowOffsetDx = PixelUtil.toPixelFromDIP(dx);
   }
 
+  @Override
+  public float getTextShadowOffsetDy() {
+    return mTextShadowOffsetDy;
+  }
+
   private void setTextShadowOffsetDy(float dy) {
     mTextShadowOffsetDy = PixelUtil.toPixelFromDIP(dy);
   }
@@ -583,14 +659,14 @@ public class TextAttributeProps {
   public static int getLayoutDirection(@Nullable String layoutDirection) {
     int androidLayoutDirection;
     if (layoutDirection == null || "undefined".equals(layoutDirection)) {
-      androidLayoutDirection = UNSET;
+      androidLayoutDirection = ReactConstants.UNSET;
     } else if ("rtl".equals(layoutDirection)) {
       androidLayoutDirection = LayoutDirection.RTL;
     } else if ("ltr".equals(layoutDirection)) {
       androidLayoutDirection = LayoutDirection.LTR;
     } else {
       FLog.w(ReactConstants.TAG, "Invalid layoutDirection: " + layoutDirection);
-      androidLayoutDirection = UNSET;
+      androidLayoutDirection = ReactConstants.UNSET;
     }
     return androidLayoutDirection;
   }
@@ -599,12 +675,22 @@ public class TextAttributeProps {
     mLayoutDirection = getLayoutDirection(layoutDirection);
   }
 
+  @Override
+  public float getTextShadowRadius() {
+    return mTextShadowRadius;
+  }
+
   private void setTextShadowRadius(float textShadowRadius) {
     if (textShadowRadius != mTextShadowRadius) {
       mTextShadowRadius = textShadowRadius;
     }
   }
 
+  @Override
+  public int getTextShadowColor() {
+    return mTextShadowColor;
+  }
+
   private void setTextShadowColor(int textShadowColor) {
     if (textShadowColor != mTextShadowColor) {
       mTextShadowColor = textShadowColor;
@@ -626,6 +712,11 @@ public class TextAttributeProps {
     }
   }
 
+  @Override
+  public AccessibilityRole getAccessibilityRole() {
+    return mAccessibilityRole;
+  }
+
   private void setAccessibilityRole(@Nullable String accessibilityRole) {
     if (accessibilityRole == null) {
       mAccessibilityRole = null;
@@ -634,6 +725,12 @@ public class TextAttributeProps {
     }
   }
 
+  @Nullable
+  @Override
+  public Role getRole() {
+    return mRole;
+  }
+
   private void setRole(@Nullable String role) {
     if (role == null) {
       mRole = null;

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

@@ -7,6 +7,7 @@
 
 package com.facebook.react.views.text;
 
+import androidx.annotation.NonNull;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.PixelUtil;
@@ -29,7 +30,8 @@ public class TextAttributes {
   private float mLetterSpacing = Float.NaN;
   private float mMaxFontSizeMultiplier = Float.NaN;
   private float mHeightOfTallestInlineViewOrImage = Float.NaN;
-  private TextTransform mTextTransform = TextTransform.UNSET;
+
+  @NonNull private TextTransform mTextTransform = TextTransform.UNSET;
 
   public TextAttributes() {}
 
@@ -118,7 +120,7 @@ public class TextAttributes {
     return mTextTransform;
   }
 
-  public void setTextTransform(TextTransform textTransform) {
+  public void setTextTransform(@NonNull TextTransform textTransform) {
     mTextTransform = textTransform;
   }