react-native 0.84.0-nightly-20251207-e4a5a56df → 0.84.0-nightly-20251208-8347cc4b5

package/Libraries/Core/ReactNativeVersion.js

@@ -29,7 +29,7 @@ export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 84;
   static patch: number = 0;
-  static prerelease: string | null = 'nightly-20251207-e4a5a56df';
+  static prerelease: string | null = 'nightly-20251208-8347cc4b5';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/React/Base/RCTVersion.m

@@ -24,7 +24,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(84),
                   RCTVersionPatch: @(0),
-                  RCTVersionPrerelease: @"nightly-20251207-e4a5a56df",
+                  RCTVersionPrerelease: @"nightly-20251208-8347cc4b5",
                   };
   });
   return __rnVersion;

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.84.0-nightly-20251207-e4a5a56df
+VERSION_NAME=0.84.0-nightly-20251208-8347cc4b5
 react.internal.publishingGroup=com.facebook.react
 react.internal.hermesPublishingGroup=com.facebook.hermes
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.kt

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 84,
     "patch" to 0,
-    "prerelease" to "nightly-20251207-e4a5a56df"
+    "prerelease" to "nightly-20251208-8347cc4b5"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.kt

@@ -620,15 +620,89 @@ internal object TextLayoutManager {
       )
     }
 
-    val desiredWidth = ceil(Layout.getDesiredWidth(text, paint)).toInt()
+    // 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 layoutWidth =
         when (widthYogaMeasureMode) {
-          YogaMeasureMode.EXACTLY -> floor(width).toInt()
-          YogaMeasureMode.AT_MOST -> min(desiredWidth, floor(width).toInt())
-          else -> desiredWidth
+          YogaMeasureMode.AT_MOST -> min(ceil(desiredVisualWidth).toInt(), floor(width).toInt())
+          else -> ceil(desiredVisualWidth).toInt()
         }
 
+    // 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)
@@ -649,6 +723,13 @@ 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()
   }
 

package/ReactAndroid/src/main/res/views/uimanager/values-ne/strings.xml

@@ -9,6 +9,7 @@
     <string name="header_description" gender="unknown">शीर्षक</string>
     <string name="combobox_description" gender="unknown">कम्बो बक्स</string>
     <string name="menu_description" gender="unknown">मेनु</string>
+    <string name="menubar_description" gender="unknown">मेनु बार</string>
     <string name="menuitem_description" gender="unknown">मेनु वस्तु</string>
     <string name="scrollbar_description" gender="unknown">स्क्रोल बार</string>
     <string name="rn_tab_description" gender="unknown">टयाब</string>

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -22,7 +22,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 84;
   int32_t Patch = 0;
-  std::string_view Prerelease = "nightly-20251207-e4a5a56df";
+  std::string_view Prerelease = "nightly-20251208-8347cc4b5";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.84.0-nightly-20251207-e4a5a56df",
+  "version": "0.84.0-nightly-20251208-8347cc4b5",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -160,13 +160,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.7.0",
-    "@react-native/assets-registry": "0.84.0-nightly-20251207-e4a5a56df",
-    "@react-native/codegen": "0.84.0-nightly-20251207-e4a5a56df",
-    "@react-native/community-cli-plugin": "0.84.0-nightly-20251207-e4a5a56df",
-    "@react-native/gradle-plugin": "0.84.0-nightly-20251207-e4a5a56df",
-    "@react-native/js-polyfills": "0.84.0-nightly-20251207-e4a5a56df",
-    "@react-native/normalize-colors": "0.84.0-nightly-20251207-e4a5a56df",
-    "@react-native/virtualized-lists": "0.84.0-nightly-20251207-e4a5a56df",
+    "@react-native/assets-registry": "0.84.0-nightly-20251208-8347cc4b5",
+    "@react-native/codegen": "0.84.0-nightly-20251208-8347cc4b5",
+    "@react-native/community-cli-plugin": "0.84.0-nightly-20251208-8347cc4b5",
+    "@react-native/gradle-plugin": "0.84.0-nightly-20251208-8347cc4b5",
+    "@react-native/js-polyfills": "0.84.0-nightly-20251208-8347cc4b5",
+    "@react-native/normalize-colors": "0.84.0-nightly-20251208-8347cc4b5",
+    "@react-native/virtualized-lists": "0.84.0-nightly-20251208-8347cc4b5",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",