diff --git a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt index a0040a88b7b..5a893fdd2b5 100644 --- a/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt +++ b/packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt @@ -620,89 +620,15 @@ internal object TextLayoutManager { ) } - // Pre-Android 15: Use existing advance-based logic - if ( - Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM || - !ReactNativeFeatureFlags.fixTextClippingAndroid15useBoundsForWidth() - ) { - val desiredWidth = ceil(Layout.getDesiredWidth(text, paint)).toInt() - - val layoutWidth = - when (widthYogaMeasureMode) { - YogaMeasureMode.EXACTLY -> floor(width).toInt() - YogaMeasureMode.AT_MOST -> min(desiredWidth, floor(width).toInt()) - else -> desiredWidth - } - return buildLayout( - text, - layoutWidth, - includeFontPadding, - textBreakStrategy, - hyphenationFrequency, - alignment, - justificationMode, - ellipsizeMode, - maxNumberOfLines, - paint, - ) - } - - // Android 15+: Need to account for visual bounds - // Step 1: Create unconstrained layout to get visual bounds width - val unconstrainedLayout = - buildLayout( - text, - Int.MAX_VALUE / 2, - includeFontPadding, - textBreakStrategy, - hyphenationFrequency, - alignment, - justificationMode, - null, - ReactConstants.UNSET, - paint, - ) - - // Calculate visual bounds width from unconstrained layout - var desiredVisualWidth = 0f - for (i in 0 until unconstrainedLayout.lineCount) { - val lineWidth = unconstrainedLayout.getLineRight(i) - unconstrainedLayout.getLineLeft(i) - desiredVisualWidth = max(desiredVisualWidth, lineWidth) - } + val desiredWidth = ceil(Layout.getDesiredWidth(text, paint)).toInt() val layoutWidth = when (widthYogaMeasureMode) { - YogaMeasureMode.AT_MOST -> min(ceil(desiredVisualWidth).toInt(), floor(width).toInt()) - else -> ceil(desiredVisualWidth).toInt() + YogaMeasureMode.EXACTLY -> floor(width).toInt() + YogaMeasureMode.AT_MOST -> min(desiredWidth, floor(width).toInt()) + else -> desiredWidth } - // Step 2: Create final layout with correct width - return buildLayout( - text, - layoutWidth, - includeFontPadding, - textBreakStrategy, - hyphenationFrequency, - alignment, - justificationMode, - ellipsizeMode, - maxNumberOfLines, - paint, - ) - } - - private fun buildLayout( - text: Spannable, - layoutWidth: Int, - includeFontPadding: Boolean, - textBreakStrategy: Int, - hyphenationFrequency: Int, - alignment: Layout.Alignment, - justificationMode: Int, - ellipsizeMode: TextUtils.TruncateAt?, - maxNumberOfLines: Int, - paint: TextPaint, - ): Layout { val builder = StaticLayout.Builder.obtain(text, 0, text.length, paint, layoutWidth) .setAlignment(alignment) @@ -723,13 +649,6 @@ internal object TextLayoutManager { builder.setUseLineSpacingFromFallbacks(true) } - if ( - Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM && - ReactNativeFeatureFlags.fixTextClippingAndroid15useBoundsForWidth() - ) { - builder.setUseBoundsForWidth(true) - } - return builder.build() } diff --git a/packages/rn-tester/js/examples/Text/TextExample.android.js b/packages/rn-tester/js/examples/Text/TextExample.android.js index 84443cf035e..70e1722244a 100644 --- a/packages/rn-tester/js/examples/Text/TextExample.android.js +++ b/packages/rn-tester/js/examples/Text/TextExample.android.js @@ -1408,10 +1408,6 @@ const examples = [ Move fast and be normal - - Move fast and be italic, but just be longer so that you don't fit on - a single line and make sure text is not truncated. - ); },