Skip to content

Parse textDecorationLine without compiling a regex on Android #59733

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

Merged
Abbondanzo merged 1 commit into from
Nov 2, 2026
+19 −5
Merged

Parse textDecorationLine without compiling a regex on Android #59733

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
6 changes: 1 addition & 5 deletions ...act-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextAttributeProps.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,11 +283,7 @@ public class TextAttributeProps private constructor() {
isUnderlineTextDecorationSet = false
isLineThroughTextDecorationSet = false
if (textDecorationLineString != null) {
for (textDecorationLineSubString in
textDecorationLineString
.split("-".toRegex())
.dropLastWhile { it.isEmpty() }
.toTypedArray()) {
for (textDecorationLineSubString in textDecorationLineString.split('-')) {
if ("underline" == textDecorationLineSubString) {
isUnderlineTextDecorationSet = true
} else if ("strikethrough" == textDecorationLineSubString) {
Expand Down
18 changes: 18 additions & 0 deletions ...native/ReactAndroid/src/test/java/com/facebook/react/views/text/TextAttributePropsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,24 @@ class TextAttributePropsTest {
assertThat(textAttributes.lineHeight).isCloseTo(20f * DENSITY, within(0.001f))
}

@Test
fun mapBufferSetsTextDecorationLine() {
assertThat(textDecorationLine("none")).isEqualTo(false to false)
assertThat(textDecorationLine("underline")).isEqualTo(true to false)
assertThat(textDecorationLine("strikethrough")).isEqualTo(false to true)
assertThat(textDecorationLine("underline-strikethrough")).isEqualTo(true to true)
}

/** Returns whether underline and line-through are set for the given textDecorationLine. */
private fun textDecorationLine(value: String): Pair<Boolean, Boolean> {
val textAttributes =
TextAttributeProps.fromMapBuffer(
WritableMapBuffer().put(TextAttributeProps.TA_KEY_TEXT_DECORATION_LINE, value),
)
return textAttributes.isUnderlineTextDecorationSet to
textAttributes.isLineThroughTextDecorationSet
}

private fun setFontScale(fontScale: Float) {
DisplayMetricsHolder.setScreenDisplayMetrics(
DisplayMetrics().apply {
Expand Down
Loading