Skip to content

Fix text decoration color fallback to use per-span foreground color #57087

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

Open
cortinico wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

Fix text decoration color fallback to use per-span foreground color #57087

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
15 changes: 14 additions & 1 deletion ...ct-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextDecorationStyle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import android.graphics.Paint
import android.graphics.Path
import android.os.Build
import android.text.Layout
import android.text.Spanned
import android.text.style.ForegroundColorSpan
import kotlin.math.max
import kotlin.math.min
import kotlin.math.roundToInt
Expand Down Expand Up @@ -126,7 +128,18 @@ internal fun drawSpannedDecoration(
yOffsetForLine: (paint: Paint, baseline: Float, thickness: Float) -> Float,
) {
val textPaint = layout.paint
val effectiveColor = if (color != Color.TRANSPARENT) color else textPaint.color
val effectiveColor =
if (color != Color.TRANSPARENT) {
color
} else {
// Look up the actual foreground color at the span position. layout.paint
// is the base paint whose color may differ from per-span foreground colors
// applied via ForegroundColorSpan (e.g., link text, colored text).
val spanned = layout.text as? Spanned
val fgSpans = spanned?.getSpans(start, start + 1, ForegroundColorSpan::class.java)
if (fgSpans != null && fgSpans.isNotEmpty()) fgSpans.last().foregroundColor
else textPaint.color
}
val minThickness = 1.5f * textPaint.density
val thickness =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
Expand Down
Loading