react-native-tvos 0.85.3-1 → 0.86.0-0

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

@@ -7,7 +7,7 @@
 
 package com.facebook.react.views.text
 
-import android.content.Context
+import android.content.res.AssetManager
 import android.graphics.Color
 import android.graphics.Typeface
 import android.os.Build
@@ -31,6 +31,7 @@ import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.mapbuffer.MapBuffer
 import com.facebook.react.common.mapbuffer.ReadableMapBuffer
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
+import com.facebook.react.uimanager.DisplayMetricsHolder
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.PixelUtil.pxToDp
@@ -104,6 +105,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
   }
@@ -217,7 +230,7 @@ internal object TextLayoutManager {
   }
 
   private fun buildSpannableFromFragments(
-      context: Context,
+      assets: AssetManager,
       fragments: MapBuffer,
       sb: SpannableStringBuilder,
       ops: MutableList<SetSpanOperation>,
@@ -296,7 +309,7 @@ internal object TextLayoutManager {
                       textAttributes.fontWeight,
                       textAttributes.fontFeatureSettings,
                       textAttributes.fontFamily,
-                      context.assets,
+                      assets,
                   ),
               )
           )
@@ -352,7 +365,7 @@ internal object TextLayoutManager {
   )
 
   private fun buildSpannableFromFragmentsOptimized(
-      context: Context,
+      assets: AssetManager,
       fragments: MapBuffer,
       outputReactTags: IntArray?,
   ): Spannable {
@@ -472,7 +485,7 @@ internal object TextLayoutManager {
                   fragment.props.fontWeight,
                   fragment.props.fontFeatureSettings,
                   fragment.props.fontFamily,
-                  context.assets,
+                  assets,
               ),
               start,
               end,
@@ -528,7 +541,7 @@ internal object TextLayoutManager {
   }
 
   fun getOrCreateSpannableForText(
-      context: Context,
+      assets: AssetManager,
       attributedString: MapBuffer,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
   ): Spannable {
@@ -539,7 +552,7 @@ internal object TextLayoutManager {
     } else {
       text =
           createSpannableFromAttributedString(
-              context,
+              assets,
               attributedString.getMapBuffer(AS_KEY_FRAGMENTS),
               reactTextViewManagerCallback,
               null,
@@ -550,13 +563,13 @@ internal object TextLayoutManager {
   }
 
   private fun createSpannableFromAttributedString(
-      context: Context,
+      assets: AssetManager,
       fragments: MapBuffer,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
       outputReactTags: IntArray?,
   ): Spannable {
     if (ReactNativeFeatureFlags.enableAndroidTextMeasurementOptimizations()) {
-      val spannable = buildSpannableFromFragmentsOptimized(context, fragments, outputReactTags)
+      val spannable = buildSpannableFromFragmentsOptimized(assets, fragments, outputReactTags)
 
       reactTextViewManagerCallback?.onPostProcessSpannable(spannable)
       return spannable
@@ -568,7 +581,7 @@ internal object TextLayoutManager {
       // a new spannable will be wiped out
       val ops: MutableList<SetSpanOperation> = ArrayList()
 
-      buildSpannableFromFragments(context, fragments, sb, ops, outputReactTags)
+      buildSpannableFromFragments(assets, fragments, sb, ops, outputReactTags)
 
       // TODO T31905686: add support for inline Images
       // While setting the Spans on the final text, we also check whether any of them are images.
@@ -605,9 +618,12 @@ internal object TextLayoutManager {
         boring != null &&
             (widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || boring.width <= floor(width))
     ) {
+      // Guard uses floor() but layout width below uses ceil() for EXACTLY mode intentionally:
+      // text that barely fails the floor-based guard falls through to StaticLayout, which also
+      // ceils for EXACTLY — no wrapping results, just a slightly less optimal layout class in a
+      // rare subpixel edge case.
       val layoutWidth =
-          if (widthYogaMeasureMode == YogaMeasureMode.EXACTLY) floor(width).toInt()
-          else boring.width
+          if (widthYogaMeasureMode == YogaMeasureMode.EXACTLY) ceil(width).toInt() else boring.width
       return BoringLayout.make(
           text,
           paint,
@@ -620,63 +636,14 @@ 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 -> ceil(width).toInt()
+          YogaMeasureMode.AT_MOST -> min(desiredWidth, floor(width).toInt())
+          else -> desiredWidth
         }
-
-    // Step 2: Create final layout with correct width
     return buildLayout(
         text,
         layoutWidth,
@@ -723,13 +690,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()
   }
 
@@ -740,7 +700,7 @@ internal object TextLayoutManager {
   private fun updateTextPaint(
       paint: TextPaint,
       baseTextAttributes: TextAttributeProps,
-      context: Context,
+      assets: AssetManager,
   ) {
     if (baseTextAttributes.fontSize != ReactConstants.UNSET) {
       paint.textSize = baseTextAttributes.fontSize.toFloat()
@@ -757,7 +717,7 @@ internal object TextLayoutManager {
               baseTextAttributes.fontStyle,
               baseTextAttributes.fontWeight,
               baseTextAttributes.fontFamily,
-              context.assets,
+              assets,
           )
       paint.setTypeface(typeface)
 
@@ -779,28 +739,28 @@ internal object TextLayoutManager {
    */
   private fun scratchPaintWithAttributes(
       baseTextAttributes: TextAttributeProps,
-      context: Context,
+      assets: AssetManager,
   ): TextPaint {
     val paint = checkNotNull(textPaintInstance.get())
     paint.setTypeface(null)
     paint.textSize = 12f
     paint.isFakeBoldText = false
     paint.textSkewX = 0f
-    updateTextPaint(paint, baseTextAttributes, context)
+    updateTextPaint(paint, baseTextAttributes, assets)
     return paint
   }
 
   private fun newPaintWithAttributes(
       baseTextAttributes: TextAttributeProps,
-      context: Context,
+      assets: AssetManager,
   ): TextPaint {
     val paint = TextPaint(TextPaint.ANTI_ALIAS_FLAG)
-    updateTextPaint(paint, baseTextAttributes, context)
+    updateTextPaint(paint, baseTextAttributes, assets)
     return paint
   }
 
   private fun createLayoutForMeasurement(
-      context: Context,
+      assets: AssetManager,
       attributedString: MapBuffer,
       paragraphAttributes: MapBuffer,
       width: Float,
@@ -809,7 +769,7 @@ internal object TextLayoutManager {
       heightYogaMeasureMode: YogaMeasureMode,
       reactTextViewManagerCallback: ReactTextViewManagerCallback?,
   ): Layout {
-    val text = getOrCreateSpannableForText(context, attributedString, reactTextViewManagerCallback)
+    val text = getOrCreateSpannableForText(assets, attributedString, reactTextViewManagerCallback)
 
     val paint: TextPaint
     if (attributedString.contains(AS_KEY_CACHE_ID)) {
@@ -817,7 +777,7 @@ internal object TextLayoutManager {
     } else {
       val baseTextAttributes =
           TextAttributeProps.fromMapBuffer(attributedString.getMapBuffer(AS_KEY_BASE_ATTRIBUTES))
-      paint = scratchPaintWithAttributes(baseTextAttributes, context)
+      paint = scratchPaintWithAttributes(baseTextAttributes, assets)
     }
 
     return createLayout(
@@ -922,7 +882,7 @@ internal object TextLayoutManager {
 
   @JvmStatic
   fun createPreparedLayout(
-      context: Context,
+      assets: AssetManager,
       attributedString: ReadableMapBuffer,
       paragraphAttributes: ReadableMapBuffer,
       width: Float,
@@ -935,7 +895,7 @@ internal object TextLayoutManager {
     val reactTags = IntArray(fragments.count)
     val text =
         createSpannableFromAttributedString(
-            context,
+            assets,
             fragments,
             reactTextViewManagerCallback,
             reactTags,
@@ -945,7 +905,7 @@ internal object TextLayoutManager {
     val result =
         createLayout(
             text,
-            newPaintWithAttributes(baseTextAttributes, context),
+            newPaintWithAttributes(baseTextAttributes, assets),
             attributedString,
             paragraphAttributes,
             width,
@@ -1085,7 +1045,7 @@ internal object TextLayoutManager {
 
   @JvmStatic
   fun measureText(
-      context: Context,
+      assets: AssetManager,
       attributedString: MapBuffer,
       paragraphAttributes: MapBuffer,
       width: Float,
@@ -1098,7 +1058,7 @@ internal object TextLayoutManager {
     // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
     val layout =
         createLayoutForMeasurement(
-            context,
+            assets,
             attributedString,
             paragraphAttributes,
             width,
@@ -1355,7 +1315,7 @@ internal object TextLayoutManager {
 
   @JvmStatic
   fun measureLines(
-      context: Context,
+      assetManager: AssetManager,
       attributedString: MapBuffer,
       paragraphAttributes: MapBuffer,
       width: Float,
@@ -1364,7 +1324,7 @@ internal object TextLayoutManager {
   ): WritableArray {
     val layout =
         createLayoutForMeasurement(
-            context,
+            assetManager,
             attributedString,
             paragraphAttributes,
             width,
@@ -1373,17 +1333,31 @@ internal object TextLayoutManager {
             YogaMeasureMode.EXACTLY,
             reactTextViewManagerCallback,
         )
-    return FontMetricsUtil.getFontMetrics(layout.text, layout, context)
+    return FontMetricsUtil.getFontMetrics(
+        layout.text,
+        layout,
+        DisplayMetricsHolder.getWindowDisplayMetrics(),
+    )
   }
 
-  private fun isBoring(text: Spannable, paint: TextPaint): BoringLayout.Metrics? =
-      if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
-        BoringLayout.isBoring(text, paint)
-      } else {
-        // Default to include fallback line spacing on Android 13+, like TextView
-        // https://cs.android.com/android/_/android/platform/frameworks/base/+/78c774defb238c05c42b34a12b6b3b0c64844ed7
-        BoringLayout.isBoring(text, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR, true, null)
-      }
+  private fun isBoring(text: Spannable, paint: TextPaint): BoringLayout.Metrics? {
+    val metrics =
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+          BoringLayout.isBoring(text, paint)
+        } else {
+          // Default to include fallback line spacing on Android 13+, like TextView
+          // https://cs.android.com/android/_/android/platform/frameworks/base/+/78c774defb238c05c42b34a12b6b3b0c64844ed7
+          BoringLayout.isBoring(text, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR, true, null)
+        }
+
+    // BoringLayout.isBoring() sometimes thinks text width is negative for some strings, even on
+    // Android 15+. Fallback to StaticLayout.
+    if (metrics == null || metrics.width < 0) {
+      return null
+    }
+
+    return metrics
+  }
 
   private class CreateLayoutResult(
       val layout: Layout,

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/CustomStyleSpan.kt

@@ -14,7 +14,6 @@ import android.text.TextPaint
 import android.text.style.MetricAffectingSpan
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.common.assets.ReactFontManager
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.views.text.ReactTypefaceUtils
 
 /**
@@ -74,9 +73,7 @@ internal class CustomStyleSpan(
         fontFeatureSettings = fontFeatureSettingsParam
         setTypeface(typeface)
         isSubpixelText = true
-        if (ReactNativeFeatureFlags.enableAndroidLinearText()) {
-          isLinearText = true
-        }
+        isLinearText = true
       }
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/text/internal/span/DrawCommandSpan.kt

@@ -12,7 +12,7 @@ import android.text.Layout
 import android.text.style.UpdateAppearance
 
 /**
- * May be overriden to implement charater styles which are applied by [PreparedLayoutTextView]
+ * May be overridden to implement character styles which are applied by [PreparedLayoutTextView]
  * during the drawing of text, against the underlying Android canvas
  */
 public abstract class DrawCommandSpan : UpdateAppearance, ReactSpan {

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.kt

@@ -62,8 +62,6 @@ import com.facebook.react.uimanager.PixelUtil.toDIPFromPixel
 import com.facebook.react.uimanager.ReactAccessibilityDelegate
 import com.facebook.react.uimanager.StateWrapper
 import com.facebook.react.uimanager.UIManagerHelper
-import com.facebook.react.uimanager.common.UIManagerType
-import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.uimanager.style.BorderRadiusProp
 import com.facebook.react.uimanager.style.BorderStyle
@@ -117,6 +115,7 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
   private var listeners: CopyOnWriteArrayList<TextWatcher>?
 
   public var stagedInputType: Int
+  internal var stagedAutoCapitalize: Int = 0
   public var submitBehavior: String? = null
   public var dragAndDropFilter: List<String>? = null
 
@@ -655,14 +654,12 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
           paintFlags and Paint.SUBPIXEL_TEXT_FLAG.inv()
         }
 
-    if (ReactNativeFeatureFlags.enableAndroidLinearText()) {
-      paintFlags =
-          if (enableSubpixelText) {
-            paintFlags or Paint.LINEAR_TEXT_FLAG
-          } else {
-            paintFlags and Paint.LINEAR_TEXT_FLAG.inv()
-          }
-    }
+    paintFlags =
+        if (enableSubpixelText) {
+          paintFlags or Paint.LINEAR_TEXT_FLAG
+        } else {
+          paintFlags and Paint.LINEAR_TEXT_FLAG.inv()
+        }
   }
 
   public fun requestFocusFromJS() {
@@ -1159,9 +1156,6 @@ public open class ReactEditText public constructor(context: Context) : AppCompat
     if (!haveText) {
       if (hint != null && hint.isNotEmpty()) {
         sb.append(hint)
-      } else if (getUIManagerType(this) != UIManagerType.FABRIC) {
-        // Measure something so we have correct height, even if there's no string.
-        sb.append("I")
       }
     }
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.kt

@@ -718,7 +718,9 @@ public open class ReactTextInputManager public constructor() :
       }
     }
 
-    updateStagedInputTypeFlag(view, AUTOCAPITALIZE_FLAGS, autoCapitalizeValue)
+    // Deferred to onAfterUpdateTransaction() so we can reconcile with the resolved
+    // keyboard type — AUTOCAPITALIZE_FLAGS collides with numeric inputType flags.
+    view.stagedAutoCapitalize = autoCapitalizeValue
   }
 
   @ReactProp(name = "keyboardType")
@@ -882,6 +884,7 @@ public open class ReactTextInputManager public constructor() :
   override fun onAfterUpdateTransaction(view: ReactEditText) {
     super.onAfterUpdateTransaction(view)
     view.maybeUpdateTypeface()
+    reconcileAutoCapitalize(view)
     view.commitStagedInputType()
   }
 
@@ -1017,7 +1020,7 @@ public open class ReactTextInputManager public constructor() :
 
     val spanned =
         TextLayoutManager.getOrCreateSpannableForText(
-            view.context,
+            view.context.assets,
             attributedString,
             reactTextViewManagerCallback,
         )
@@ -1058,6 +1061,7 @@ public open class ReactTextInputManager public constructor() :
 
     private val REACT_PROPS_AUTOFILL_HINTS_MAP: Map<String, String> =
         mapOf(
+            "2fa-app-otp" to HintConstants.AUTOFILL_HINT_2FA_APP_OTP,
             "birthdate-day" to HintConstants.AUTOFILL_HINT_BIRTH_DATE_DAY,
             "birthdate-full" to HintConstants.AUTOFILL_HINT_BIRTH_DATE_FULL,
             "birthdate-month" to HintConstants.AUTOFILL_HINT_BIRTH_DATE_MONTH,
@@ -1069,7 +1073,13 @@ public open class ReactTextInputManager public constructor() :
             "cc-exp-year" to HintConstants.AUTOFILL_HINT_CREDIT_CARD_EXPIRATION_YEAR,
             "cc-number" to HintConstants.AUTOFILL_HINT_CREDIT_CARD_NUMBER,
             "email" to HintConstants.AUTOFILL_HINT_EMAIL_ADDRESS,
+            "email-otp" to HintConstants.AUTOFILL_HINT_EMAIL_OTP,
+            "flight-confirmation-code" to HintConstants.AUTOFILL_HINT_FLIGHT_CONFIRMATION_CODE,
+            "flight-number" to HintConstants.AUTOFILL_HINT_FLIGHT_NUMBER,
             "gender" to HintConstants.AUTOFILL_HINT_GENDER,
+            "gift-card-number" to HintConstants.AUTOFILL_HINT_GIFT_CARD_NUMBER,
+            "gift-card-pin" to HintConstants.AUTOFILL_HINT_GIFT_CARD_PIN,
+            "loyalty-account-number" to HintConstants.AUTOFILL_HINT_LOYALTY_ACCOUNT_NUMBER,
             "name" to HintConstants.AUTOFILL_HINT_PERSON_NAME,
             "name-family" to HintConstants.AUTOFILL_HINT_PERSON_NAME_FAMILY,
             "name-given" to HintConstants.AUTOFILL_HINT_PERSON_NAME_GIVEN,
@@ -1081,19 +1091,25 @@ public open class ReactTextInputManager public constructor() :
             "password-new" to HintConstants.AUTOFILL_HINT_NEW_PASSWORD,
             "postal-address" to HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS,
             "postal-address-country" to HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_COUNTRY,
+            "postal-address-dependent-locality" to
+                HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_DEPENDENT_LOCALITY,
             "postal-address-extended" to
                 HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_ADDRESS,
             "postal-address-extended-postal-code" to
                 HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_EXTENDED_POSTAL_CODE,
             "postal-address-locality" to HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_LOCALITY,
             "postal-address-region" to HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_REGION,
+            "postal-address-unit" to HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_APT_NUMBER,
             "postal-code" to HintConstants.AUTOFILL_HINT_POSTAL_CODE,
+            "promo-code" to HintConstants.AUTOFILL_HINT_PROMO_CODE,
             "street-address" to HintConstants.AUTOFILL_HINT_POSTAL_ADDRESS_STREET_ADDRESS,
             "sms-otp" to HintConstants.AUTOFILL_HINT_SMS_OTP,
             "tel" to HintConstants.AUTOFILL_HINT_PHONE_NUMBER,
             "tel-country-code" to HintConstants.AUTOFILL_HINT_PHONE_COUNTRY_CODE,
             "tel-national" to HintConstants.AUTOFILL_HINT_PHONE_NATIONAL,
             "tel-device" to HintConstants.AUTOFILL_HINT_PHONE_NUMBER_DEVICE,
+            "upi-vpa" to HintConstants.AUTOFILL_HINT_UPI_VPA,
+            "wifi-password" to HintConstants.AUTOFILL_HINT_WIFI_PASSWORD,
             "username" to HintConstants.AUTOFILL_HINT_USERNAME,
             "username-new" to HintConstants.AUTOFILL_HINT_NEW_USERNAME,
         )
@@ -1134,6 +1150,28 @@ public open class ReactTextInputManager public constructor() :
 
     private const val IME_ACTION_ID = 0x670
 
+    // AUTOCAPITALIZE_FLAGS (0x7000) shares bit positions with TYPE_NUMBER_FLAG_SIGNED
+    // (0x1000) and TYPE_NUMBER_FLAG_DECIMAL (0x2000). We apply autocapitalize here
+    // after all props are set so the resolved input class determines whether the
+    // flags are meaningful.
+    private fun reconcileAutoCapitalize(view: ReactEditText) {
+      val autoCapValue = view.stagedAutoCapitalize
+      val inputClass = view.stagedInputType and InputType.TYPE_MASK_CLASS
+
+      // Only strip 0x4000 (CAP_SENTENCES) for non-text classes — 0x1000/0x2000 are
+      // valid numeric flags (SIGNED/DECIMAL) and must not be cleared.
+      val reconciled =
+          if (inputClass == InputType.TYPE_CLASS_TEXT) {
+            (view.stagedInputType and AUTOCAPITALIZE_FLAGS.inv()) or autoCapValue
+          } else {
+            view.stagedInputType and InputType.TYPE_TEXT_FLAG_CAP_SENTENCES.inv()
+          }
+
+      if (view.stagedInputType != reconciled) {
+        view.stagedInputType = reconciled
+      }
+    }
+
     // Sets the correct password type, since numeric and text passwords have different types
     private fun checkPasswordType(view: ReactEditText) {
       if (

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactDrawableHelper.kt

@@ -15,10 +15,16 @@ import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.RippleDrawable
 import android.util.TypedValue
+import com.facebook.common.logging.FLog
+import com.facebook.react.bridge.ColorPropConverter
+import com.facebook.react.bridge.JSApplicationCausedNativeException
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException
 import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.bridge.ReadableType
+import com.facebook.react.common.ReactConstants
 import com.facebook.react.uimanager.PixelUtil
 import com.facebook.react.uimanager.ViewProps
+import kotlin.math.roundToInt
 
 /**
  * Utility class that helps with converting android drawable description used in JS to an actual
@@ -73,11 +79,21 @@ public object ReactDrawableHelper {
       context: Context,
       drawableDescriptionDict: ReadableMap,
   ): RippleDrawable {
-    val color = getColor(context, drawableDescriptionDict)
-    val mask = getMask(drawableDescriptionDict)
-    val colorStateList = ColorStateList(arrayOf(intArrayOf()), intArrayOf(color))
+    val resolvedColor = getColor(context, drawableDescriptionDict)
+    var color = resolvedColor ?: getFallbackColor(context)
+
+    if (
+        resolvedColor != null &&
+            drawableDescriptionDict.hasKey("alpha") &&
+            !drawableDescriptionDict.isNull("alpha")
+    ) {
+      val alphaFactor = drawableDescriptionDict.getDouble("alpha").coerceIn(0.0, 1.0)
+      val newAlpha = (Color.alpha(color) * alphaFactor).roundToInt()
+      color = Color.argb(newAlpha, Color.red(color), Color.green(color), Color.blue(color))
+    }
 
-    return RippleDrawable(colorStateList, null, mask)
+    val mask = getMask(drawableDescriptionDict)
+    return RippleDrawable(ColorStateList(arrayOf(intArrayOf()), intArrayOf(color)), null, mask)
   }
 
   private fun setRadius(drawableDescriptionDict: ReadableMap, drawable: Drawable?): Drawable? {
@@ -88,26 +104,49 @@ public object ReactDrawableHelper {
     return drawable
   }
 
-  private fun getColor(context: Context, drawableDescriptionDict: ReadableMap): Int =
-      if (
-          drawableDescriptionDict.hasKey(ViewProps.COLOR) &&
-              !drawableDescriptionDict.isNull(ViewProps.COLOR)
-      ) {
-        drawableDescriptionDict.getInt(ViewProps.COLOR)
-      } else {
+  /**
+   * Returns the resolved ripple color, or null if none was provided or the PlatformColor resource
+   * couldn't be found.
+   */
+  private fun getColor(context: Context, drawableDescriptionDict: ReadableMap): Int? {
+    val rawColor: Any? =
         if (
-            context.theme.resolveAttribute(
-                android.R.attr.colorControlHighlight,
-                resolveOutValue,
-                true,
-            )
+            drawableDescriptionDict.hasKey(ViewProps.COLOR) &&
+                !drawableDescriptionDict.isNull(ViewProps.COLOR)
         ) {
-          context.resources.getColor(resolveOutValue.resourceId, context.theme)
+          when (drawableDescriptionDict.getType(ViewProps.COLOR)) {
+            ReadableType.Number -> drawableDescriptionDict.getDouble(ViewProps.COLOR)
+            ReadableType.Map -> drawableDescriptionDict.getMap(ViewProps.COLOR)
+            else -> null
+          }
         } else {
-          throw JSApplicationIllegalArgumentException(
-              "Attribute colorControlHighlight couldn't be resolved into a drawable"
-          )
+          null
         }
+    return try {
+      ColorPropConverter.getColor(rawColor, context)
+    } catch (e: JSApplicationCausedNativeException) {
+      FLog.w(
+          ReactConstants.TAG,
+          e,
+          "android_ripple: color resource not found, using colorControlHighlight",
+      )
+      null
+    }
+  }
+
+  private fun getFallbackColor(context: Context): Int =
+      if (
+          context.theme.resolveAttribute(
+              android.R.attr.colorControlHighlight,
+              resolveOutValue,
+              true,
+          )
+      ) {
+        context.resources.getColor(resolveOutValue.resourceId, context.theme)
+      } else {
+        throw JSApplicationIllegalArgumentException(
+            "Attribute colorControlHighlight couldn't be resolved into a drawable"
+        )
       }
 
   private fun getMask(drawableDescriptionDict: ReadableMap): Drawable? {