mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Fix custom-font ellipsis clipping on Android (#59088)
Summary: Pull Request resolved: https://github.com/react/react-native/pull/59088 This fixes two Android `Text` bugs. ## Problem 1: tail ellipsis clipped with custom fonts Android generates the tail ellipsis outside styled text spans, shaping it with `ReactTextView`'s own paint. That paint did not carry the base text attributes React Native measured with — typeface, font size, letter spacing, font feature settings, or shaping flags. For custom fonts the ellipsis glyph can be wider than the reserved space, overflowing the text bounds and losing its last dot under `overflow: hidden`. ## Problem 2: `fontVariant` ignored without `fontFamily` `fontVariant` (`small-caps`, `oldstyle-nums`, `lining-nums`, `tabular-nums`, `proportional-nums`, …) is applied through `CustomStyleSpan`, but `TextLayoutManager` only added that span when `fontFamily`, `fontWeight`, `fontStyle` or `fontVariationSettings` was also set. A `Text` (or nested fragment) that set only `fontVariant` rendered without the requested OpenType features. ## Fix - Add a `CustomStyleSpan` whenever `fontFeatureSettings` is set, in both span-building paths, so `fontVariant` works on its own. This changes the RNTester `fontVariants` example on Android. - Apply the resolved base `TextAttributeProps` to the view's paint before setting text, using the same `TextLayoutManager.updateTextPaint` that already builds the measurement paint. `updateTextPaint` now also applies letter spacing, font feature settings and shaping flags. A shared `resetTextPaint` clears the state when a view is recycled. - `PreparedLayout` now carries its `baseTextAttributes`, so selectable text (which still renders through `ReactTextView` with prepared layouts enabled) gets the correct paint. Changelog: [Android][Fixed] - Fix tail ellipsis overflowing or clipping on `Text` with a custom font [Android][Fixed] - Fix `fontVariant` being ignored on `Text` that doesn't also set `fontFamily`, `fontWeight` or `fontStyle` Reviewed By: Abbondanzo Differential Revision: D116515542 fbshipit-source-id: 814c63d28e03552f10f48faf863d801d60db021c
This commit is contained in:
1 parent
3d6a3811d8
commit
ababa4de06
10 files changed
+233
-7
No files matched your search
+2
-1
@@ -712,7 +712,8 @@ public class FabricUIManager
|
||||
preparedLayout.getVerticalOffset(),
|
||||
reactTags,
|
||||
preparedLayout.getTextBreakStrategy(),
|
||||
preparedLayout.getJustificationMode());
|
||||
preparedLayout.getJustificationMode(),
|
||||
preparedLayout.getBaseTextAttributes());
|
||||
}
|
||||
|
||||
@AnyThread
|
||||
|
||||
+1
@@ -22,4 +22,5 @@ internal class PreparedLayout(
|
||||
val reactTags: IntArray,
|
||||
val textBreakStrategy: Int,
|
||||
val justificationMode: Int,
|
||||
val baseTextAttributes: TextAttributeProps,
|
||||
)
|
||||
+1
@@ -502,6 +502,7 @@ internal class PreparedLayoutTextView(context: Context) : ViewGroup(context), Re
|
||||
reactTags,
|
||||
textBreakStrategy,
|
||||
justificationMode,
|
||||
baseTextAttributes,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
+1
@@ -16,6 +16,7 @@ internal class ReactTextUpdate(
|
||||
val textAlign: Int,
|
||||
val textBreakStrategy: Int,
|
||||
val justificationMode: Int,
|
||||
val baseTextAttributes: TextAttributeProps? = null,
|
||||
) {
|
||||
companion object {
|
||||
@JvmStatic
|
||||
|
||||
+22
@@ -67,6 +67,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
// compile against an SDK older than 35 (see AndroidVersion).
|
||||
private static final @Nullable Method SET_USE_BOUNDS_FOR_WIDTH = resolveSetUseBoundsForWidth();
|
||||
|
||||
private final float mDefaultTextSize;
|
||||
private int mNumberOfLines;
|
||||
private @Nullable TextUtils.TruncateAt mEllipsizeLocation;
|
||||
private boolean mAdjustsFontSizeToFit;
|
||||
@@ -85,6 +86,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
@SuppressWarnings("this-escape")
|
||||
public ReactTextView(Context context) {
|
||||
super(context);
|
||||
mDefaultTextSize = getTextSize();
|
||||
initView();
|
||||
}
|
||||
|
||||
@@ -165,6 +167,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
// reset text
|
||||
setLayoutParams(EMPTY_LAYOUT_PARAMS);
|
||||
super.setText(null);
|
||||
TextLayoutManager.resetTextPaint(getPaint(), mDefaultTextSize);
|
||||
applyTextAttributes();
|
||||
|
||||
// Call setters to ensure that any super setters are called
|
||||
@@ -384,6 +387,7 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
Linkify.addLinks((Spannable) spanned, mLinkifyMaskType);
|
||||
setMovementMethod(LinkMovementMethod.getInstance());
|
||||
}
|
||||
applyBaseTextAttributes(update.getBaseTextAttributes());
|
||||
setText(spanned);
|
||||
|
||||
int nextTextAlign = update.getTextAlign();
|
||||
@@ -404,6 +408,24 @@ public class ReactTextView extends AppCompatTextView implements ReactCompoundVie
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Android draws generated ellipses with the view's paint rather than a span, so it must match the
|
||||
* base attributes TextLayoutManager measured with.
|
||||
*/
|
||||
private void applyBaseTextAttributes(@Nullable TextAttributeProps baseTextAttributes) {
|
||||
if (baseTextAttributes == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
TextLayoutManager.resetTextPaint(getPaint(), mDefaultTextSize);
|
||||
applyTextAttributes();
|
||||
TextLayoutManager.updateTextPaint(
|
||||
getPaint(),
|
||||
baseTextAttributes,
|
||||
getContext().getAssets(),
|
||||
ReactTypefaceUtils.getFontWeightAdjustment(getContext()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int reactTagForTouch(float touchX, float touchY) {
|
||||
CharSequence text = getText();
|
||||
|
||||
+4
@@ -201,6 +201,9 @@ public constructor(
|
||||
TextLayoutManager.getTextGravity(attributedString, spanned),
|
||||
textBreakStrategy,
|
||||
TextAttributeProps.getJustificationMode(props, currentJustificationMode),
|
||||
TextAttributeProps.fromMapBuffer(
|
||||
attributedString.getMapBuffer(TextLayoutManager.AS_KEY_BASE_ATTRIBUTES),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -230,6 +233,7 @@ public constructor(
|
||||
textAlign,
|
||||
preparedLayout.textBreakStrategy,
|
||||
preparedLayout.justificationMode,
|
||||
preparedLayout.baseTextAttributes,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+3
@@ -82,6 +82,9 @@ public class TextAttributeProps private constructor() {
|
||||
private var lineHeightInput: Float = ReactConstants.UNSET.toFloat()
|
||||
private var letterSpacingInput: Float = Float.NaN
|
||||
|
||||
internal val isLetterSpacingSet: Boolean
|
||||
get() = !letterSpacingInput.isNaN()
|
||||
|
||||
// `ReactConstants.UNSET` is -1, same as `LayoutDirection.UNDEFINED` (which is a hidden symbol)
|
||||
public var layoutDirection: Int = ReactConstants.UNSET
|
||||
private set
|
||||
|
||||
+29
-6
@@ -371,6 +371,7 @@ internal object TextLayoutManager {
|
||||
if (
|
||||
textAttributes.fontStyle != ReactConstants.UNSET ||
|
||||
textAttributes.fontWeight != ReactConstants.UNSET ||
|
||||
textAttributes.fontFeatureSettings != null ||
|
||||
textAttributes.fontVariationSettings != null ||
|
||||
textAttributes.fontFamily != null
|
||||
) {
|
||||
@@ -607,6 +608,7 @@ internal object TextLayoutManager {
|
||||
if (
|
||||
fragment.props.fontStyle != ReactConstants.UNSET ||
|
||||
fragment.props.fontWeight != ReactConstants.UNSET ||
|
||||
fragment.props.fontFeatureSettings != null ||
|
||||
fragment.props.fontVariationSettings != null ||
|
||||
fragment.props.fontFamily != null
|
||||
) {
|
||||
@@ -1003,8 +1005,8 @@ internal object TextLayoutManager {
|
||||
* Sets attributes on the TextPaint, used for content outside the Spannable text, like for empty
|
||||
* strings, or newlines after the last trailing character
|
||||
*/
|
||||
@VisibleForTesting
|
||||
internal fun updateTextPaint(
|
||||
@JvmStatic
|
||||
fun updateTextPaint(
|
||||
paint: TextPaint,
|
||||
baseTextAttributes: TextAttributeProps,
|
||||
assets: AssetManager,
|
||||
@@ -1014,9 +1016,14 @@ internal object TextLayoutManager {
|
||||
paint.textSize = baseTextAttributes.fontSize.toFloat()
|
||||
}
|
||||
|
||||
if (baseTextAttributes.isLetterSpacingSet) {
|
||||
paint.letterSpacing = baseTextAttributes.letterSpacing
|
||||
}
|
||||
|
||||
if (
|
||||
baseTextAttributes.fontStyle != ReactConstants.UNSET ||
|
||||
baseTextAttributes.fontWeight != ReactConstants.UNSET ||
|
||||
baseTextAttributes.fontFeatureSettings != null ||
|
||||
baseTextAttributes.fontVariationSettings != null ||
|
||||
baseTextAttributes.fontFamily != null
|
||||
) {
|
||||
@@ -1041,6 +1048,9 @@ internal object TextLayoutManager {
|
||||
paint.isFakeBoldText = missingStyle and Typeface.BOLD != 0
|
||||
paint.textSkewX = if ((missingStyle and Typeface.ITALIC) != 0) -0.25f else 0f
|
||||
}
|
||||
|
||||
paint.isSubpixelText = true
|
||||
paint.isLinearText = true
|
||||
} else {
|
||||
val typeface = ReactTypefaceUtils.applyFontWeightAdjustment(null, fontWeightAdjustment)
|
||||
if (typeface != null) {
|
||||
@@ -1048,6 +1058,7 @@ internal object TextLayoutManager {
|
||||
}
|
||||
}
|
||||
|
||||
paint.fontFeatureSettings = baseTextAttributes.fontFeatureSettings
|
||||
ReactTypefaceUtils.applyFontVariationSettings(paint, baseTextAttributes.fontVariationSettings)
|
||||
}
|
||||
|
||||
@@ -1061,14 +1072,25 @@ internal object TextLayoutManager {
|
||||
fontWeightAdjustment: Int,
|
||||
): TextPaint {
|
||||
val paint = checkNotNull(textPaintInstance.get())
|
||||
paint.setTypeface(null)
|
||||
paint.textSize = 12f
|
||||
paint.isFakeBoldText = false
|
||||
paint.textSkewX = 0f
|
||||
resetTextPaint(paint, 12f)
|
||||
updateTextPaint(paint, baseTextAttributes, assets, fontWeightAdjustment)
|
||||
return paint
|
||||
}
|
||||
|
||||
/** Clears every attribute [updateTextPaint] may set, so a reused paint starts from defaults. */
|
||||
@JvmStatic
|
||||
fun resetTextPaint(paint: TextPaint, textSize: Float) {
|
||||
paint.setTypeface(null)
|
||||
paint.textSize = textSize
|
||||
paint.letterSpacing = 0f
|
||||
paint.fontFeatureSettings = null
|
||||
paint.isFakeBoldText = false
|
||||
paint.textSkewX = 0f
|
||||
paint.isSubpixelText = false
|
||||
paint.isLinearText = false
|
||||
ReactTypefaceUtils.applyFontVariationSettings(paint, null)
|
||||
}
|
||||
|
||||
private fun newPaintWithAttributes(
|
||||
baseTextAttributes: TextAttributeProps,
|
||||
assets: AssetManager,
|
||||
@@ -1333,6 +1355,7 @@ internal object TextLayoutManager {
|
||||
reactTags,
|
||||
result.textBreakStrategy,
|
||||
result.justificationMode,
|
||||
baseTextAttributes,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+108
@@ -14,6 +14,8 @@ import android.graphics.Color
|
||||
import android.graphics.Paint
|
||||
import android.text.SpannableString
|
||||
import android.text.Spanned
|
||||
import android.text.TextPaint
|
||||
import android.text.TextUtils
|
||||
import android.text.style.ReplacementSpan
|
||||
import android.util.TypedValue
|
||||
import android.view.Gravity
|
||||
@@ -21,7 +23,10 @@ import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import androidx.core.graphics.createBitmap
|
||||
import androidx.core.graphics.get
|
||||
import com.facebook.react.bridge.JavaOnlyArray
|
||||
import com.facebook.react.bridge.JavaOnlyMap
|
||||
import com.facebook.react.uimanager.DisplayMetricsHolder
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap
|
||||
import com.facebook.react.views.text.internal.span.ReactAbsoluteSizeSpan
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.junit.After
|
||||
@@ -45,6 +50,86 @@ class ReactTextViewTest {
|
||||
DisplayMetricsHolder.setScreenDisplayMetrics(null)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun tailEllipsisUsesBaseTextAttributeMetrics() {
|
||||
val attributes =
|
||||
textAttributes(
|
||||
"fontFamily",
|
||||
"serif",
|
||||
"fontSize",
|
||||
32.0,
|
||||
"letterSpacing",
|
||||
1.5,
|
||||
"fontVariant",
|
||||
JavaOnlyArray.of("small-caps"),
|
||||
)
|
||||
val expectedPaint = paintWithAttributes(attributes)
|
||||
val view = TestReactTextView(RuntimeEnvironment.getApplication())
|
||||
view.setNumberOfLines(1)
|
||||
view.setEllipsizeLocation(TextUtils.TruncateAt.END)
|
||||
view.setText(
|
||||
textUpdate(SpannableString("Search files in a very long directory name"), attributes)
|
||||
)
|
||||
view.updateView()
|
||||
view.measure(
|
||||
View.MeasureSpec.makeMeasureSpec(40, View.MeasureSpec.EXACTLY),
|
||||
View.MeasureSpec.makeMeasureSpec(60, View.MeasureSpec.EXACTLY),
|
||||
)
|
||||
view.layout(0, 0, 40, 60)
|
||||
|
||||
val paint = checkNotNull(view.layout).paint
|
||||
assertThat(view.ellipsize).isEqualTo(TextUtils.TruncateAt.END)
|
||||
assertThat(paint.typeface).isEqualTo(expectedPaint.typeface)
|
||||
assertThat(paint.textSize).isEqualTo(expectedPaint.textSize)
|
||||
assertThat(paint.letterSpacing).isEqualTo(expectedPaint.letterSpacing)
|
||||
assertThat(paint.fontFeatureSettings).isEqualTo("'smcp'")
|
||||
assertThat(paint.measureText("…")).isEqualTo(expectedPaint.measureText("…"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun baseTextAttributesDoNotLeakAcrossUpdatesOrRecycling() {
|
||||
val text = SpannableString("Text")
|
||||
val view = TestReactTextView(RuntimeEnvironment.getApplication())
|
||||
val defaultTextSize = view.textSize
|
||||
val custom =
|
||||
textAttributes(
|
||||
"fontFamily",
|
||||
"serif",
|
||||
"fontSize",
|
||||
32.0,
|
||||
"letterSpacing",
|
||||
1.5,
|
||||
"fontVariant",
|
||||
JavaOnlyArray.of("small-caps"),
|
||||
)
|
||||
|
||||
view.setText(textUpdate(text, custom))
|
||||
assertThat(view.paint.typeface).isNotNull
|
||||
assertThat(view.textSize).isNotEqualTo(defaultTextSize)
|
||||
|
||||
view.setText(textUpdate(text, textAttributes()))
|
||||
assertDefaultPaint(view, defaultTextSize)
|
||||
|
||||
view.setText(textUpdate(text, custom))
|
||||
view.recycleView()
|
||||
assertDefaultPaint(view, defaultTextSize)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun baseTextAttributesPreserveViewFontSizeAndLetterSpacingWhenUnset() {
|
||||
val view = TestReactTextView(RuntimeEnvironment.getApplication())
|
||||
view.setFontSize(32f)
|
||||
view.letterSpacing = 1.5f
|
||||
val expectedTextSize = view.textSize
|
||||
val expectedLetterSpacing = view.letterSpacing
|
||||
|
||||
view.setText(textUpdate(SpannableString("Text"), textAttributes("fontFamily", "serif")))
|
||||
|
||||
assertThat(view.paint.typeface).isNotNull
|
||||
assertThat(view.textSize).isEqualTo(expectedTextSize)
|
||||
assertThat(view.letterSpacing).isEqualTo(expectedLetterSpacing)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun drawsGlyphInkOutsideLineHeightWhenOverflowIsVisible() {
|
||||
val bitmap = drawReactTextViewWithOverflow(null)
|
||||
@@ -134,6 +219,29 @@ class ReactTextViewTest {
|
||||
private fun largestAbsoluteSizeSpan(text: Spanned): Int =
|
||||
text.getSpans(0, text.length, ReactAbsoluteSizeSpan::class.java).maxOfOrNull { it.size } ?: 0
|
||||
|
||||
private fun textAttributes(vararg keysAndValues: Any): TextAttributeProps =
|
||||
TextAttributeProps.fromReadableMap(ReactStylesDiffMap(JavaOnlyMap.of(*keysAndValues)))
|
||||
|
||||
private fun paintWithAttributes(attributes: TextAttributeProps): TextPaint =
|
||||
TextPaint(TextPaint.ANTI_ALIAS_FLAG).apply {
|
||||
TextLayoutManager.updateTextPaint(
|
||||
this,
|
||||
attributes,
|
||||
RuntimeEnvironment.getApplication().assets,
|
||||
0,
|
||||
)
|
||||
}
|
||||
|
||||
private fun textUpdate(text: Spanned, attributes: TextAttributeProps): ReactTextUpdate =
|
||||
ReactTextUpdate(text, -1, Gravity.START, 0, 0, attributes)
|
||||
|
||||
private fun assertDefaultPaint(view: ReactTextView, defaultTextSize: Float) {
|
||||
assertThat(view.paint.typeface).isNull()
|
||||
assertThat(view.textSize).isEqualTo(defaultTextSize)
|
||||
assertThat(view.letterSpacing).isEqualTo(0f)
|
||||
assertThat(view.paint.fontFeatureSettings).isNull()
|
||||
}
|
||||
|
||||
private fun drawReactTextViewWithOverflow(overflow: String?): Bitmap {
|
||||
return drawReactTextViewWithOverflow(overflow, lineHeight = 24, viewHeight = 24, gravity = null)
|
||||
}
|
||||
|
||||
+62
@@ -12,6 +12,7 @@ import android.graphics.Typeface
|
||||
import android.os.Build
|
||||
import android.text.TextPaint
|
||||
import androidx.annotation.RequiresApi
|
||||
import com.facebook.react.bridge.JavaOnlyArray
|
||||
import com.facebook.react.bridge.JavaOnlyMap
|
||||
import com.facebook.react.uimanager.DisplayMetricsHolder
|
||||
import com.facebook.react.uimanager.ReactStylesDiffMap
|
||||
@@ -94,6 +95,67 @@ class TextLayoutManagerFontWeightAdjustmentTest {
|
||||
assertThat(paint.fontVariationSettings).isNull()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `text paint applies base attributes used to shape generated ellipses`() {
|
||||
val textAttributes =
|
||||
TextAttributeProps.fromReadableMap(
|
||||
ReactStylesDiffMap(
|
||||
JavaOnlyMap.of(
|
||||
"fontFamily",
|
||||
"serif",
|
||||
"fontSize",
|
||||
32.0,
|
||||
"letterSpacing",
|
||||
1.5,
|
||||
"fontVariant",
|
||||
JavaOnlyArray.of("small-caps"),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
||||
val paint = TextPaint()
|
||||
TextLayoutManager.updateTextPaint(
|
||||
paint,
|
||||
textAttributes,
|
||||
RuntimeEnvironment.getApplication().assets,
|
||||
0,
|
||||
)
|
||||
|
||||
assertThat(paint.typeface).isNotNull
|
||||
assertThat(paint.textSize).isEqualTo(textAttributes.fontSize.toFloat())
|
||||
assertThat(paint.letterSpacing).isEqualTo(textAttributes.letterSpacing)
|
||||
assertThat(paint.fontFeatureSettings).isEqualTo("'smcp'")
|
||||
|
||||
TextLayoutManager.resetTextPaint(paint, 12f)
|
||||
|
||||
assertThat(paint.typeface).isNull()
|
||||
assertThat(paint.textSize).isEqualTo(12f)
|
||||
assertThat(paint.letterSpacing).isEqualTo(0f)
|
||||
assertThat(paint.fontFeatureSettings).isNull()
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `text paint enables the shaping flags used by custom style spans`() {
|
||||
val paint = mock<TextPaint>()
|
||||
val textAttributes =
|
||||
TextAttributeProps.fromReadableMap(
|
||||
ReactStylesDiffMap(
|
||||
JavaOnlyMap.of("fontVariant", JavaOnlyArray.of("small-caps")),
|
||||
),
|
||||
)
|
||||
|
||||
TextLayoutManager.updateTextPaint(
|
||||
paint,
|
||||
textAttributes,
|
||||
RuntimeEnvironment.getApplication().assets,
|
||||
0,
|
||||
)
|
||||
|
||||
verify(paint).setFontFeatureSettings("'smcp'")
|
||||
verify(paint).setSubpixelText(true)
|
||||
verify(paint).setLinearText(true)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `custom style applies font variation settings after high level font properties`() {
|
||||
val paint = mock<TextPaint>()
|
||||
|
||||
Reference in new issue
Block a user