Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

evenly distribute adjustment between top and bottom

Browse Source 
Summary:
Before we were dividing proportionally and were noticing some truncation at the bottom. It seems that the truncation was disproportionately because of the way the metrics are calculated. Through guess and check, dividing equally between top and bottom seems to yield better results... 🤡

Changelog: [internal]

Reviewed By: NickGerleman, xunrongl

Differential Revision: D62665295

fbshipit-source-id: b1589c75251d68eaf75e32598ee84fbac457ae4a
This commit is contained in:
Melissa Liu
2024-09-13 17:50:10 -07:00
committed by Facebook GitHub Bot
parent 17faac4170
commit 6bcaa09749
1 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomLineHeightSpan.kt
+4 -19
View File
@@ -10,7 +10,6 @@ package com.facebook.react.views.text.internal.span
import android.graphics.Paint.FontMetricsInt
import android.text.style.LineHeightSpan
import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
import kotlin.math.abs
import kotlin.math.ceil
import kotlin.math.floor
import kotlin.math.min
@@ -38,26 +37,12 @@ public class CustomLineHeightSpan(height: Float) : LineHeightSpan, ReactSpan {
fm.top = fm.ascent
fm.bottom = fm.descent
} else if (-fm.top + fm.bottom > lineHeight) {
val excess = (-fm.top + fm.bottom) - lineHeight
// Calculate the amount we are over, and split the adjustment between top and bottom
// Calculate the differences from top to ascent and bottom to descent
val topToAscent = abs(fm.top - fm.ascent)
val bottomToDescent = abs(fm.bottom - fm.descent)
val excess = ((-fm.top + fm.bottom) - lineHeight) / 2
// Calculate the total delta
val totalDelta = topToAscent + bottomToDescent
// Calculate proportional reductions
val topReduction = (excess * topToAscent / totalDelta).toInt()
val bottomReduction = (excess * bottomToDescent / totalDelta).toInt()
// Adjust fm.top and fm.bottom
fm.top += topReduction
fm.bottom -= bottomReduction
// If there's a remainder, put it on the top
val remainder = excess - (topReduction + bottomReduction)
fm.top -= remainder
fm.top += excess
fm.bottom -= excess
} else {
// Show proportionally additional ascent / top & descent / bottom
val additional = lineHeight - (-fm.top + fm.bottom)