react-native-tvos 0.77.0-0rc5 → 0.78.0-0

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

@@ -84,6 +84,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     view.setTag(R.id.accessibility_actions, null);
     view.setTag(R.id.accessibility_value, null);
     view.setTag(R.id.accessibility_state_expanded, null);
+    view.setTag(R.id.view_clipped, null);
 
     // This indirectly calls (and resets):
     // setTranslationX
@@ -813,62 +814,62 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   }
 
   /* Experimental W3C Pointer events start */
-  @ReactProp(name = "onPointerEnter")
+  @ReactProp(name = ViewProps.ON_POINTER_ENTER)
   public void setPointerEnter(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.ENTER, value);
   }
 
-  @ReactProp(name = "onPointerEnterCapture")
+  @ReactProp(name = ViewProps.ON_POINTER_ENTER_CAPTURE)
   public void setPointerEnterCapture(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.ENTER_CAPTURE, value);
   }
 
-  @ReactProp(name = "onPointerOver")
+  @ReactProp(name = ViewProps.ON_POINTER_OVER)
   public void setPointerOver(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.OVER, value);
   }
 
-  @ReactProp(name = "onPointerOverCapture")
+  @ReactProp(name = ViewProps.ON_POINTER_OVER_CAPTURE)
   public void setPointerOverCapture(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.OVER_CAPTURE, value);
   }
 
-  @ReactProp(name = "onPointerOut")
+  @ReactProp(name = ViewProps.ON_POINTER_OUT)
   public void setPointerOut(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.OUT, value);
   }
 
-  @ReactProp(name = "onPointerOutCapture")
+  @ReactProp(name = ViewProps.ON_POINTER_OUT_CAPTURE)
   public void setPointerOutCapture(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.OUT_CAPTURE, value);
   }
 
-  @ReactProp(name = "onPointerLeave")
+  @ReactProp(name = ViewProps.ON_POINTER_LEAVE)
   public void setPointerLeave(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.LEAVE, value);
   }
 
-  @ReactProp(name = "onPointerLeaveCapture")
+  @ReactProp(name = ViewProps.ON_POINTER_LEAVE_CAPTURE)
   public void setPointerLeaveCapture(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.LEAVE_CAPTURE, value);
   }
 
-  @ReactProp(name = "onPointerMove")
+  @ReactProp(name = ViewProps.ON_POINTER_MOVE)
   public void setPointerMove(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.MOVE, value);
   }
 
-  @ReactProp(name = "onPointerMoveCapture")
+  @ReactProp(name = ViewProps.ON_POINTER_MOVE_CAPTURE)
   public void setPointerMoveCapture(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.MOVE_CAPTURE, value);
   }
 
-  @ReactProp(name = "onClick")
+  @ReactProp(name = ViewProps.ON_CLICK)
   public void setClick(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.CLICK, value);
   }
 
-  @ReactProp(name = "onClickCapture")
+  @ReactProp(name = ViewProps.ON_CLICK_CAPTURE)
   public void setClickCapture(@NonNull T view, boolean value) {
     setPointerEventsFlag(view, PointerEventHelper.EVENT.CLICK_CAPTURE, value);
   }

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

@@ -126,20 +126,23 @@ public abstract class BaseViewManagerDelegate<
       ViewProps.Z_INDEX -> mViewManager.setZIndex(view, (value as Double?)?.toFloat() ?: 0.0f)
 
       // Experimental pointer events
-      "onPointerEnter" -> mViewManager.setPointerEnter(view, value as Boolean? ?: false)
-      "onPointerEnterCapture" ->
+      ViewProps.ON_POINTER_ENTER -> mViewManager.setPointerEnter(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_ENTER_CAPTURE ->
           mViewManager.setPointerEnterCapture(view, value as Boolean? ?: false)
-      "onPointerOver" -> mViewManager.setPointerOver(view, value as Boolean? ?: false)
-      "onPointerOverCapture" -> mViewManager.setPointerOverCapture(view, value as Boolean? ?: false)
-      "onPointerOut" -> mViewManager.setPointerOut(view, value as Boolean? ?: false)
-      "onPointerOutCapture" -> mViewManager.setPointerOutCapture(view, value as Boolean? ?: false)
-      "onPointerLeave" -> mViewManager.setPointerLeave(view, value as Boolean? ?: false)
-      "onPointerLeaveCapture" ->
+      ViewProps.ON_POINTER_OVER -> mViewManager.setPointerOver(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_OVER_CAPTURE ->
+          mViewManager.setPointerOverCapture(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_OUT -> mViewManager.setPointerOut(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_OUT_CAPTURE ->
+          mViewManager.setPointerOutCapture(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_LEAVE -> mViewManager.setPointerLeave(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_LEAVE_CAPTURE ->
           mViewManager.setPointerLeaveCapture(view, value as Boolean? ?: false)
-      "onPointerMove" -> mViewManager.setPointerMove(view, value as Boolean? ?: false)
-      "onPointerMoveCapture" -> mViewManager.setPointerMoveCapture(view, value as Boolean? ?: false)
-      "onClick" -> mViewManager.setClick(view, value as Boolean? ?: false)
-      "onClickCapture" -> mViewManager.setClickCapture(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_MOVE -> mViewManager.setPointerMove(view, value as Boolean? ?: false)
+      ViewProps.ON_POINTER_MOVE_CAPTURE ->
+          mViewManager.setPointerMoveCapture(view, value as Boolean? ?: false)
+      ViewProps.ON_CLICK -> mViewManager.setClick(view, value as Boolean? ?: false)
+      ViewProps.ON_CLICK_CAPTURE -> mViewManager.setClickCapture(view, value as Boolean? ?: false)
     }
   }
 

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

@@ -5,13 +5,12 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager
 
-import com.facebook.proguard.annotations.DoNotStripAny;
+import com.facebook.proguard.annotations.DoNotStripAny
 
 @DoNotStripAny
-public interface ComponentNameResolver {
-
+internal interface ComponentNameResolver {
   /* returns a list of all the component names that are registered in React Native. */
-  String[] getComponentNames();
+  public val componentNames: Array<String>?
 }

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

@@ -8,6 +8,7 @@
 package com.facebook.react.uimanager
 
 import android.view.Choreographer
+import com.facebook.react.bridge.JSExceptionHandler
 import com.facebook.react.bridge.ReactContext
 
 /**
@@ -15,13 +16,15 @@ import com.facebook.react.bridge.ReactContext
  * handled by the [JSExceptionHandler] registered if the app is in dev mode.
  */
 public abstract class GuardedFrameCallback
-protected constructor(private val reactContext: ReactContext) : Choreographer.FrameCallback {
+protected constructor(private val exceptionHandler: JSExceptionHandler) :
+    Choreographer.FrameCallback {
+  protected constructor(reactContext: ReactContext) : this(reactContext.exceptionHandler)
 
   override public fun doFrame(frameTimeNanos: Long) {
     try {
       doFrameGuarded(frameTimeNanos)
     } catch (e: RuntimeException) {
-      reactContext.handleException(e)
+      exceptionHandler.handleException(e)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java

@@ -972,9 +972,4 @@ public class LayoutShadowNode extends ReactShadowNodeImpl {
   public void setShouldNotifyPointerMove(boolean value) {
     // Do Nothing: Align with static ViewConfigs
   }
-
-  @ReactProp(name = "experimental_layoutConformance")
-  public void setLayoutConformance(String value) {
-    // Do Nothing: Align with static ViewConfigs
-  }
 }

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager
+
+/**
+ * Interface that should be implemented by [View] subclasses that support [overflow] style. This
+ * allows the overflow information to be used by [TouchTargetHelper] to determine if a View is
+ * touchable.
+ */
+public interface ReactOverflowView {
+  /**
+   * Gets the overflow state of a view. If set, this should be one of [ViewProps#HIDDEN],
+   * [ViewProps#VISIBLE] or [ViewProps#SCROLL].
+   */
+  public val overflow: String?
+}

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

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager
+
+/**
+ * This interface should be implemented be native [View] subclasses that support pointer events
+ * handling. It is used to find the target View of a touch event.
+ */
+public interface ReactPointerEventsView {
+
+  /** The PointerEvents of the View. */
+  public val pointerEvents: PointerEvents
+}

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/{RootView.java → RootView.kt}

@@ -5,10 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager
 
-import android.view.MotionEvent;
-import android.view.View;
+import android.view.MotionEvent
+import android.view.View
 
 /** Interface for the root native view of a React native application. */
 public interface RootView {
@@ -17,21 +17,20 @@ public interface RootView {
    * Called when a child starts a native gesture (e.g. a scroll in a ScrollView). Should be called
    * from the child's onTouchIntercepted implementation.
    */
-  void onChildStartedNativeGesture(View childView, MotionEvent ev);
+  public fun onChildStartedNativeGesture(childView: View?, ev: MotionEvent)
 
-  /**
-   * @deprecated
-   */
-  @Deprecated
-  default void onChildStartedNativeGesture(MotionEvent ev) {
-    onChildStartedNativeGesture(null, ev);
+  @Deprecated(
+      message = "Use onChildStartedNativeGesture with a childView parameter.",
+      replaceWith = ReplaceWith("onChildStartedNativeGesture"))
+  public fun onChildStartedNativeGesture(ev: MotionEvent) {
+    onChildStartedNativeGesture(null, ev)
   }
 
   /**
    * Called when a child ends a native gesture. Should be called from the child's onTouchIntercepted
    * implementation.
    */
-  void onChildEndedNativeGesture(View childView, MotionEvent ev);
+  public fun onChildEndedNativeGesture(childView: View, ev: MotionEvent)
 
-  void handleException(Throwable t);
+  public fun handleException(t: Throwable)
 }

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

@@ -11,7 +11,7 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 
 /** View manager for ReactRootView components. */
-public class RootViewManager : ViewGroupManager<ViewGroup>() {
+internal class RootViewManager : ViewGroupManager<ViewGroup>() {
 
   override public fun getName(): String = REACT_CLASS
 

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/{UIBlock.java → UIBlock.kt}

@@ -5,9 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager
 
 /** A task to execute on the UI View for third party libraries. */
-public interface UIBlock {
-  public void execute(NativeViewHierarchyManager nativeViewHierarchyManager);
+public fun interface UIBlock {
+  public fun execute(nativeViewHierarchyManager: NativeViewHierarchyManager): Unit
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java

@@ -25,7 +25,6 @@ import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.ReactConstants;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.systrace.Systrace;
@@ -958,10 +957,8 @@ public class UIViewOperationQueue {
 
   /* package */ void resumeFrameCallback() {
     mIsDispatchUIFrameCallbackEnqueued = true;
-    if (!ReactNativeFeatureFlags.enableFabricRendererExclusively()) {
-      ReactChoreographer.getInstance()
-          .postFrameCallback(ReactChoreographer.CallbackType.DISPATCH_UI, mDispatchUIFrameCallback);
-    }
+    ReactChoreographer.getInstance()
+        .postFrameCallback(ReactChoreographer.CallbackType.DISPATCH_UI, mDispatchUIFrameCallback);
   }
 
   /* package */ void pauseFrameCallback() {

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java

@@ -14,8 +14,10 @@ import androidx.annotation.Nullable;
 import com.facebook.common.logging.FLog;
 import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.common.annotations.UnstableReactNativeAPI;
 import com.facebook.react.common.mapbuffer.MapBuffer;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
@@ -488,4 +490,27 @@ public abstract class ViewManager<T extends View, C extends ReactShadowNode>
       mRecyclableViews = new HashMap<>();
     }
   }
+
+  /**
+   * THIS PREFETCH METHOD IS EXPERIMENTAL, DO NOT USE IT FOR PRODUCTION CODE, MOST LIKELY IT WILL
+   * CHANGE OR BE REMOVED IN THE FUTURE.
+   *
+   * <p>Subclasses can override this method to implement custom resource prefetching for the
+   * ViewManager.
+   *
+   * @param reactContext {@link com.facebook.react.bridge.ReactContext} used for the view.
+   * @param surfaceId {@link int} surface ID
+   * @param reactTag reactTag that should be set as ID of the view instance
+   * @param params {@link MapBuffer} prefetch request params defined in C++
+   */
+  @UnstableReactNativeAPI
+  public void experimental_prefetchResource(
+      ReactContext reactContext, int surfaceId, int reactTag, MapBuffer params) {
+    return;
+  }
+
+  @UnstableReactNativeAPI
+  protected boolean experimental_isPrefetchingEnabled() {
+    return ReactNativeFeatureFlags.enableImagePrefetchingAndroid();
+  }
 }

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

@@ -17,7 +17,7 @@ import com.facebook.react.bridge.ReadableArray
  *
  * @param <T> the type of the view supported by this delegate </T>
  */
-public interface ViewManagerDelegate<T : View?> {
+public interface ViewManagerDelegate<T : View> {
 
   /**
    * Sets a property on a view managed by this view manager.

package/{Libraries/AppDelegate/RCTAppDelegate+Protected.h → ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagerWithGeneratedInterface.kt}

@@ -5,12 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#if defined(__cplusplus)
+package com.facebook.react.uimanager
 
-#import <ReactCommon/RCTTurboModuleManager.h>
-#import "RCTAppDelegate.h"
-
-@interface RCTAppDelegate () <RCTTurboModuleManagerDelegate>
-@end
-
-#endif
+/** Marker interface to be extended by all code-generated ViewManagerInterface. */
+public interface ViewManagerWithGeneratedInterface {}

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

@@ -60,7 +60,6 @@ public object ViewProps {
   public const val WIDTH: String = "width"
   public const val START: String = "start"
   public const val END: String = "end"
-  public const val IS_ATTACHMENT: String = "isAttachment"
   public const val AUTO: String = "auto"
   public const val NONE: String = "none"
   public const val BOX_NONE: String = "box-none"
@@ -135,7 +134,6 @@ public object ViewProps {
   public const val BORDER_START_START_RADIUS: String = "borderStartStartRadius"
   public const val BORDER_START_COLOR: String = "borderStartColor"
   public const val BORDER_END_COLOR: String = "borderEndColor"
-  public const val ON_LAYOUT: String = "onLayout"
   public const val BOX_SHADOW: String = "boxShadow"
   public const val FILTER: String = "filter"
   public const val MIX_BLEND_MODE: String = "mixBlendMode"
@@ -170,6 +168,18 @@ public object ViewProps {
   /** Used to locate views in end-to-end (UI) tests. */
   public const val TEST_ID: String = "testID"
   public const val NATIVE_ID: String = "nativeID"
+  internal const val ON_POINTER_ENTER: String = "onPointerEnter"
+  internal const val ON_POINTER_ENTER_CAPTURE: String = "onPointerEnterCapture"
+  internal const val ON_POINTER_OVER: String = "onPointerOver"
+  internal const val ON_POINTER_OVER_CAPTURE: String = "onPointerOverCapture"
+  internal const val ON_POINTER_OUT: String = "onPointerOut"
+  internal const val ON_POINTER_OUT_CAPTURE: String = "onPointerOutCapture"
+  internal const val ON_POINTER_LEAVE: String = "onPointerLeave"
+  internal const val ON_POINTER_LEAVE_CAPTURE: String = "onPointerLeaveCapture"
+  internal const val ON_POINTER_MOVE: String = "onPointerMove"
+  internal const val ON_POINTER_MOVE_CAPTURE: String = "onPointerMoveCapture"
+  internal const val ON_CLICK: String = "onClick"
+  internal const val ON_CLICK_CAPTURE: String = "onClickCapture"
   @JvmField
   public val BORDER_SPACING_TYPES: IntArray =
       intArrayOf(
@@ -192,9 +202,6 @@ public object ViewProps {
           Spacing.BOTTOM,
           Spacing.LEFT,
           Spacing.RIGHT)
-  @JvmField
-  public val POSITION_SPACING_TYPES: IntArray =
-      intArrayOf(Spacing.START, Spacing.END, Spacing.TOP, Spacing.BOTTOM)
   private val LAYOUT_ONLY_PROPS: HashSet<String> =
       HashSet(
           Arrays.asList(

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

@@ -42,7 +42,7 @@ internal class BackgroundDrawable(
    * Outline. The smallest amount (found to be 0.8f) is used to shrink outline's path, overlapping
    * them and closing the visible gap.
    */
-  private val gapBetweenPaths = 0.8f
+  private val pathAdjustment = 0.8f
   private var computedBorderInsets: RectF? = null
   private var computedBorderRadius: ComputedBorderRadius? = null
   private var needUpdatePath = true
@@ -56,8 +56,8 @@ internal class BackgroundDrawable(
       }
     }
 
-  private var paddingBoxRect: RectF = RectF()
-  private var paddingBoxRenderPath: Path? = null
+  private var backgroundRect: RectF = RectF()
+  private var backgroundRenderPath: Path? = null
 
   var backgroundImageLayers: List<BackgroundImageLayer>? = null
     set(value) {
@@ -107,33 +107,33 @@ internal class BackgroundDrawable(
     updatePath()
     canvas.save()
 
-    var innerRadiusX = 0f
-    var innerRadiusY = 0f
     // Draws the View without its border first (with background color fill)
     if (backgroundPaint.alpha != 0) {
       if (computedBorderRadius?.isUniform() == true && borderRadius?.hasRoundedBorders() == true) {
-        innerRadiusX =
-            getInnerBorderRadius(
-                computedBorderRadius?.topLeft?.horizontal?.dpToPx(), computedBorderInsets?.left)
-        innerRadiusY =
-            getInnerBorderRadius(
-                computedBorderRadius?.topLeft?.vertical?.dpToPx(), computedBorderInsets?.top)
-        canvas.drawRoundRect(paddingBoxRect, innerRadiusX, innerRadiusY, backgroundPaint)
+        canvas.drawRoundRect(
+            backgroundRect,
+            computedBorderRadius?.topLeft?.horizontal?.dpToPx() ?: 0f,
+            computedBorderRadius?.topLeft?.vertical?.dpToPx() ?: 0f,
+            backgroundPaint)
       } else if (borderRadius?.hasRoundedBorders() != true) {
-        canvas.drawRect(bounds, backgroundPaint)
+        canvas.drawRect(backgroundRect, backgroundPaint)
       } else {
-        canvas.drawPath(checkNotNull(paddingBoxRenderPath), backgroundPaint)
+        canvas.drawPath(checkNotNull(backgroundRenderPath), backgroundPaint)
       }
     }
 
     if (backgroundImageLayers != null && backgroundImageLayers?.isNotEmpty() == true) {
       backgroundPaint.setShader(getBackgroundImageShader())
       if (computedBorderRadius?.isUniform() == true && borderRadius?.hasRoundedBorders() == true) {
-        canvas.drawRoundRect(paddingBoxRect, innerRadiusX, innerRadiusY, backgroundPaint)
+        canvas.drawRoundRect(
+            backgroundRect,
+            computedBorderRadius?.topLeft?.horizontal?.dpToPx() ?: 0f,
+            computedBorderRadius?.topLeft?.vertical?.dpToPx() ?: 0f,
+            backgroundPaint)
       } else if (borderRadius?.hasRoundedBorders() != true) {
-        canvas.drawRect(paddingBoxRect, backgroundPaint)
+        canvas.drawRect(backgroundRect, backgroundPaint)
       } else {
-        canvas.drawPath(checkNotNull(paddingBoxRenderPath), backgroundPaint)
+        canvas.drawPath(checkNotNull(backgroundRenderPath), backgroundPaint)
       }
       backgroundPaint.setShader(null)
     }
@@ -167,89 +167,55 @@ internal class BackgroundDrawable(
     return null
   }
 
-  /**
-   * Here, "inner" refers to the border radius on the inside of the border. So it ends up being the
-   * "outer" border radius inset by the respective width.
-   */
-  private fun getInnerBorderRadius(computedRadius: Float?, borderWidth: Float?): Float {
-    return ((computedRadius ?: 0f) - (borderWidth ?: 0f)).coerceAtLeast(0f)
-  }
-
   private fun updatePath() {
     if (!needUpdatePath) {
       return
     }
     needUpdatePath = false
 
+    backgroundRect.set(bounds)
+
     computedBorderInsets = computeBorderInsets()
     computedBorderRadius =
         borderRadius?.resolve(
             layoutDirection, context, bounds.width().pxToDp(), bounds.height().pxToDp())
+    val hasBorder =
+        (computedBorderInsets?.left != 0f ||
+            computedBorderInsets?.top != 0f ||
+            computedBorderInsets?.right != 0f ||
+            computedBorderInsets?.bottom != 0f)
 
     if (computedBorderRadius?.hasRoundedBorders() == true &&
         computedBorderRadius?.isUniform() == false) {
-      paddingBoxRenderPath = paddingBoxRenderPath ?: Path()
-      paddingBoxRenderPath?.reset()
+      backgroundRenderPath = backgroundRenderPath ?: Path()
+      backgroundRenderPath?.reset()
     }
 
-    // only close gap between border and background if we draw the border, otherwise
-    // we wind up pixelating small pixel-radius curves
-    var pathAdjustment = 0f
-    if (computedBorderInsets != null &&
-        (computedBorderInsets?.left != 0f ||
-            computedBorderInsets?.top != 0f ||
-            computedBorderInsets?.right != 0f ||
-            computedBorderInsets?.bottom != 0f)) {
-      pathAdjustment = gapBetweenPaths
+    /**
+     * The background bleeds a bit outside of the borderDrawable. pathAdjustment is used to slightly
+     * shrink the rectangle (backgroundRect), ensuring the border can be drawn on top without the
+     * gap.
+     */
+    if (hasBorder && borderRadius?.hasRoundedBorders() == true) {
+      backgroundRect.left += pathAdjustment
+      backgroundRect.top += pathAdjustment
+      backgroundRect.right -= pathAdjustment
+      backgroundRect.bottom -= pathAdjustment
     }
 
-    // There is a small gap between backgroundDrawable and
-    // borderDrawable. pathAdjustment is used to slightly enlarge the rectangle
-    // (paddingBoxRect), ensuring the border can be
-    // drawn on top without the gap.
-    paddingBoxRect.left = bounds.left + (computedBorderInsets?.left ?: 0f) - pathAdjustment
-    paddingBoxRect.top = bounds.top + (computedBorderInsets?.top ?: 0f) - pathAdjustment
-    paddingBoxRect.right = bounds.right - (computedBorderInsets?.right ?: 0f) + pathAdjustment
-    paddingBoxRect.bottom = bounds.bottom - (computedBorderInsets?.bottom ?: 0f) + pathAdjustment
-
     if (borderRadius?.hasRoundedBorders() == true && computedBorderRadius?.isUniform() != true) {
 
-      val innerTopLeftRadiusX =
-          getInnerBorderRadius(
-              computedBorderRadius?.topLeft?.horizontal?.dpToPx(), computedBorderInsets?.left)
-      val innerTopLeftRadiusY =
-          getInnerBorderRadius(
-              computedBorderRadius?.topLeft?.vertical?.dpToPx(), computedBorderInsets?.top)
-      val innerTopRightRadiusX =
-          getInnerBorderRadius(
-              computedBorderRadius?.topRight?.horizontal?.dpToPx(), computedBorderInsets?.right)
-      val innerTopRightRadiusY =
-          getInnerBorderRadius(
-              computedBorderRadius?.topRight?.vertical?.dpToPx(), computedBorderInsets?.top)
-      val innerBottomRightRadiusX =
-          getInnerBorderRadius(
-              computedBorderRadius?.bottomRight?.horizontal?.dpToPx(), computedBorderInsets?.right)
-      val innerBottomRightRadiusY =
-          getInnerBorderRadius(
-              computedBorderRadius?.bottomRight?.vertical?.dpToPx(), computedBorderInsets?.bottom)
-      val innerBottomLeftRadiusX =
-          getInnerBorderRadius(
-              computedBorderRadius?.bottomLeft?.horizontal?.dpToPx(), computedBorderInsets?.left)
-      val innerBottomLeftRadiusY =
-          getInnerBorderRadius(
-              computedBorderRadius?.bottomLeft?.vertical?.dpToPx(), computedBorderInsets?.bottom)
-
-      paddingBoxRenderPath?.addRoundRect(
-          paddingBoxRect,
+      backgroundRenderPath?.addRoundRect(
+          backgroundRect,
           floatArrayOf(
-              innerTopLeftRadiusX,
-              innerTopLeftRadiusY,
-              innerTopRightRadiusX,
-              innerTopRightRadiusY,
-              innerBottomRightRadiusX,
-              innerBottomRightRadiusY,
-              innerBottomLeftRadiusX,
-              innerBottomLeftRadiusY,
+              computedBorderRadius?.topLeft?.horizontal?.dpToPx() ?: 0f,
+              computedBorderRadius?.topLeft?.vertical?.dpToPx() ?: 0f,
+              computedBorderRadius?.topRight?.horizontal?.dpToPx() ?: 0f,
+              computedBorderRadius?.topRight?.vertical?.dpToPx() ?: 0f,
+              computedBorderRadius?.bottomRight?.horizontal?.dpToPx() ?: 0f,
+              computedBorderRadius?.bottomRight?.vertical?.dpToPx() ?: 0f,
+              computedBorderRadius?.bottomLeft?.horizontal?.dpToPx() ?: 0f,
+              computedBorderRadius?.bottomLeft?.vertical?.dpToPx() ?: 0f,
           ),
           Path.Direction.CW)
     }

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

@@ -138,7 +138,7 @@ internal class BorderDrawable(
   @Deprecated("Deprecated in Java")
   override fun getOpacity(): Int {
     val maxBorderAlpha =
-        minOf(
+        maxOf(
             (Color.alpha(multiplyColorAlpha(computedBorderColors.left, borderAlpha))),
             (Color.alpha(multiplyColorAlpha(computedBorderColors.top, borderAlpha))),
             (Color.alpha(multiplyColorAlpha(computedBorderColors.right, borderAlpha))),
@@ -675,10 +675,10 @@ internal class BorderDrawable(
 
     val borderWidth = computeBorderInsets()
 
-    // Clip border ONLY if its color is non transparent
-    if (Color.alpha(computedBorderColors.left) != 0 &&
-        Color.alpha(computedBorderColors.top) != 0 &&
-        Color.alpha(computedBorderColors.right) != 0 &&
+    // Clip border ONLY if at least one edge is non-transparent
+    if (Color.alpha(computedBorderColors.left) != 0 ||
+        Color.alpha(computedBorderColors.top) != 0 ||
+        Color.alpha(computedBorderColors.right) != 0 ||
         Color.alpha(computedBorderColors.bottom) != 0) {
       innerClipTempRectForBorderRadius?.top =
           innerClipTempRectForBorderRadius?.top?.plus(borderWidth.top) ?: 0f

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/drawable/CSSBackgroundDrawable.java

@@ -646,13 +646,13 @@ public class CSSBackgroundDrawable extends Drawable {
       colorTop = colorBlockStart;
     }
 
-    // Clip border ONLY if its color is non transparent
+    // Clip border ONLY if at least one edge is non-transparent
     float pathAdjustment = 0f;
     if (Color.alpha(colorLeft) != 0
-        && Color.alpha(colorTop) != 0
-        && Color.alpha(colorRight) != 0
-        && Color.alpha(colorBottom) != 0
-        && Color.alpha(borderColor) != 0) {
+        || Color.alpha(colorTop) != 0
+        || Color.alpha(colorRight) != 0
+        || Color.alpha(colorBottom) != 0
+        || Color.alpha(borderColor) != 0) {
 
       mInnerClipTempRectForBorderRadius.top += borderWidth.top;
       mInnerClipTempRectForBorderRadius.bottom -= borderWidth.bottom;