Skip to content

Commit b44c1ce

Browse files
authored
fix(mobile): keep the Android composer placeholder on one line (pingdotgg#12605)
1 parent 9accc56 commit b44c1ce

2 files changed

Lines changed: 94 additions & 1 deletion

File tree

‎apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.text.Editable
1212
import android.text.InputType
1313
import android.text.InputFilter
1414
import android.text.Spanned
15+
import android.text.TextUtils
1516
import android.text.TextWatcher
1617
import android.text.style.ReplacementSpan
1718
import android.util.TypedValue
@@ -254,7 +255,7 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
254255
}
255256

256257
fun setPlaceholder(placeholder: String) {
257-
editor.hint = placeholder
258+
editor.placeholder = placeholder
258259
}
259260

260261
fun setClipboardFragment(fragment: String) {
@@ -267,12 +268,14 @@ class T3ComposerEditorView(context: Context, appContext: AppContext) : ExpoView(
267268
} else {
268269
Typeface.DEFAULT
269270
}
271+
editor.applyPlaceholder()
270272
}
271273

272274
fun setFontSize(fontSize: Float) {
273275
editor.textSize = fontSize
274276
applyLineHeight()
275277
applyTokenSpans()
278+
editor.applyPlaceholder()
276279
}
277280

278281
fun setLineHeight(lineHeight: Float) {
@@ -587,6 +590,37 @@ internal class SelectionAwareEditText(context: Context) : EditText(context) {
587590
var maxInputChars = Int.MAX_VALUE
588591
var clipboardFragment = ""
589592

593+
/**
594+
* Placeholder shown while the draft is empty. An editable TextView never ellipsizes its hint,
595+
* so a long placeholder wraps once a wide system font or a large font scale (Samsung defaults)
596+
* runs out of width, and the resting composer grows to two lines. The hint is instead cut to
597+
* one line with an ellipsis for whatever width the editor is measured at.
598+
*/
599+
var placeholder = ""
600+
set(value) {
601+
field = value
602+
applyPlaceholder()
603+
}
604+
605+
fun applyPlaceholder(availableWidth: Int = width - compoundPaddingLeft - compoundPaddingRight) {
606+
val next =
607+
if (availableWidth > 0) {
608+
TextUtils.ellipsize(placeholder, paint, availableWidth.toFloat(), TextUtils.TruncateAt.END)
609+
} else {
610+
placeholder
611+
}
612+
if (hint?.toString() != next.toString()) hint = next
613+
}
614+
615+
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
616+
if (MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED) {
617+
applyPlaceholder(
618+
MeasureSpec.getSize(widthMeasureSpec) - compoundPaddingLeft - compoundPaddingRight
619+
)
620+
}
621+
super.onMeasure(widthMeasureSpec, heightMeasureSpec)
622+
}
623+
590624
private fun deleteChip(backwards: Boolean): Boolean {
591625
val content = text
592626
val start = minOf(selectionStart, selectionEnd)
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package expo.modules.t3composereditor
2+
3+
import android.view.View
4+
import android.view.ViewGroup
5+
import org.junit.Assert.assertEquals
6+
import org.junit.Assert.assertTrue
7+
import org.junit.Test
8+
import org.junit.runner.RunWith
9+
import org.robolectric.RobolectricTestRunner
10+
import org.robolectric.RuntimeEnvironment
11+
import org.robolectric.annotation.Config
12+
import org.robolectric.annotation.GraphicsMode
13+
14+
@RunWith(RobolectricTestRunner::class)
15+
@Config(sdk = [36], manifest = Config.NONE)
16+
@GraphicsMode(GraphicsMode.Mode.NATIVE)
17+
class ComposerPlaceholderTest {
18+
private val placeholder = "Ask the repo agent, or run a command…"
19+
private val editor = SelectionAwareEditText(RuntimeEnvironment.getApplication()).apply {
20+
layoutParams = ViewGroup.LayoutParams(
21+
ViewGroup.LayoutParams.MATCH_PARENT,
22+
ViewGroup.LayoutParams.MATCH_PARENT,
23+
)
24+
textSize = 16f
25+
placeholder = this@ComposerPlaceholderTest.placeholder
26+
}
27+
28+
private fun measureAt(width: Int) {
29+
editor.measure(
30+
View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY),
31+
View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
32+
)
33+
editor.layout(0, 0, width, editor.measuredHeight)
34+
}
35+
36+
@Test
37+
fun narrowEditorCutsThePlaceholderToOneLine() {
38+
val fullWidth = editor.paint.measureText(placeholder)
39+
val width = (fullWidth / 2).toInt()
40+
measureAt(width)
41+
42+
val hint = editor.hint.toString()
43+
assertTrue(hint, hint.endsWith("…") && hint.length < placeholder.length)
44+
assertTrue(hint, editor.paint.measureText(hint) <= width)
45+
}
46+
47+
@Test
48+
fun wideEditorKeepsTheWholePlaceholder() {
49+
measureAt(editor.paint.measureText(placeholder).toInt() + 20)
50+
assertEquals(placeholder, editor.hint.toString())
51+
}
52+
53+
@Test
54+
fun placeholderRecoversWhenTheEditorWidens() {
55+
measureAt((editor.paint.measureText(placeholder) / 2).toInt())
56+
measureAt(editor.paint.measureText(placeholder).toInt() + 20)
57+
assertEquals(placeholder, editor.hint.toString())
58+
}
59+
}

0 commit comments

Comments
 (0)