mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Fix TextLayoutManager compilation against compile SDK 34 (#56118)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/56118 TextLayoutManager.kt references Android 15 (API 35) symbols (`Build.VERSION_CODES.VANILLA_ICE_CREAM` and `StaticLayout.Builder.setUseBoundsForWidth`) that are unavailable when compiling against SDK level 34. This causes build failures for any Android target using `compile_sdk_version = 34`. Fix by defining `VERSION_CODE_VANILLA_ICE_CREAM = 35` in `AndroidVersion.kt` (following the existing `VERSION_CODE_BAKLAVA` pattern) and using reflection for `setUseBoundsForWidth`. Runtime behavior is unchanged — the version check guards ensure these code paths only execute on Android 15+ devices. Changelog: [Internal] Reviewed By: cortinico Differential Revision: D95994030 fbshipit-source-id: 1c358af38b862b92075df4f465a506184b7900a4
This commit is contained in:
1 parent
4f908f4330
commit
c118fa0915
2 files changed
+26
-3
No files matched your search
+7
@@ -13,6 +13,13 @@ import android.os.Build
|
||||
/** Helper class for checking Android version-related information. */
|
||||
internal object AndroidVersion {
|
||||
|
||||
/**
|
||||
* This is the version code for Android 15 (SDK Level 35). Internally at Meta this code is also
|
||||
* compiled against SDK 34, so we need to retain this constant instead of using
|
||||
* [Build.VERSION_CODES.VANILLA_ICE_CREAM] directly.
|
||||
*/
|
||||
internal const val VERSION_CODE_VANILLA_ICE_CREAM: Int = 35
|
||||
|
||||
/**
|
||||
* This is the version code for Android 16 (SDK Level 36). Delete it once we bump up the default
|
||||
* compile SDK version to 36.
|
||||
|
||||
+19
-3
@@ -36,6 +36,7 @@ import com.facebook.react.uimanager.PixelUtil
|
||||
import com.facebook.react.uimanager.PixelUtil.dpToPx
|
||||
import com.facebook.react.uimanager.PixelUtil.pxToDp
|
||||
import com.facebook.react.uimanager.ReactAccessibilityDelegate
|
||||
import com.facebook.react.util.AndroidVersion.VERSION_CODE_VANILLA_ICE_CREAM
|
||||
import com.facebook.react.views.text.internal.span.CustomLetterSpacingSpan
|
||||
import com.facebook.react.views.text.internal.span.CustomLineHeightSpan
|
||||
import com.facebook.react.views.text.internal.span.CustomStyleSpan
|
||||
@@ -105,6 +106,18 @@ internal object TextLayoutManager {
|
||||
|
||||
private val tagToSpannableCache = ConcurrentHashMap<Int, Spannable>()
|
||||
|
||||
// Lazily cached Method for StaticLayout.Builder.setUseBoundsForWidth (API 35+).
|
||||
// Reflection is needed because some internal targets compile against an SDK older than 35.
|
||||
private val setUseBoundsForWidthMethod: java.lang.reflect.Method? by lazy {
|
||||
try {
|
||||
StaticLayout.Builder::class
|
||||
.java
|
||||
.getMethod("setUseBoundsForWidth", Boolean::class.javaPrimitiveType)
|
||||
} catch (_: ReflectiveOperationException) {
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
fun setCachedSpannableForTag(reactTag: Int, sp: Spannable): Unit {
|
||||
tagToSpannableCache[reactTag] = sp
|
||||
}
|
||||
@@ -623,7 +636,7 @@ internal object TextLayoutManager {
|
||||
|
||||
// Pre-Android 15: Use existing advance-based logic
|
||||
if (
|
||||
Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM ||
|
||||
Build.VERSION.SDK_INT < VERSION_CODE_VANILLA_ICE_CREAM ||
|
||||
!ReactNativeFeatureFlags.fixTextClippingAndroid15useBoundsForWidth()
|
||||
) {
|
||||
val desiredWidth = ceil(Layout.getDesiredWidth(text, paint)).toInt()
|
||||
@@ -724,11 +737,14 @@ internal object TextLayoutManager {
|
||||
builder.setUseLineSpacingFromFallbacks(true)
|
||||
}
|
||||
|
||||
// setUseBoundsForWidth added in API 35 — use reflection to support internal targets that
|
||||
// compile against an SDK older than 35.
|
||||
// https://developer.android.com/reference/android/text/StaticLayout.Builder#setUseBoundsForWidth(boolean)
|
||||
if (
|
||||
Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM &&
|
||||
Build.VERSION.SDK_INT >= VERSION_CODE_VANILLA_ICE_CREAM &&
|
||||
ReactNativeFeatureFlags.fixTextClippingAndroid15useBoundsForWidth()
|
||||
) {
|
||||
builder.setUseBoundsForWidth(true)
|
||||
setUseBoundsForWidthMethod?.invoke(builder, true)
|
||||
}
|
||||
|
||||
return builder.build()
|
||||
|
||||
Reference in new issue
Block a user