Skip to content

Limit Android 15 bounds-based text width to RTL text (#59504) #59504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
christophpurrer wants to merge 1 commit into from
+29 −1
Closed

Limit Android 15 bounds-based text width to RTL text (#59504) #59504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ...eact-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,12 @@ internal object TextLayoutManager {
}
}
}
val enableStartOverhang = widthYogaMeasureMode == YogaMeasureMode.EXACTLY
// Bounds-based width is limited to text with RTL characters. An EXACTLY width usually comes
// from an earlier advance-based AT_MOST measurement, and LTR glyph bounds that are wider than
// their advances (some OEM fonts) would make a single line overflow that width and ellipsize.
val enableStartOverhang =
widthYogaMeasureMode == YogaMeasureMode.EXACTLY &&
TextDirectionHeuristics.ANYRTL_LTR.isRtl(text, 0, text.length)
val layout =
buildLayout(
text,
Expand Down
23 changes: 23 additions & 0 deletions ...Android/src/test/java/com/facebook/react/views/text/TextLayoutManagerStartOverhangTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,29 @@ class TextLayoutManagerStartOverhangTest {
assertThat(getBooleanLayoutProperty(layout, "getShiftDrawingOffsetForStartOverhang")).isFalse()
}

@Test
@Config(sdk = [35])
fun `EXACTLY mode keeps advance based width measurement for LTR text`() {
val layout =
createLayout(
YogaMeasureMode.EXACTLY,
text = SpannableString("Just listed"),
ellipsizeMode = TextUtils.TruncateAt.END,
maxNumberOfLines = 1,
)

assertThat(getBooleanLayoutProperty(layout, "getUseBoundsForWidth")).isFalse()
assertThat(getBooleanLayoutProperty(layout, "getShiftDrawingOffsetForStartOverhang")).isFalse()
}

@Test
@Config(sdk = [35])
fun `EXACTLY mode enables start overhang support for mixed LTR and RTL text`() {
val layout = createLayout(YogaMeasureMode.EXACTLY, text = SpannableString("Hello שלום"))

assertThat(getBooleanLayoutProperty(layout, "getUseBoundsForWidth")).isTrue()
}

@Test
@Config(sdk = [35])
fun `RTL right overhang is rounded up to reserve whole pixels`() {
Expand Down
Loading