Keep ellipsizeMode when adjustsFontSizeToFit is set on Android

ReactTextView.updateView() cleared the ellipsize location whenever
adjustsFontSizeToFit was on. Now that minimumFontScale can stop the text from
shrinking further, text that still does not fit at the floor was clipped
instead of ellipsized. iOS applies the ellipsize mode regardless of
adjustsFontSizeToFit, so do the same here.

Author: conner1reimers

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java

@@ -585,9 +585,7 @@ public void setEllipsizeLocation(@Nullable TextUtils.TruncateAt ellipsizeLocatio
   public void updateView() {
     @Nullable
     TextUtils.TruncateAt ellipsizeLocation =
-        mNumberOfLines == ViewDefaults.NUMBER_OF_LINES || mAdjustsFontSizeToFit
-            ? null
-            : mEllipsizeLocation;
+        mNumberOfLines == ViewDefaults.NUMBER_OF_LINES ? null : mEllipsizeLocation;
     setEllipsize(ellipsizeLocation);
   }
 

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/text/ReactTextViewTest.kt

@@ -14,6 +14,7 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.text.SpannableString
 import android.text.Spanned
+import android.text.TextUtils
 import android.text.style.ReplacementSpan
 import android.util.TypedValue
 import android.view.Gravity
@@ -122,6 +123,18 @@ class ReactTextViewTest {
     assertThat(view.useBoundsForWidth).isFalse()
   }
 
+  @Test
+  fun adjustsFontSizeToFitKeepsEllipsizeLocation() {
+    val view = TestReactTextView(RuntimeEnvironment.getApplication())
+    view.setNumberOfLines(1)
+    view.setEllipsizeLocation(TextUtils.TruncateAt.END)
+    view.setAdjustFontSizeToFit(true)
+
+    view.updateView()
+
+    assertThat(view.ellipsize).isEqualTo(TextUtils.TruncateAt.END)
+  }
+
   private fun layoutAndDraw(view: TestReactTextView, width: Int, height: Int) {
     view.measure(
         View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),