react-native-tvos 0.82.1-0 → 0.83.0-0

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BackgroundStyleApplicator.kt

@@ -19,14 +19,13 @@ import android.widget.ImageView
 import androidx.annotation.ColorInt
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.PixelUtil.pxToDp
 import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.common.ViewUtil
 import com.facebook.react.uimanager.drawable.BackgroundDrawable
+import com.facebook.react.uimanager.drawable.BackgroundImageDrawable
 import com.facebook.react.uimanager.drawable.BorderDrawable
-import com.facebook.react.uimanager.drawable.CSSBackgroundDrawable
 import com.facebook.react.uimanager.drawable.CompositeBackgroundDrawable
 import com.facebook.react.uimanager.drawable.InsetBoxShadowDrawable
 import com.facebook.react.uimanager.drawable.MIN_INSET_BOX_SHADOW_SDK_VERSION
@@ -34,6 +33,9 @@ import com.facebook.react.uimanager.drawable.MIN_OUTSET_BOX_SHADOW_SDK_VERSION
 import com.facebook.react.uimanager.drawable.OutlineDrawable
 import com.facebook.react.uimanager.drawable.OutsetBoxShadowDrawable
 import com.facebook.react.uimanager.style.BackgroundImageLayer
+import com.facebook.react.uimanager.style.BackgroundPosition
+import com.facebook.react.uimanager.style.BackgroundRepeat
+import com.facebook.react.uimanager.style.BackgroundSize
 import com.facebook.react.uimanager.style.BorderInsets
 import com.facebook.react.uimanager.style.BorderRadiusProp
 import com.facebook.react.uimanager.style.BorderRadiusStyle
@@ -43,12 +45,22 @@ import com.facebook.react.uimanager.style.LogicalEdge
 import com.facebook.react.uimanager.style.OutlineStyle
 
 /**
- * BackgroundStyleApplicator is responsible for applying backgrounds, borders, and related effects,
- * to an Android view
+ * Utility object responsible for applying backgrounds, borders, and related visual effects to
+ * Android views.
+ *
+ * This object provides methods to manage background colors, images, borders, outlines, and box
+ * shadows for React Native views. It handles the complex layering and composition of these visual
+ * properties by managing [CompositeBackgroundDrawable] instances.
  */
 @OptIn(UnstableReactNativeAPI::class)
 public object BackgroundStyleApplicator {
 
+  /**
+   * Sets the background color of the view.
+   *
+   * @param view The view to apply the background color to
+   * @param color The color to set, or null to remove the background color
+   */
   @JvmStatic
   public fun setBackgroundColor(view: View, @ColorInt color: Int?): Unit {
     // No color to set, and no color already set
@@ -59,51 +71,74 @@ public object BackgroundStyleApplicator {
       return
     }
 
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      ensureBackgroundDrawable(view).backgroundColor = color ?: Color.TRANSPARENT
-    } else {
-      ensureCSSBackground(view).color = color ?: Color.TRANSPARENT
-    }
+    ensureBackgroundDrawable(view).backgroundColor = color ?: Color.TRANSPARENT
   }
 
+  /**
+   * Sets the background image layers for the view.
+   *
+   * @param view The view to apply the background images to
+   * @param backgroundImageLayers The list of background image layers to apply, or null to remove
+   */
   @JvmStatic
   public fun setBackgroundImage(
       view: View,
       backgroundImageLayers: List<BackgroundImageLayer>?,
   ): Unit {
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      ensureBackgroundDrawable(view).backgroundImageLayers = backgroundImageLayers
-    } else {
-      ensureCSSBackground(view).setBackgroundImage(backgroundImageLayers)
-    }
+    ensureBackgroundImageDrawable(view).backgroundImageLayers = backgroundImageLayers
+  }
+
+  @JvmStatic
+  internal fun setBackgroundSize(view: View, backgroundSizes: List<BackgroundSize>?): Unit {
+    ensureBackgroundImageDrawable(view).backgroundSize = backgroundSizes
   }
 
+  @JvmStatic
+  internal fun setBackgroundPosition(
+      view: View,
+      backgroundPositions: List<BackgroundPosition>?,
+  ): Unit {
+    ensureBackgroundImageDrawable(view).backgroundPosition = backgroundPositions
+  }
+
+  @JvmStatic
+  internal fun setBackgroundRepeat(view: View, backgroundRepeats: List<BackgroundRepeat>?): Unit {
+    ensureBackgroundImageDrawable(view).backgroundRepeat = backgroundRepeats
+  }
+
+  /**
+   * Gets the background color of the view.
+   *
+   * @param view The view to get the background color from
+   * @return The background color, or null if no background color is set
+   */
   @JvmStatic
   @ColorInt
   public fun getBackgroundColor(view: View): Int? {
-    return if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      getBackground(view)?.backgroundColor
-    } else {
-      getCSSBackground(view)?.color
-    }
+    return getBackground(view)?.backgroundColor
   }
 
+  /**
+   * Sets the border width for a specific edge of the view.
+   *
+   * @param view The view to apply the border width to
+   * @param edge The logical edge (start, end, top, bottom, etc.) to set the width for
+   * @param width The border width in DIPs, or null to remove
+   */
   @JvmStatic
   public fun setBorderWidth(view: View, edge: LogicalEdge, width: Float?): Unit {
     val composite = ensureCompositeBackgroundDrawable(view)
     composite.borderInsets = composite.borderInsets ?: BorderInsets()
     composite.borderInsets?.setBorderWidth(edge, width)
 
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      ensureBorderDrawable(view).setBorderWidth(edge.toSpacingType(), width?.dpToPx() ?: Float.NaN)
-      composite.background?.borderInsets = composite.borderInsets
-      composite.border?.borderInsets = composite.borderInsets
+    ensureBorderDrawable(view).setBorderWidth(edge.toSpacingType(), width?.dpToPx() ?: Float.NaN)
+    composite.background?.borderInsets = composite.borderInsets
+    composite.backgroundImage?.borderInsets = composite.borderInsets
+    composite.border?.borderInsets = composite.borderInsets
 
-      composite.background?.invalidateSelf()
-      composite.border?.invalidateSelf()
-    } else {
-      ensureCSSBackground(view).setBorderWidth(edge.toSpacingType(), width?.dpToPx() ?: Float.NaN)
-    }
+    composite.background?.invalidateSelf()
+    composite.backgroundImage?.invalidateSelf()
+    composite.border?.invalidateSelf()
 
     composite.borderInsets = composite.borderInsets ?: BorderInsets()
     composite.borderInsets?.setBorderWidth(edge, width)
@@ -115,36 +150,55 @@ public object BackgroundStyleApplicator {
     }
   }
 
+  /**
+   * Gets the border width for a specific edge of the view.
+   *
+   * @param view The view to get the border width from
+   * @param edge The logical edge to get the width for
+   * @return The border width in DIPs, or null if not set
+   */
   @JvmStatic
   public fun getBorderWidth(view: View, edge: LogicalEdge): Float? {
-    return if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      val width = getBorder(view)?.borderWidth?.getRaw(edge.toSpacingType())
-      if (width == null || width.isNaN()) null else width.pxToDp()
+    val width = getBorder(view)?.borderWidth?.getRaw(edge.toSpacingType())
+    if (width == null || width.isNaN()) {
+      return null
     } else {
-      val width = getCSSBackground(view)?.getBorderWidth(edge.toSpacingType())
-      if (width == null || width.isNaN()) null else width.pxToDp()
+      return width.pxToDp()
     }
   }
 
+  /**
+   * Sets the border color for a specific edge of the view.
+   *
+   * @param view The view to apply the border color to
+   * @param edge The logical edge to set the color for
+   * @param color The border color, or null to remove
+   */
   @JvmStatic
   public fun setBorderColor(view: View, edge: LogicalEdge, @ColorInt color: Int?): Unit {
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      ensureBorderDrawable(view).setBorderColor(edge, color)
-    } else {
-      ensureCSSBackground(view).setBorderColor(edge.toSpacingType(), color)
-    }
+    ensureBorderDrawable(view).setBorderColor(edge, color)
   }
 
+  /**
+   * Gets the border color for a specific edge of the view.
+   *
+   * @param view The view to get the border color from
+   * @param edge The logical edge to get the color for
+   * @return The border color, or null if not set
+   */
   @JvmStatic
   @ColorInt
   public fun getBorderColor(view: View, edge: LogicalEdge): Int? {
-    return if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      getBorder(view)?.getBorderColor(edge)
-    } else {
-      getCSSBackground(view)?.getBorderColor(edge.toSpacingType())
-    }
+    return getBorder(view)?.getBorderColor(edge)
   }
 
+  /**
+   * Sets the border radius for a specific corner of the view.
+   *
+   * @param view The view to apply the border radius to
+   * @param corner The corner property to set the radius for
+   * @param radius The border radius value (length or percentage), or null to remove
+   */
   @JvmStatic
   public fun setBorderRadius(
       view: View,
@@ -156,19 +210,17 @@ public object BackgroundStyleApplicator {
         compositeBackgroundDrawable.borderRadius ?: BorderRadiusStyle()
     compositeBackgroundDrawable.borderRadius?.set(corner, radius)
 
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      if (view is ImageView) {
-        ensureBackgroundDrawable(view)
-      }
-      compositeBackgroundDrawable.background?.borderRadius =
-          compositeBackgroundDrawable.borderRadius
-      compositeBackgroundDrawable.border?.borderRadius = compositeBackgroundDrawable.borderRadius
-
-      compositeBackgroundDrawable.background?.invalidateSelf()
-      compositeBackgroundDrawable.border?.invalidateSelf()
-    } else {
-      ensureCSSBackground(view).setBorderRadius(corner, radius)
+    if (view is ImageView) {
+      ensureBackgroundDrawable(view)
     }
+    compositeBackgroundDrawable.background?.borderRadius = compositeBackgroundDrawable.borderRadius
+    compositeBackgroundDrawable.backgroundImage?.borderRadius =
+        compositeBackgroundDrawable.borderRadius
+    compositeBackgroundDrawable.border?.borderRadius = compositeBackgroundDrawable.borderRadius
+
+    compositeBackgroundDrawable.background?.invalidateSelf()
+    compositeBackgroundDrawable.backgroundImage?.invalidateSelf()
+    compositeBackgroundDrawable.border?.invalidateSelf()
 
     if (Build.VERSION.SDK_INT >= MIN_OUTSET_BOX_SHADOW_SDK_VERSION) {
       for (shadow in
@@ -188,34 +240,47 @@ public object BackgroundStyleApplicator {
     compositeBackgroundDrawable.invalidateSelf()
   }
 
+  /**
+   * Gets the border radius for a specific corner of the view.
+   *
+   * @param view The view to get the border radius from
+   * @param corner The corner property to get the radius for
+   * @return The border radius value, or null if not set
+   */
   @JvmStatic
   public fun getBorderRadius(view: View, corner: BorderRadiusProp): LengthPercentage? {
 
-    return if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      getCompositeBackgroundDrawable(view)?.borderRadius?.get(corner)
-    } else {
-      getCSSBackground(view)?.borderRadius?.get(corner)
-    }
+    return getCompositeBackgroundDrawable(view)?.borderRadius?.get(corner)
   }
 
+  /**
+   * Sets the border style for the view.
+   *
+   * @param view The view to apply the border style to
+   * @param borderStyle The border style (solid, dashed, dotted), or null to remove
+   */
   @JvmStatic
   public fun setBorderStyle(view: View, borderStyle: BorderStyle?) {
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      ensureBorderDrawable(view).borderStyle = borderStyle
-    } else {
-      ensureCSSBackground(view).borderStyle = borderStyle
-    }
+    ensureBorderDrawable(view).borderStyle = borderStyle
   }
 
+  /**
+   * Gets the border style of the view.
+   *
+   * @param view The view to get the border style from
+   * @return The border style, or null if not set
+   */
   @JvmStatic
   public fun getBorderStyle(view: View): BorderStyle? {
-    return if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      getBorder(view)?.borderStyle
-    } else {
-      getCSSBackground(view)?.borderStyle
-    }
+    return getBorder(view)?.borderStyle
   }
 
+  /**
+   * Sets the outline color for the view (Fabric only).
+   *
+   * @param view The view to apply the outline color to
+   * @param outlineColor The outline color, or null to remove
+   */
   @JvmStatic
   public fun setOutlineColor(view: View, @ColorInt outlineColor: Int?) {
     if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
@@ -228,8 +293,20 @@ public object BackgroundStyleApplicator {
     }
   }
 
+  /**
+   * Gets the outline color of the view.
+   *
+   * @param view The view to get the outline color from
+   * @return The outline color, or null if not set
+   */
   @JvmStatic public fun getOutlineColor(view: View): Int? = getOutlineDrawable(view)?.outlineColor
 
+  /**
+   * Sets the outline offset for the view (Fabric only).
+   *
+   * @param view The view to apply the outline offset to
+   * @param outlineOffset The outline offset in DIPs
+   */
   @JvmStatic
   public fun setOutlineOffset(view: View, outlineOffset: Float): Unit {
     if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
@@ -240,8 +317,20 @@ public object BackgroundStyleApplicator {
     outline.outlineOffset = outlineOffset.dpToPx()
   }
 
+  /**
+   * Gets the outline offset of the view.
+   *
+   * @param view The view to get the outline offset from
+   * @return The outline offset in pixels, or null if not set
+   */
   public fun getOutlineOffset(view: View): Float? = getOutlineDrawable(view)?.outlineOffset
 
+  /**
+   * Sets the outline style for the view (Fabric only).
+   *
+   * @param view The view to apply the outline style to
+   * @param outlineStyle The outline style (solid, dashed, dotted), or null to remove
+   */
   @JvmStatic
   public fun setOutlineStyle(view: View, outlineStyle: OutlineStyle?): Unit {
     if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
@@ -254,8 +343,20 @@ public object BackgroundStyleApplicator {
     }
   }
 
+  /**
+   * Gets the outline style of the view.
+   *
+   * @param view The view to get the outline style from
+   * @return The outline style, or null if not set
+   */
   public fun getOutlineStyle(view: View): OutlineStyle? = getOutlineDrawable(view)?.outlineStyle
 
+  /**
+   * Sets the outline width for the view (Fabric only).
+   *
+   * @param view The view to apply the outline width to
+   * @param width The outline width in DIPs
+   */
   @JvmStatic
   public fun setOutlineWidth(view: View, width: Float) {
     if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
@@ -266,8 +367,20 @@ public object BackgroundStyleApplicator {
     outline.outlineWidth = width.dpToPx()
   }
 
+  /**
+   * Gets the outline width of the view.
+   *
+   * @param view The view to get the outline width from
+   * @return The outline width in pixels, or null if not set
+   */
   public fun getOutlineWidth(view: View): Float? = getOutlineDrawable(view)?.outlineOffset
 
+  /**
+   * Sets box shadows for the view (Fabric only).
+   *
+   * @param view The view to apply box shadows to
+   * @param shadows The list of box shadow styles to apply
+   */
   @JvmStatic
   public fun setBoxShadow(view: View, shadows: List<BoxShadow>) {
     if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
@@ -326,6 +439,12 @@ public object BackgroundStyleApplicator {
             .withNewShadows(outerShadows = outerShadows, innerShadows = innerShadows)
   }
 
+  /**
+   * Sets box shadows for the view from a ReadableArray (Fabric only).
+   *
+   * @param view The view to apply box shadows to
+   * @param shadows The array of box shadow definitions, or null to remove all shadows
+   */
   @JvmStatic
   public fun setBoxShadow(view: View, shadows: ReadableArray?) {
     if (shadows == null) {
@@ -340,76 +459,71 @@ public object BackgroundStyleApplicator {
     BackgroundStyleApplicator.setBoxShadow(view, shadowStyles)
   }
 
+  /**
+   * Sets a feedback underlay drawable for the view.
+   *
+   * @param view The view to apply the feedback underlay to
+   * @param drawable The drawable to use as feedback underlay, or null to remove
+   */
   @JvmStatic
   public fun setFeedbackUnderlay(view: View, drawable: Drawable?) {
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-
-      ensureCompositeBackgroundDrawable(view).withNewFeedbackUnderlay(drawable)
-    } else {
-      view.background = ensureCompositeBackgroundDrawable(view).withNewFeedbackUnderlay(drawable)
-    }
+    ensureCompositeBackgroundDrawable(view).withNewFeedbackUnderlay(drawable)
   }
 
+  /**
+   * Clips the canvas to the padding box of the view.
+   *
+   * The padding box is the area within the borders of the view, accounting for border radius if
+   * present.
+   *
+   * @param view The view whose padding box defines the clipping region
+   * @param canvas The canvas to clip
+   */
   @JvmStatic
   public fun clipToPaddingBox(view: View, canvas: Canvas) {
-    if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-      val drawingRect = Rect()
-      view.getDrawingRect(drawingRect)
-
-      val composite = getCompositeBackgroundDrawable(view)
-      if (composite == null) {
-        canvas.clipRect(drawingRect)
-        return
-      }
-
-      val paddingBoxRect = RectF()
+    val drawingRect = Rect()
+    view.getDrawingRect(drawingRect)
 
-      val computedBorderInsets =
-          composite.borderInsets?.resolve(composite.layoutDirection, view.context)
+    val composite = getCompositeBackgroundDrawable(view)
+    if (composite == null) {
+      canvas.clipRect(drawingRect)
+      return
+    }
 
-      paddingBoxRect.left = composite.bounds.left + (computedBorderInsets?.left?.dpToPx() ?: 0f)
-      paddingBoxRect.top = composite.bounds.top + (computedBorderInsets?.top?.dpToPx() ?: 0f)
-      paddingBoxRect.right = composite.bounds.right - (computedBorderInsets?.right?.dpToPx() ?: 0f)
-      paddingBoxRect.bottom =
-          composite.bounds.bottom - (computedBorderInsets?.bottom?.dpToPx() ?: 0f)
+    val paddingBoxRect = RectF()
 
-      if (composite.borderRadius?.hasRoundedBorders() == true) {
-        val paddingBoxPath =
-            createPaddingBoxPath(
-                view,
-                composite,
-                paddingBoxRect,
-                computedBorderInsets,
-            )
+    val computedBorderInsets =
+        composite.borderInsets?.resolve(composite.layoutDirection, view.context)
 
-        paddingBoxPath.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
-        canvas.clipPath(paddingBoxPath)
-      } else {
-        paddingBoxRect.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
-        canvas.clipRect(paddingBoxRect)
-      }
-    } else {
-      val drawingRect = Rect()
-      view.getDrawingRect(drawingRect)
+    paddingBoxRect.left = composite.bounds.left + (computedBorderInsets?.left?.dpToPx() ?: 0f)
+    paddingBoxRect.top = composite.bounds.top + (computedBorderInsets?.top?.dpToPx() ?: 0f)
+    paddingBoxRect.right = composite.bounds.right - (computedBorderInsets?.right?.dpToPx() ?: 0f)
+    paddingBoxRect.bottom = composite.bounds.bottom - (computedBorderInsets?.bottom?.dpToPx() ?: 0f)
 
-      val cssBackground = getCSSBackground(view)
-      if (cssBackground == null) {
-        canvas.clipRect(drawingRect)
-        return
-      }
+    if (composite.borderRadius?.hasRoundedBorders() == true) {
+      val paddingBoxPath =
+          createPaddingBoxPath(
+              view,
+              composite,
+              paddingBoxRect,
+              computedBorderInsets,
+          )
 
-      val paddingBoxPath = cssBackground.paddingBoxPath
-      if (paddingBoxPath != null) {
-        paddingBoxPath.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
-        canvas.clipPath(paddingBoxPath)
-      } else {
-        val paddingBoxRect = cssBackground.paddingBoxRect
-        paddingBoxRect.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
-        canvas.clipRect(paddingBoxRect)
-      }
+      paddingBoxPath.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
+      canvas.clipPath(paddingBoxPath)
+    } else {
+      paddingBoxRect.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
+      canvas.clipRect(paddingBoxRect)
     }
   }
 
+  /**
+   * Resets the background styling of the view to its original state.
+   *
+   * This removes any CompositeBackgroundDrawable and restores the original background.
+   *
+   * @param view The view to reset
+   */
   @JvmStatic
   public fun reset(view: View) {
     if (view.background is CompositeBackgroundDrawable) {
@@ -431,19 +545,6 @@ public object BackgroundStyleApplicator {
   private fun getCompositeBackgroundDrawable(view: View): CompositeBackgroundDrawable? =
       view.background as? CompositeBackgroundDrawable
 
-  private fun ensureCSSBackground(view: View): CSSBackgroundDrawable {
-    val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
-    var cssBackground = compositeBackgroundDrawable.cssBackground
-
-    return if (cssBackground != null) {
-      return cssBackground
-    } else {
-      cssBackground = CSSBackgroundDrawable(view.context)
-      view.background = compositeBackgroundDrawable.withNewCssBackground(cssBackground)
-      cssBackground
-    }
-  }
-
   private fun ensureBackgroundDrawable(view: View): BackgroundDrawable {
     val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
     var background = compositeBackgroundDrawable.background
@@ -462,12 +563,30 @@ public object BackgroundStyleApplicator {
     }
   }
 
-  private fun getCSSBackground(view: View): CSSBackgroundDrawable? =
-      getCompositeBackgroundDrawable(view)?.cssBackground
-
   private fun getBackground(view: View): BackgroundDrawable? =
       getCompositeBackgroundDrawable(view)?.background
 
+  private fun ensureBackgroundImageDrawable(view: View): BackgroundImageDrawable {
+    val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
+    var backgroundImage = compositeBackgroundDrawable.backgroundImage
+
+    return if (backgroundImage != null) {
+      backgroundImage
+    } else {
+      backgroundImage =
+          BackgroundImageDrawable(
+              view.context,
+              compositeBackgroundDrawable.borderRadius,
+              compositeBackgroundDrawable.borderInsets,
+          )
+      view.background = compositeBackgroundDrawable.withNewBackgroundImage(backgroundImage)
+      backgroundImage
+    }
+  }
+
+  private fun getBackgroundImage(view: View): BackgroundImageDrawable? =
+      getCompositeBackgroundDrawable(view)?.backgroundImage
+
   private fun getBorder(view: View): BorderDrawable? = getCompositeBackgroundDrawable(view)?.border
 
   private fun ensureBorderDrawable(view: View): BorderDrawable {
@@ -492,12 +611,7 @@ public object BackgroundStyleApplicator {
     val compositeBackgroundDrawable = ensureCompositeBackgroundDrawable(view)
     var outline = compositeBackgroundDrawable.outline
     if (outline == null) {
-      val borderRadius =
-          if (ReactNativeFeatureFlags.enableNewBackgroundAndBorderDrawables()) {
-            compositeBackgroundDrawable.borderRadius
-          } else {
-            ensureCSSBackground(view).borderRadius
-          }
+      val borderRadius = compositeBackgroundDrawable.borderRadius
 
       outline =
           OutlineDrawable(

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BlendModeHelper.kt

@@ -14,10 +14,23 @@ import android.view.ViewGroup
 import androidx.core.view.children
 import com.facebook.react.R
 
+/**
+ * Helper object for parsing and handling CSS mix-blend-mode properties on Android Q+ (API 29+).
+ *
+ * This object provides utilities to convert CSS mix-blend-mode string values into Android's
+ * [BlendMode] enumeration and to determine when views need isolated layers for proper blending.
+ */
 @TargetApi(29)
 internal object BlendModeHelper {
 
-  /** @see <a href="https://www.w3.org/TR/compositing-1/#mix-blend-mode">mix-blend-mode</a> */
+  /**
+   * Parses a CSS mix-blend-mode string value into an Android BlendMode.
+   *
+   * @param mixBlendMode The CSS mix-blend-mode value (e.g., "multiply", "screen", "overlay")
+   * @return The corresponding [BlendMode], or null if "normal" or on unsupported Android versions
+   * @throws IllegalArgumentException if the mix-blend-mode name is invalid
+   * @see <a href="https://www.w3.org/TR/compositing-1/#mix-blend-mode">mix-blend-mode</a>
+   */
   @JvmStatic
   fun parseMixBlendMode(mixBlendMode: String?): BlendMode? {
     if (mixBlendMode == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolver.kt

@@ -9,8 +9,18 @@ package com.facebook.react.uimanager
 
 import com.facebook.proguard.annotations.DoNotStripAny
 
+/**
+ * Interface for resolving component names registered in React Native.
+ *
+ * This interface provides access to all registered component names in the React Native runtime,
+ * which is useful for debugging and inspection purposes.
+ */
 @DoNotStripAny
 internal interface ComponentNameResolver {
-  /* returns a list of all the component names that are registered in React Native. */
+  /**
+   * Gets the list of all component names registered in React Native.
+   *
+   * @return An array of all registered component names
+   */
   val componentNames: Array<String>
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ComponentNameResolverBinding.kt

@@ -12,11 +12,23 @@ import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.soloader.SoLoader
 import kotlin.jvm.JvmStatic
 
+/**
+ * JNI binding for installing a ComponentNameResolver into the JavaScript runtime.
+ *
+ * This object provides a native binding to install a [ComponentNameResolver] into the React Native
+ * JavaScript runtime, making component name information available to the native side.
+ */
 @DoNotStripAny
 internal object ComponentNameResolverBinding {
   init {
     SoLoader.loadLibrary("uimanagerjni")
   }
 
+  /**
+   * Installs a ComponentNameResolver into the JavaScript runtime.
+   *
+   * @param runtimeExecutor The runtime executor for the JavaScript runtime
+   * @param componentNameResolver The component name resolver to install
+   */
   @JvmStatic external fun install(runtimeExecutor: RuntimeExecutor, componentNameResolver: Any)
 }