Generated from a GitHub Pull Request. Run 'jf sync' on this diff to load the correct commit data.

Differential Revision: D115724716

Author: Abbondanzo

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -614,6 +614,8 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     }
     wasMultiline = isMultiline
 
+    updatePlaceholderEllipsize()
+
     // We override the KeyListener so that all keys on the soft input keyboard as well as hardware
     // keyboards work. Some KeyListeners like DigitsKeyListener will display the keyboard but not
     // accept all input from it
@@ -629,6 +631,16 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
       this.placeholder = placeholder
       hint = placeholder
     }
+    updatePlaceholderEllipsize()
+  }
+
+  private fun updatePlaceholderEllipsize() {
+    ellipsize =
+        if (!isMultiline) {
+          TextUtils.TruncateAt.END
+        } else {
+          null
+        }
   }
 
   public fun setFontFamily(fontFamily: String?) {

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/textinput/ReactTextInputPropertyTest.kt

@@ -19,6 +19,7 @@ import android.text.InputType
 import android.text.Layout
 import android.text.SpannableString
 import android.text.Spanned
+import android.text.TextUtils
 import android.util.DisplayMetrics
 import android.view.Gravity
 import android.view.View
@@ -198,9 +199,25 @@ class ReactTextInputPropertyTest {
 
     manager.updateProperties(view, buildStyles("placeholder", "sometext"))
     assertThat(view.hint).isEqualTo("sometext")
+    assertThat(view.ellipsize).isEqualTo(TextUtils.TruncateAt.END)
 
     manager.updateProperties(view, buildStyles("placeholder", null))
     assertThat(view.hint).isNull()
+    assertThat(view.ellipsize).isEqualTo(TextUtils.TruncateAt.END)
+  }
+
+  @Test
+  fun testPlaceholderEllipsizeRespectsMultiline() {
+    manager.updateProperties(view, buildStyles("placeholder", "a very long placeholder string"))
+    assertThat(view.ellipsize).isEqualTo(TextUtils.TruncateAt.END)
+
+    manager.updateProperties(view, buildStyles("multiline", true))
+    view.commitStagedInputType()
+    assertThat(view.ellipsize).isNull()
+
+    manager.updateProperties(view, buildStyles("multiline", false))
+    view.commitStagedInputType()
+    assertThat(view.ellipsize).isEqualTo(TextUtils.TruncateAt.END)
   }
 
   @Test