react-native-tvos 0.74.5-0 → 0.75.2-0rc1

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

@@ -8,6 +8,7 @@
 package com.facebook.react.views.text;
 
 import android.content.Context;
+import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.text.Layout;
@@ -44,6 +45,7 @@ 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 com.facebook.yoga.YogaMeasureMode;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -61,10 +63,12 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   private TextUtils.TruncateAt mEllipsizeLocation;
   private boolean mAdjustsFontSizeToFit;
   private float mFontSize;
+  private float mMinimumFontSize;
   private float mLetterSpacing;
   private int mLinkifyMaskType;
   private boolean mNotifyOnInlineViewLayout;
   private boolean mTextIsSelectable;
+  private boolean mShouldAdjustSpannableFontSize;
 
   private ReactViewBackgroundManager mReactBackgroundManager;
   private Spannable mSpanned;
@@ -92,8 +96,10 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     mLinkifyMaskType = 0;
     mNotifyOnInlineViewLayout = false;
     mTextIsSelectable = false;
+    mShouldAdjustSpannableFontSize = false;
     mEllipsizeLocation = TextUtils.TruncateAt.END;
     mFontSize = Float.NaN;
+    mMinimumFontSize = Float.NaN;
     mLetterSpacing = 0.f;
 
     mSpanned = null;
@@ -355,6 +361,32 @@ 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);
+  }
+
   public void setText(ReactTextUpdate update) {
     mContainsImages = update.containsImages();
     // Android's TextView crashes when it tries to relayout if LayoutParams are
@@ -575,6 +607,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
   public void setNumberOfLines(int numberOfLines) {
     mNumberOfLines = numberOfLines == 0 ? ViewDefaults.NUMBER_OF_LINES : numberOfLines;
     setMaxLines(mNumberOfLines);
+    mShouldAdjustSpannableFontSize = true;
   }
 
   public void setAdjustFontSizeToFit(boolean adjustsFontSizeToFit) {
@@ -590,6 +623,29 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
     applyTextAttributes();
   }
 
+  public void setMinimumFontSize(float minimumFontSize) {
+    mMinimumFontSize = minimumFontSize;
+    mShouldAdjustSpannableFontSize = true;
+  }
+
+  @Override
+  public void setIncludeFontPadding(boolean includepad) {
+    super.setIncludeFontPadding(includepad);
+    mShouldAdjustSpannableFontSize = true;
+  }
+
+  @Override
+  public void setBreakStrategy(int breakStrategy) {
+    super.setBreakStrategy(breakStrategy);
+    mShouldAdjustSpannableFontSize = true;
+  }
+
+  @Override
+  public void setHyphenationFrequency(int hyphenationFrequency) {
+    super.setHyphenationFrequency(hyphenationFrequency);
+    mShouldAdjustSpannableFontSize = true;
+  }
+
   public void setLetterSpacing(float letterSpacing) {
     if (Float.isNaN(letterSpacing)) {
       return;
@@ -648,6 +704,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
 
   public void setSpanned(Spannable spanned) {
     mSpanned = spanned;
+    mShouldAdjustSpannableFontSize = true;
   }
 
   public Spannable getSpanned() {
@@ -686,4 +743,8 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
       super.setLetterSpacing(mLetterSpacing);
     }
   }
+
+  public void setOverflow(@Nullable String overflow) {
+    mReactBackgroundManager.setOverflow(overflow);
+  }
 }

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

@@ -12,9 +12,8 @@ import android.os.Build;
 import android.text.Spannable;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import com.facebook.common.logging.FLog;
 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.MapBuffer;
@@ -24,7 +23,7 @@ import com.facebook.react.uimanager.ReactAccessibilityDelegate;
 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.uimanager.annotations.ReactProp;
 import com.facebook.react.views.text.internal.span.ReactClickableSpan;
 import com.facebook.react.views.text.internal.span.TextInlineImageSpan;
 import com.facebook.yoga.YogaMeasureMode;
@@ -40,6 +39,8 @@ public class ReactTextViewManager
     extends ReactTextAnchorViewManager<ReactTextView, ReactTextShadowNode>
     implements IViewManagerWithChildren {
 
+  private static final String TAG = "ReactTextViewManager";
+
   private static final short TX_STATE_KEY_ATTRIBUTED_STRING = 0;
   private static final short TX_STATE_KEY_PARAGRAPH_ATTRIBUTES = 1;
   // used for text input
@@ -138,33 +139,9 @@ public class ReactTextViewManager
     MapBuffer stateMapBuffer = stateWrapper.getStateDataMapBuffer();
     if (stateMapBuffer != null) {
       return getReactTextUpdate(view, props, stateMapBuffer);
-    }
-    ReadableNativeMap state = stateWrapper.getStateData();
-    if (state == null) {
+    } else {
       return null;
     }
-
-    ReadableMap attributedString = state.getMap("attributedString");
-    ReadableMap paragraphAttributes = state.getMap("paragraphAttributes");
-    Spannable spanned =
-        TextLayoutManager.getOrCreateSpannableForText(
-            view.getContext(), attributedString, mReactTextViewManagerCallback);
-    view.setSpanned(spanned);
-
-    int textBreakStrategy =
-        TextAttributeProps.getTextBreakStrategy(
-            paragraphAttributes.getString(ViewProps.TEXT_BREAK_STRATEGY));
-    int currentJustificationMode =
-        Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? 0 : view.getJustificationMode();
-
-    return new ReactTextUpdate(
-        spanned,
-        state.hasKey("mostRecentEventCount") ? state.getInt("mostRecentEventCount") : -1,
-        false, // TODO add this into local Data
-        TextAttributeProps.getTextAlignment(
-            props, TextLayoutManager.isRTL(attributedString), view.getGravityHorizontal()),
-        textBreakStrategy,
-        TextAttributeProps.getJustificationMode(props, currentJustificationMode));
   }
 
   private Object getReactTextUpdate(ReactTextView view, ReactStylesDiffMap props, MapBuffer state) {
@@ -172,13 +149,26 @@ public class ReactTextViewManager
     MapBuffer attributedString = state.getMapBuffer(TX_STATE_KEY_ATTRIBUTED_STRING);
     MapBuffer paragraphAttributes = state.getMapBuffer(TX_STATE_KEY_PARAGRAPH_ATTRIBUTES);
     Spannable spanned =
-        TextLayoutManagerMapBuffer.getOrCreateSpannableForText(
+        TextLayoutManager.getOrCreateSpannableForText(
             view.getContext(), attributedString, mReactTextViewManagerCallback);
     view.setSpanned(spanned);
 
+    try {
+      float minimumFontSize =
+          (float) paragraphAttributes.getDouble(TextLayoutManager.PA_KEY_MINIMUM_FONT_SIZE);
+      view.setMinimumFontSize(minimumFontSize);
+    } catch (IllegalArgumentException e) {
+      // T190482857: We see rare crash with MapBuffer without PA_KEY_MINIMUM_FONT_SIZE entry
+      FLog.e(
+          TAG,
+          "Paragraph Attributes: %s",
+          paragraphAttributes != null ? paragraphAttributes.toString() : "<empty>");
+      throw e;
+    }
+
     int textBreakStrategy =
         TextAttributeProps.getTextBreakStrategy(
-            paragraphAttributes.getString(TextLayoutManagerMapBuffer.PA_KEY_TEXT_BREAK_STRATEGY));
+            paragraphAttributes.getString(TextLayoutManager.PA_KEY_TEXT_BREAK_STRATEGY));
     int currentJustificationMode =
         Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? 0 : view.getJustificationMode();
 
@@ -186,8 +176,7 @@ public class ReactTextViewManager
         spanned,
         -1, // UNUSED FOR TEXT
         false, // TODO add this into local Data
-        TextAttributeProps.getTextAlignment(
-            props, TextLayoutManagerMapBuffer.isRTL(attributedString), view.getGravityHorizontal()),
+        TextLayoutManager.getTextGravity(attributedString, spanned, view.getGravityHorizontal()),
         textBreakStrategy,
         TextAttributeProps.getJustificationMode(props, currentJustificationMode));
   }
@@ -205,29 +194,6 @@ public class ReactTextViewManager
     return eventTypeConstants;
   }
 
-  @Override
-  public long measure(
-      Context context,
-      ReadableMap localData,
-      ReadableMap props,
-      ReadableMap state,
-      float width,
-      YogaMeasureMode widthMode,
-      float height,
-      YogaMeasureMode heightMode,
-      @Nullable float[] attachmentsPositions) {
-    return TextLayoutManager.measureText(
-        context,
-        localData,
-        props,
-        width,
-        widthMode,
-        height,
-        heightMode,
-        mReactTextViewManagerCallback,
-        attachmentsPositions);
-  }
-
   @Override
   public long measure(
       Context context,
@@ -239,7 +205,7 @@ public class ReactTextViewManager
       float height,
       YogaMeasureMode heightMode,
       @Nullable float[] attachmentsPositions) {
-    return TextLayoutManagerMapBuffer.measureText(
+    return TextLayoutManager.measureText(
         context,
         localData,
         props,
@@ -255,4 +221,9 @@ public class ReactTextViewManager
   public void setPadding(ReactTextView view, int left, int top, int right, int bottom) {
     view.setPadding(left, top, right, bottom);
   }
+
+  @ReactProp(name = "overflow")
+  public void setOverflow(ReactTextView view, @Nullable String overflow) {
+    view.setOverflow(overflow);
+  }
 }

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

@@ -31,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 implements EffectiveTextAttributeProvider {
+public class TextAttributeProps {
 
   // constants for Text Attributes serialization
   public static final short TA_KEY_FOREGROUND_COLOR = 0;
@@ -111,6 +111,7 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
 
   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
@@ -134,7 +135,9 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
    */
   protected @Nullable String mFontFamily = null;
 
-  /** @see android.graphics.Paint#setFontFeatureSettings */
+  /**
+   * @see android.graphics.Paint#setFontFeatureSettings
+   */
   protected @Nullable String mFontFeatureSettings = null;
 
   protected boolean mContainsImages = false;
@@ -344,7 +347,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
 
   // 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)
@@ -373,7 +375,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     mLetterSpacingInput = letterSpacing;
   }
 
-  @Override
   @NonNull
   public TextTransform getTextTransform() {
     return mTextTransform;
@@ -394,12 +395,10 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     return letterSpacingPixels / mFontSize;
   }
 
-  @Override
   public float getEffectiveLetterSpacing() {
     return getLetterSpacing();
   }
 
-  @Override
   public int getEffectiveFontSize() {
     return mFontSize;
   }
@@ -424,7 +423,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     mFontSize = (int) fontSize;
   }
 
-  @Override
   public int getColor() {
     return mColor;
   }
@@ -436,12 +434,10 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     }
   }
 
-  @Override
   public boolean isColorSet() {
     return mIsColorSet;
   }
 
-  @Override
   public int getBackgroundColor() {
     return mBackgroundColor;
   }
@@ -457,17 +453,14 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     // }
   }
 
-  @Override
   public boolean isBackgroundColorSet() {
     return mIsBackgroundColorSet;
   }
 
-  @Override
   public int getFontStyle() {
     return mFontStyle;
   }
 
-  @Override
   public String getFontFamily() {
     return mFontFamily;
   }
@@ -574,12 +567,10 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     mFontFeatureSettings = TextUtils.join(", ", features);
   }
 
-  @Override
   public String getFontFeatureSettings() {
     return mFontFeatureSettings;
   }
 
-  @Override
   public int getFontWeight() {
     return mFontWeight;
   }
@@ -610,12 +601,10 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     }
   }
 
-  @Override
   public boolean isUnderlineTextDecorationSet() {
     return mIsUnderlineTextDecorationSet;
   }
 
-  @Override
   public boolean isLineThroughTextDecorationSet() {
     return mIsLineThroughTextDecorationSet;
   }
@@ -638,7 +627,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     }
   }
 
-  @Override
   public float getTextShadowOffsetDx() {
     return mTextShadowOffsetDx;
   }
@@ -647,7 +635,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     mTextShadowOffsetDx = PixelUtil.toPixelFromDIP(dx);
   }
 
-  @Override
   public float getTextShadowOffsetDy() {
     return mTextShadowOffsetDy;
   }
@@ -675,7 +662,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     mLayoutDirection = getLayoutDirection(layoutDirection);
   }
 
-  @Override
   public float getTextShadowRadius() {
     return mTextShadowRadius;
   }
@@ -686,7 +672,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     }
   }
 
-  @Override
   public int getTextShadowColor() {
     return mTextShadowColor;
   }
@@ -712,7 +697,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
     }
   }
 
-  @Override
   public AccessibilityRole getAccessibilityRole() {
     return mAccessibilityRole;
   }
@@ -726,7 +710,6 @@ public class TextAttributeProps implements EffectiveTextAttributeProvider {
   }
 
   @Nullable
-  @Override
   public Role getRole() {
     return mRole;
   }