react-native-tvos 0.83.2-0 → 0.84.0-0

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.kt

@@ -26,8 +26,6 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     Choreographer.FrameCallback {
 
   private var choreographer: Choreographer? = null
-  private val didJSUpdateUiDuringFrameDetector: DidJSUpdateUiDuringFrameDetector =
-      DidJSUpdateUiDuringFrameDetector()
   private var firstFrameTime: Long = -1
   private var lastFrameTime: Long = -1
   private var numFrameCallbacks = 0
@@ -40,11 +38,7 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     if (firstFrameTime == -1L) {
       firstFrameTime = l
     }
-    val lastFrameStartTime = lastFrameTime
     lastFrameTime = l
-    if (didJSUpdateUiDuringFrameDetector.getDidJSHitFrameAndCleanup(lastFrameStartTime, l)) {
-      numFrameCallbacksWithBatchDispatches++
-    }
     numFrameCallbacks++
     val expectedNumFrames = expectedNumFrames
     val framesDropped = expectedNumFrames - expectedNumFramesPrev - 1
@@ -61,17 +55,9 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     // removeBridgeIdleDebugListener for Bridgeless
     @Suppress("DEPRECATION")
     if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      val uiManagerModule =
-          reactContext.getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
-      if (!reactContext.isBridgeless) {
-        reactContext.catalystInstance.addBridgeIdleDebugListener(didJSUpdateUiDuringFrameDetector)
-        isRunningOnFabric = false
-      } else {
-        // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
-        // for Fabric or point users to use RNDT.
-        isRunningOnFabric = true
-      }
-      uiManagerModule?.setViewHierarchyUpdateDebugListener(didJSUpdateUiDuringFrameDetector)
+      // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
+      // for Fabric or point users to use RNDT.
+      isRunningOnFabric = true
     }
     this.targetFps = targetFps
     UiThreadUtil.runOnUiThread {
@@ -82,16 +68,6 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
 
   fun stop() {
     @Suppress("DEPRECATION")
-    if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      val uiManagerModule =
-          reactContext.getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
-      if (!reactContext.isBridgeless) {
-        reactContext.catalystInstance.removeBridgeIdleDebugListener(
-            didJSUpdateUiDuringFrameDetector
-        )
-      }
-      uiManagerModule?.setViewHierarchyUpdateDebugListener(null)
-    }
     UiThreadUtil.runOnUiThread {
       choreographer = Choreographer.getInstance()
       choreographer?.removeFrameCallback(this)

package/ReactAndroid/src/main/java/com/facebook/react/modules/devloading/DevLoadingModule.kt

@@ -30,9 +30,14 @@ internal class DevLoadingModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  override fun showMessage(message: String, color: Double?, backgroundColor: Double?) {
+  override fun showMessage(
+      message: String,
+      color: Double?,
+      backgroundColor: Double?,
+      dismissButton: Boolean?,
+  ) {
     UiThreadUtil.runOnUiThread {
-      devLoadingViewManager?.showMessage(message, color, backgroundColor)
+      devLoadingViewManager?.showMessage(message, color, backgroundColor, dismissButton)
     }
   }
 

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkEventUtil.kt

@@ -52,6 +52,29 @@ internal object NetworkEventUtil {
     }
   }
 
+  @Deprecated("Compatibility overload")
+  @JvmStatic
+  fun onCreateRequest(
+      devToolsRequestId: String,
+      requestUrl: String,
+      requestMethod: String,
+      requestHeaders: Map<String, String>,
+      requestBody: String,
+      encodedDataLength: Long,
+  ) {
+    if (ReactNativeFeatureFlags.enableNetworkEventReporting()) {
+      InspectorNetworkReporter.reportRequestStart(
+          devToolsRequestId,
+          requestUrl,
+          requestMethod,
+          requestHeaders,
+          requestBody,
+          encodedDataLength,
+      )
+      InspectorNetworkReporter.reportConnectionTiming(devToolsRequestId, requestHeaders)
+    }
+  }
+
   @JvmStatic
   fun onDataSend(
       reactContext: ReactApplicationContext?,

package/ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.kt

@@ -644,7 +644,7 @@ public class NetworkingModule(
                     reactApplicationContext,
                     requestId,
                     devToolsRequestId,
-                    url,
+                    response.request().url().toString(),
                     response,
                 )
 

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

@@ -13,8 +13,8 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 83,
-    "patch" to 2,
+    "minor" to 84,
+    "patch" to 0,
     "prerelease" to "0"
   )
 }

package/ReactAndroid/src/main/java/com/facebook/react/packagerconnection/PackagerConnectionSettings.kt

@@ -19,15 +19,16 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
   private val preferences: SharedPreferences =
       PreferenceManager.getDefaultSharedPreferences(appContext)
   public val packageName: String = appContext.packageName
-  private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
-  private var _packagerOptionsUpdater: (Map<String, String>) -> Map<String, String> = { it }
-  private var cachedHost: String? = null
+
+  init {
+    resetDebugServerHost()
+  }
 
   public open var debugServerHost: String
     get() {
       // Check cached host first. If empty try to detect emulator type and use default
       // hostname for those
-      cachedHost?.let {
+      _cachedOrOverrideHost?.let {
         return it
       }
 
@@ -44,19 +45,19 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
         )
       }
 
-      cachedHost = host
+      _cachedOrOverrideHost = host
       return host
     }
     set(host) {
       if (host.isEmpty()) {
-        cachedHost = null
+        _cachedOrOverrideHost = null
       } else {
-        cachedHost = host
+        _cachedOrOverrideHost = host
       }
     }
 
   public open fun resetDebugServerHost() {
-    cachedHost = null
+    _cachedOrOverrideHost = null
   }
 
   public fun setPackagerOptionsUpdater(queryMapper: (Map<String, String>) -> Map<String, String>) {
@@ -76,5 +77,11 @@ public open class PackagerConnectionSettings(private val appContext: Context) {
   private companion object {
     private val TAG = PackagerConnectionSettings::class.java.simpleName
     private const val PREFS_DEBUG_SERVER_HOST_KEY = "debug_http_host"
+
+    // The state for this class needs to be retained in the companion object.
+    // That's necessary in the case when there are multiple instances of PackagerConnectionSettings
+    private var _cachedOrOverrideHost: String? = null
+    private val _additionalOptionsForPackager: MutableMap<String, String> = mutableMapOf()
+    private var _packagerOptionsUpdater: (Map<String, String>) -> Map<String, String> = { it }
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessCatalystInstance.kt

@@ -19,7 +19,6 @@ import com.facebook.react.bridge.NativeArray
 import com.facebook.react.bridge.NativeArrayInterface
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.NativeModuleRegistry
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.bridge.RuntimeScheduler
 import com.facebook.react.bridge.UIManager
@@ -140,14 +139,6 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
   override val sourceURL: String
     get() = throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
 
-  override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
-    throw UnsupportedOperationException("Unimplemented method 'addBridgeIdleDebugListener'")
-  }
-
-  override fun removeBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
-    throw UnsupportedOperationException("Unimplemented method 'removeBridgeIdleDebugListener'")
-  }
-
   override fun registerSegment(segmentId: Int, path: String) {
     throw UnsupportedOperationException("Unimplemented method 'registerSegment'")
   }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.kt

@@ -43,8 +43,11 @@ import com.facebook.react.devsupport.DevMenuConfiguration
 import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.devsupport.DevSupportManagerFactory
 import com.facebook.react.devsupport.InspectorFlags
+import com.facebook.react.devsupport.inspector.FrameTimingsObserver
 import com.facebook.react.devsupport.inspector.InspectorNetworkHelper
 import com.facebook.react.devsupport.inspector.InspectorNetworkRequestListener
+import com.facebook.react.devsupport.inspector.TracingState
+import com.facebook.react.devsupport.inspector.TracingStateListener
 import com.facebook.react.devsupport.interfaces.BundleLoadCallback
 import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.devsupport.interfaces.DevSupportManager.PausedInDebuggerOverlayCommandListener
@@ -147,6 +150,7 @@ public class ReactHostImpl(
   private val beforeDestroyListeners: MutableList<() -> Unit> = CopyOnWriteArrayList()
 
   internal var reactHostInspectorTarget: ReactHostInspectorTarget? = null
+  private var frameTimingsObserver: FrameTimingsObserver? = null
 
   @Volatile private var hostInvalidated = false
 
@@ -1262,10 +1266,6 @@ public class ReactHostImpl(
     val method = "getOrCreateReloadTask()"
     stateTracker.enterState(method)
 
-    // Log how React Native is destroyed
-    // TODO(T136397487): Remove after Venice is shipped to 100%
-    raiseSoftException(method, reason)
-
     reloadTask?.let {
       return it
     }
@@ -1417,10 +1417,6 @@ public class ReactHostImpl(
     val method = "getOrCreateDestroyTask()"
     stateTracker.enterState(method)
 
-    // Log how React Native is destroyed
-    // TODO(T136397487): Remove after Venice is shipped to 100%
-    raiseSoftException(method, reason, ex)
-
     destroyTask?.let {
       return it
     }
@@ -1442,8 +1438,7 @@ public class ReactHostImpl(
                 // If the host has been invalidated, now that the current context/instance
                 // has been unregistered, we can safely destroy the host's inspector
                 // target.
-                reactHostInspectorTarget?.close()
-                reactHostInspectorTarget = null
+                destroyReactHostInspectorTarget()
               }
 
               // Step 1: Destroy DevSupportManager
@@ -1554,13 +1549,52 @@ public class ReactHostImpl(
 
   internal fun getOrCreateReactHostInspectorTarget(): ReactHostInspectorTarget? {
     if (reactHostInspectorTarget == null && InspectorFlags.getFuseboxEnabled()) {
-      // NOTE: ReactHostInspectorTarget only retains a weak reference to `this`.
-      reactHostInspectorTarget = ReactHostInspectorTarget(this)
+      reactHostInspectorTarget = createReactHostInspectorTarget()
     }
 
     return reactHostInspectorTarget
   }
 
+  private fun createReactHostInspectorTarget(): ReactHostInspectorTarget {
+    // NOTE: ReactHostInspectorTarget only retains a weak reference to `this`.
+    val inspectorTarget = ReactHostInspectorTarget(this)
+    inspectorTarget.registerTracingStateListener(
+        TracingStateListener { state: TracingState, _screenshotsEnabled: Boolean ->
+          when (state) {
+            TracingState.ENABLED_IN_BACKGROUND_MODE,
+            TracingState.ENABLED_IN_CDP_MODE -> {
+              currentActivity?.window?.let { window ->
+                val observer =
+                    FrameTimingsObserver(
+                        window,
+                        _screenshotsEnabled,
+                        { frameTimingsSequence ->
+                          inspectorTarget.recordFrameTimings(frameTimingsSequence)
+                        },
+                    )
+                observer.start()
+                frameTimingsObserver = observer
+              }
+            }
+            TracingState.DISABLED -> {
+              frameTimingsObserver?.stop()
+              frameTimingsObserver = null
+            }
+          }
+        }
+    )
+
+    return inspectorTarget
+  }
+
+  private fun destroyReactHostInspectorTarget() {
+    frameTimingsObserver?.stop()
+    frameTimingsObserver = null
+
+    reactHostInspectorTarget?.close()
+    reactHostInspectorTarget = null
+  }
+
   @ThreadConfined(ThreadConfined.UI)
   internal fun unregisterInstanceFromInspector(reactInstance: ReactInstance?) {
     if (reactInstance != null) {

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImplDevHelper.kt

@@ -16,8 +16,8 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.devsupport.ReactInstanceDevHelper
-import com.facebook.react.devsupport.interfaces.TracingState
-import com.facebook.react.devsupport.interfaces.TracingStateProvider
+import com.facebook.react.devsupport.inspector.TracingState
+import com.facebook.react.devsupport.inspector.TracingStateProvider
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorDevHelper
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
 import com.facebook.react.interfaces.TaskInterface
@@ -81,6 +81,6 @@ internal class ReactHostImplDevHelper(private val delegate: ReactHostImpl) :
       delegate.loadBundle(bundleLoader)
 
   override fun getTracingState(): TracingState {
-    return delegate.reactHostInspectorTarget?.getTracingState() ?: TracingState.ENABLEDINCDPMODE
+    return delegate.reactHostInspectorTarget?.getTracingState() ?: TracingState.ENABLED_IN_CDP_MODE
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostInspectorTarget.kt

@@ -12,7 +12,9 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.devsupport.interfaces.TracingState
+import com.facebook.react.devsupport.inspector.FrameTimingSequence
+import com.facebook.react.devsupport.inspector.TracingState
+import com.facebook.react.devsupport.inspector.TracingStateListener
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorInspectorTarget
 import com.facebook.react.devsupport.perfmonitor.PerfMonitorUpdateListener
 import com.facebook.soloader.SoLoader
@@ -41,37 +43,29 @@ internal class ReactHostInspectorTarget(reactHostImpl: ReactHostImpl) :
 
   external fun stopAndDiscardBackgroundTrace()
 
-  external fun tracingStateAsInt(): Int
+  external override fun getTracingState(): TracingState
 
-  override fun getTracingState(): TracingState {
-    return TracingState.entries[tracingStateAsInt()]
-  }
+  external fun registerTracingStateListener(listener: TracingStateListener): Long
+
+  external fun unregisterTracingStateListener(subscriptionId: Long)
+
+  external fun recordFrameTimings(frameTimingSequence: FrameTimingSequence)
 
   override fun addPerfMonitorListener(listener: PerfMonitorUpdateListener) {
     perfMonitorListeners.add(listener)
+    registerTracingStateListener { state, _ -> listener.onRecordingStateChanged(state) }
   }
 
   override fun pauseAndAnalyzeBackgroundTrace(): Boolean {
-    val emitted = stopAndMaybeEmitBackgroundTrace()
-    perfMonitorListeners.forEach { listener ->
-      listener.onRecordingStateChanged(TracingState.DISABLED)
-    }
-
-    return emitted
+    return stopAndMaybeEmitBackgroundTrace()
   }
 
   override fun resumeBackgroundTrace() {
     startBackgroundTrace()
-    perfMonitorListeners.forEach { listener ->
-      listener.onRecordingStateChanged(TracingState.ENABLEDINBACKGROUNDMODE)
-    }
   }
 
   override fun stopBackgroundTrace() {
     stopAndDiscardBackgroundTrace()
-    perfMonitorListeners.forEach { listener ->
-      listener.onRecordingStateChanged(TracingState.DISABLED)
-    }
   }
 
   fun handleNativePerfIssueAdded(

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactSurfaceView.kt

@@ -12,6 +12,7 @@ package com.facebook.react.runtime
 import android.content.Context
 import android.graphics.Point
 import android.graphics.Rect
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import com.facebook.common.logging.FLog
@@ -20,7 +21,9 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.IllegalViewOperationException
+import com.facebook.react.uimanager.JSKeyDispatcher
 import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.common.UIManagerType
@@ -37,6 +40,7 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     ReactRootView(context) {
   private val jsTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
   private var jsPointerDispatcher: JSPointerDispatcher? = null
+  private var jsKeyDispatcher: JSKeyDispatcher? = null
   private var wasMeasured = false
   private var widthMeasureSpec = 0
   private var heightMeasureSpec = 0
@@ -45,6 +49,9 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     if (ReactFeatureFlags.dispatchPointerEvents) {
       jsPointerDispatcher = JSPointerDispatcher(this)
     }
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      jsKeyDispatcher = JSKeyDispatcher()
+    }
   }
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -188,6 +195,51 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     }
   }
 
+  override fun dispatchJSKeyEvent(event: KeyEvent) {
+    if (jsKeyDispatcher == null) {
+      if (!ReactNativeFeatureFlags.enableKeyEvents()) {
+        return
+      }
+      FLog.w(TAG, "Unable to dispatch key events to JS before the dispatcher is available")
+      return
+    }
+    val eventDispatcher = surface.eventDispatcher
+    if (eventDispatcher != null) {
+      jsKeyDispatcher?.handleKeyEvent(event, eventDispatcher, surface.surfaceID)
+    } else {
+      FLog.w(
+          TAG,
+          "Unable to dispatch key events to JS as the React instance has not been attached",
+      )
+    }
+  }
+
+  override fun requestChildFocus(child: View?, focused: View?) {
+    super.requestChildFocus(child, focused)
+
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      val focusedViewTag = focused?.id
+      if (focusedViewTag != null) {
+        jsKeyDispatcher?.setFocusedView(focusedViewTag)
+      }
+    }
+  }
+
+  override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
+
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      if (gainFocus) {
+        val focusedViewTag = focusedChild?.id
+        if (focusedViewTag != null) {
+          jsKeyDispatcher?.setFocusedView(focusedViewTag)
+        }
+      } else {
+        jsKeyDispatcher?.clearFocus()
+      }
+    }
+  }
+
   override fun hasActiveReactContext(): Boolean =
       surface.isAttached && surface.reactHost?.currentReactContext != null
 

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

@@ -9,7 +9,10 @@ package com.facebook.react.uimanager
 
 import android.graphics.Canvas
 import android.graphics.Color
+import android.graphics.Paint
 import android.graphics.Path
+import android.graphics.PorterDuff
+import android.graphics.PorterDuffXfermode
 import android.graphics.Rect
 import android.graphics.RectF
 import android.graphics.drawable.Drawable
@@ -19,6 +22,7 @@ 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
@@ -467,7 +471,7 @@ public object BackgroundStyleApplicator {
    */
   @JvmStatic
   public fun setFeedbackUnderlay(view: View, drawable: Drawable?) {
-    ensureCompositeBackgroundDrawable(view).withNewFeedbackUnderlay(drawable)
+    view.background = ensureCompositeBackgroundDrawable(view).withNewFeedbackUnderlay(drawable)
   }
 
   /**
@@ -481,12 +485,36 @@ public object BackgroundStyleApplicator {
    */
   @JvmStatic
   public fun clipToPaddingBox(view: View, canvas: Canvas) {
+    clipToPaddingBoxWithAntiAliasing(view, canvas, null)
+  }
+
+  /**
+   * 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.
+   *
+   * On Android 28 and below, when border radius is present, this uses an antialiased clipping
+   * approach with Porter-Duff compositing to avoid jagged edges. The drawContent lambda is invoked
+   * to draw the actual content after setting up the layer but before applying the mask.
+   *
+   * @param view The view whose padding box defines the clipping region
+   * @param canvas The canvas to clip
+   * @param drawContent Lambda that draws the content after clipping is set up
+   */
+  @JvmStatic
+  public fun clipToPaddingBoxWithAntiAliasing(
+      view: View,
+      canvas: Canvas,
+      drawContent: (() -> Unit)?,
+  ) {
     val drawingRect = Rect()
     view.getDrawingRect(drawingRect)
 
     val composite = getCompositeBackgroundDrawable(view)
     if (composite == null) {
       canvas.clipRect(drawingRect)
+      drawContent?.invoke()
       return
     }
 
@@ -508,15 +536,76 @@ public object BackgroundStyleApplicator {
               paddingBoxRect,
               computedBorderInsets,
           )
-
       paddingBoxPath.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
-      canvas.clipPath(paddingBoxPath)
+
+      // On Android 28 and below, use antialiased clipping with Porter-Duff compositing. On newer
+      // Android versions, use the standard clipPath.
+      if (
+          ReactNativeFeatureFlags.enableAndroidAntialiasedBorderRadiusClipping() &&
+              Build.VERSION.SDK_INT <= Build.VERSION_CODES.P &&
+              view.width > 0 &&
+              view.height > 0 &&
+              drawContent != null
+      ) {
+        clipWithAntiAliasing(
+            view,
+            canvas,
+            paddingBoxPath,
+            drawContent,
+        )
+      } else {
+        canvas.clipPath(paddingBoxPath)
+        drawContent?.invoke()
+      }
     } else {
       paddingBoxRect.offset(drawingRect.left.toFloat(), drawingRect.top.toFloat())
       canvas.clipRect(paddingBoxRect)
+      drawContent?.invoke()
     }
   }
 
+  /**
+   * Applies antialiased clipping using Porter-Duff compositing for Android 28 and below. This draws
+   * content to a layer, then applies an antialiased mask to clip it.
+   */
+  private fun clipWithAntiAliasing(
+      view: View,
+      canvas: Canvas,
+      paddingBoxPath: Path,
+      drawContent: () -> Unit,
+  ) {
+    // Save the layer for Porter-Duff compositing
+    val saveCount = canvas.saveLayer(0f, 0f, view.width.toFloat(), view.height.toFloat(), null)
+
+    // Draw the content first
+    drawContent()
+
+    val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG)
+    maskPaint.style = Paint.Style.FILL
+
+    // Transparent pixels with INVERSE_WINDING only works on API 28
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+      maskPaint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_IN)
+      maskPaint.color = Color.TRANSPARENT
+      paddingBoxPath.setFillType(Path.FillType.INVERSE_WINDING)
+      canvas.drawPath(paddingBoxPath, maskPaint)
+    } else {
+      // Create an inverse path: outer rect minus the rounded rect (using even-odd fill rule)
+      val inversePath = Path()
+      inversePath.addRect(0f, 0f, view.width.toFloat(), view.height.toFloat(), Path.Direction.CW)
+      inversePath.addPath(paddingBoxPath)
+      inversePath.setFillType(Path.FillType.EVEN_ODD)
+
+      // Use DST_OUT to remove content where the mask is drawn (outside the rounded rect)
+      maskPaint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_OUT)
+      maskPaint.color = Color.BLACK
+      canvas.drawPath(inversePath, maskPaint)
+    }
+
+    // Restore the layer
+    canvas.restoreToCount(saveCount)
+  }
+
   /**
    * Resets the background styling of the view to its original state.
    *