@depup/react-native 0.86.0-depup.49 → 0.87.0-depup.0

package/ReactAndroid/src/main/java/com/facebook/react/internal/featureflags/ReactNativeNewArchitectureFeatureFlagsDefaults.kt

@@ -25,11 +25,7 @@ public open class ReactNativeNewArchitectureFeatureFlagsDefaults() :
 
   override fun enableBridgelessArchitecture(): Boolean = true
 
-  override fun enableFabricRenderer(): Boolean = true
-
   override fun useNativeViewConfigsInBridgelessMode(): Boolean = true
 
   override fun useTurboModuleInterop(): Boolean = true
-
-  override fun useTurboModules(): Boolean = true
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/appearance/AppearanceModule.kt

@@ -87,6 +87,7 @@ constructor(
       when (style) {
         "dark" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
         "light" -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+        "auto",
         "unspecified" ->
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
       }

package/ReactAndroid/src/main/java/com/facebook/react/modules/core/TimingModule.kt

@@ -15,6 +15,9 @@ import com.facebook.react.devsupport.interfaces.DevSupportManager
 import com.facebook.react.module.annotations.ReactModule
 
 /** Native module for JS timer execution. Timers fire on frame boundaries. */
+@Deprecated(
+    "TimingModule is part of the legacy architecture and will be removed in a future React Native release."
+)
 @ReactModule(name = NativeTimingSpec.NAME)
 public class TimingModule(
     reactContext: ReactApplicationContext,

package/ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.kt

@@ -35,6 +35,7 @@ import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.modules.fresco.ReactNetworkImageRequest
 import com.facebook.react.views.image.ReactCallerContextFactory
 import com.facebook.react.views.imagehelper.ImageSource
+import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper
 
 @ReactModule(name = NativeImageLoaderAndroidSpec.NAME)
 internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventListener {
@@ -85,6 +86,13 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
       return
     }
     val source = ImageSource(reactApplicationContext, uriString)
+    // Fast path: resolve resource drawables (including VectorDrawables) via the
+    // Android resource system instead of Fresco's encoded-image pipeline, which
+    // does not support res:// URIs.
+    if (source.isResource) {
+      resolveResourceSize(uriString, promise)
+      return
+    }
     val request: ImageRequest =
         ImageRequestBuilder.newBuilderWithSource(source.uri)
             .setRotationOptions(RotationOptions.disableRotation())
@@ -109,6 +117,11 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
       return
     }
     val source = ImageSource(reactApplicationContext, uriString)
+    // Fast path: resource drawables are resolved locally; headers are not applicable.
+    if (source.isResource) {
+      resolveResourceSize(uriString, promise)
+      return
+    }
     val imageRequestBuilder: ImageRequestBuilder =
         ImageRequestBuilder.newBuilderWithSource(source.uri)
             .setRotationOptions(RotationOptions.disableRotation())
@@ -167,6 +180,43 @@ internal class ImageLoaderModule : NativeImageLoaderAndroidSpec, LifecycleEventL
         }
       }
 
+  /**
+   * Resolve the intrinsic size of a drawable resource by name. Works for all drawable types
+   * including VectorDrawable, which cannot be decoded by Fresco's encoded-image pipeline.
+   *
+   * Drawables without intrinsic dimensions (e.g. ColorDrawable) will cause the promise to be
+   * rejected since there is no meaningful size to return.
+   */
+  private fun resolveResourceSize(name: String, promise: Promise) {
+    val context = reactApplicationContext
+    val drawable =
+        try {
+          ResourceDrawableIdHelper.getResourceDrawable(context, name)
+        } catch (e: Exception) {
+          promise.reject(ERROR_GET_SIZE_FAILURE, e)
+          return
+        }
+    if (drawable == null) {
+      promise.reject(ERROR_GET_SIZE_FAILURE, "Could not resolve drawable resource: $name")
+      return
+    }
+    val width = drawable.intrinsicWidth
+    val height = drawable.intrinsicHeight
+    if (width < 0 || height < 0) {
+      promise.reject(
+          ERROR_GET_SIZE_FAILURE,
+          "Drawable resource has no intrinsic size: $name",
+      )
+      return
+    }
+    promise.resolve(
+        buildReadableMap {
+          put("width", width)
+          put("height", height)
+        }
+    )
+  }
+
   /**
    * Prefetches the given image to the Fresco image disk cache.
    *

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

@@ -260,15 +260,16 @@ internal object NetworkEventUtil {
     val body = (requestBody as? ProgressRequestBody)?.innerBody() ?: requestBody
 
     if (body.isOneShot()) {
-      // Fallback - body cannot be read twice
-      return "[Preview unavailable]"
+      // Reading would drain the underlying stream and break the real upload,
+      // so fall back to a placeholder that includes the byte count when known
+      return binaryPartLabel(body)
     }
 
     // MultipartBody does not propagate isOneShot() from its parts, so check each
     // part explicitly. Reading a one-shot part here would drain the underlying
     // stream and cause the real request to fail.
     if (body is MultipartBody && body.parts().any { it.body().isOneShot() }) {
-      return "[Preview unavailable]"
+      return previewMultipartWithBinaryParts(body)
     }
 
     return try {
@@ -285,4 +286,53 @@ internal object NetworkEventUtil {
       "[Preview unavailable]"
     }
   }
+
+  private fun previewMultipartWithBinaryParts(body: MultipartBody): String {
+    val boundary = body.boundary()
+    val out = StringBuilder()
+
+    for (part in body.parts()) {
+      out.append("--").append(boundary).append("\r\n")
+
+      part.headers()?.let { headers ->
+        for (i in 0 until headers.size()) {
+          out.append(headers.name(i)).append(": ").append(headers.value(i)).append("\r\n")
+        }
+      }
+      val partBody = part.body()
+      partBody.contentType()?.let { out.append("Content-Type: ").append(it).append("\r\n") }
+      out.append("\r\n")
+
+      if (partBody.isOneShot()) {
+        out.append(binaryPartLabel(partBody))
+      } else {
+        try {
+          val partBuffer = Buffer()
+          partBody.writeTo(partBuffer)
+          out.append(partBuffer.readUtf8())
+        } catch (e: IOException) {
+          out.append("[Preview unavailable]")
+        }
+      }
+      out.append("\r\n")
+    }
+    out.append("--").append(boundary).append("--\r\n")
+
+    return if (out.length <= MAX_BODY_PREVIEW_SIZE) {
+      out.toString()
+    } else {
+      out.substring(0, MAX_BODY_PREVIEW_SIZE) + "... (truncated, ${out.length} bytes total)"
+    }
+  }
+
+  /** Placeholder for a one-shot body, including the byte count when known. */
+  private fun binaryPartLabel(body: RequestBody): String {
+    val length =
+        try {
+          body.contentLength()
+        } catch (e: IOException) {
+          -1L
+        }
+    return if (length >= 0) "[Binary data, $length bytes]" else "[Binary data]"
+  }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/StatusBarModule.kt

@@ -7,16 +7,12 @@
 
 package com.facebook.react.modules.statusbar
 
-import android.animation.ArgbEvaluator
-import android.animation.ValueAnimator
 import android.view.Window
-import android.view.WindowManager
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowCompat
 import androidx.core.view.WindowInsetsCompat
 import com.facebook.common.logging.FLog
 import com.facebook.fbreact.specs.NativeStatusBarManagerAndroidSpec
-import com.facebook.react.bridge.GuardedRunnable
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.UiThreadUtil
@@ -25,9 +21,7 @@ import com.facebook.react.interfaces.ExtraWindowEventListener
 import com.facebook.react.module.annotations.ReactModule
 import com.facebook.react.uimanager.DisplayMetricsHolder.getStatusBarHeightPx
 import com.facebook.react.uimanager.PixelUtil
-import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 import com.facebook.react.views.view.setStatusBarStyle
-import com.facebook.react.views.view.setStatusBarTranslucency
 import com.facebook.react.views.view.setStatusBarVisibility
 import java.util.Collections
 import java.util.WeakHashMap
@@ -64,80 +58,10 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
     extraWindows.remove(window)
   }
 
-  @Suppress("DEPRECATION")
   override fun getTypedExportedConstants(): Map<String, Any> {
     val currentActivity = reactApplicationContext.currentActivity
-    val statusBarColor =
-        currentActivity?.window?.statusBarColor?.let { color ->
-          String.format("#%06X", 0xFFFFFF and color)
-        } ?: "black"
     return mapOf(
         HEIGHT_KEY to PixelUtil.toDIPFromPixel(getStatusBarHeightPx(currentActivity).toFloat()),
-        DEFAULT_BACKGROUND_COLOR_KEY to statusBarColor,
-    )
-  }
-
-  @Suppress("DEPRECATION")
-  override fun setColor(colorDouble: Double, animated: Boolean) {
-    val color = colorDouble.toInt()
-    val activity = reactApplicationContext.getCurrentActivity()
-    if (activity == null) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is null.",
-      )
-      return
-    }
-    if (isEdgeToEdgeFeatureFlagOn) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.",
-      )
-      return
-    }
-    UiThreadUtil.runOnUiThread(
-        object : GuardedRunnable(reactApplicationContext) {
-          override fun runGuarded() {
-            val window = activity.window ?: return
-            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
-            if (animated) {
-              val curColor = window.statusBarColor
-              val colorAnimation = ValueAnimator.ofObject(ArgbEvaluator(), curColor, color)
-              colorAnimation.addUpdateListener { animator ->
-                activity.window?.statusBarColor = (animator.animatedValue as Int)
-              }
-              colorAnimation.setDuration(300).startDelay = 0
-              colorAnimation.start()
-            } else {
-              window.statusBarColor = color
-            }
-          }
-        }
-    )
-  }
-
-  override fun setTranslucent(translucent: Boolean) {
-    val activity = reactApplicationContext.getCurrentActivity()
-    if (activity == null) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is null.",
-      )
-      return
-    }
-    if (isEdgeToEdgeFeatureFlagOn) {
-      FLog.w(
-          ReactConstants.TAG,
-          "StatusBarModule: Ignored status bar change, current activity is edge-to-edge.",
-      )
-      return
-    }
-    UiThreadUtil.runOnUiThread(
-        object : GuardedRunnable(reactApplicationContext) {
-          override fun runGuarded() {
-            activity.window?.setStatusBarTranslucency(translucent)
-          }
-        }
     )
   }
 
@@ -151,6 +75,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
       return
     }
     UiThreadUtil.runOnUiThread {
+      if (activity.isFinishing || activity.isDestroyed) return@runOnUiThread
       activity.window?.setStatusBarVisibility(hidden)
       extraWindows.forEach { it.setStatusBarVisibility(hidden) }
     }
@@ -166,6 +91,7 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
       return
     }
     UiThreadUtil.runOnUiThread {
+      if (activity.isFinishing || activity.isDestroyed) return@runOnUiThread
       activity.window?.setStatusBarStyle(style)
       extraWindows.forEach { it.setStatusBarStyle(style) }
     }
@@ -173,7 +99,6 @@ internal class StatusBarModule(reactContext: ReactApplicationContext?) :
 
   companion object {
     private const val HEIGHT_KEY = "HEIGHT"
-    private const val DEFAULT_BACKGROUND_COLOR_KEY = "DEFAULT_BACKGROUND_COLOR"
     const val NAME: String = NativeStatusBarManagerAndroidSpec.NAME
     private val extraWindows = Collections.newSetFromMap<Window>(WeakHashMap())
   }

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

@@ -13,7 +13,7 @@ public object ReactNativeVersion {
   @JvmField
   public val VERSION: Map<String, Any?> = mapOf(
     "major" to 0,
-    "minor" to 86,
+    "minor" to 87,
     "patch" to 0,
     "prerelease" to null
   )

package/ReactAndroid/src/main/java/com/facebook/react/modules/websocket/WebSocketModule.kt

@@ -154,8 +154,8 @@ public class WebSocketModule(context: ReactApplicationContext) :
             sendEvent("websocketOpen", params)
           }
 
-          override fun onClosing(websocket: WebSocket, code: Int, reason: String) {
-            websocket.close(code, reason)
+          override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
+            webSocket.close(code, reason)
           }
 
           override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {

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

@@ -77,7 +77,7 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
   }
 
   override fun callFunction(module: String, method: String, arguments: NativeArray?) {
-    throw UnsupportedOperationException("Unimplemented method 'callFunction'")
+    reactHost.callFunctionOnModule(module, method, arguments)
   }
 
   override fun destroy() {

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

@@ -17,10 +17,10 @@ import com.facebook.react.bridge.CatalystInstance
 import com.facebook.react.bridge.JavaScriptContextHolder
 import com.facebook.react.bridge.JavaScriptModule
 import com.facebook.react.bridge.JavaScriptModuleRegistry
-import com.facebook.react.bridge.NativeArray
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactSoftExceptionLogger.logSoftException
+import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
@@ -56,7 +56,10 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
     get() = reactHost.defaultBackButtonHandler
 
   init {
-    if (ReactNativeNewArchitectureFeatureFlags.useFabricInterop()) {
+    if (
+        !ReactBuildConfig.UNSTABLE_REMOVE_LEGACY_COMPONENT_INTEROP &&
+            ReactNativeNewArchitectureFeatureFlags.useFabricInterop()
+    ) {
       initializeInteropModules()
     }
   }
@@ -117,8 +120,8 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
       private val reactHost: ReactHostImpl,
       private val jsModuleInterface: Class<out JavaScriptModule>,
   ) : InvocationHandler {
-    override fun invoke(proxy: Any, method: Method, args: Array<Any?>): Any? {
-      val jsArgs: NativeArray = Arguments.fromJavaArgs(args)
+    override fun invoke(proxy: Any, method: Method, args: Array<Any?>?): Any? {
+      val jsArgs = if (args != null) Arguments.fromJavaArgs(args) else null
       reactHost.callFunctionOnModule(
           JavaScriptModuleRegistry.getJSModuleName(jsModuleInterface),
           method.name,
@@ -181,4 +184,6 @@ internal class BridgelessReactContext(context: Context, private val reactHost: R
   }
 
   override fun getJSCallInvokerHolder(): CallInvokerHolder? = reactHost.jsCallInvokerHolder
+
+  override fun getRuntimeExecutor(): RuntimeExecutor? = reactHost.runtimeExecutor
 }

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

@@ -113,14 +113,6 @@ public class ReactHostImpl(
               applicationContext = context.applicationContext,
               reactInstanceManagerHelper = reactHostImplDevHelper,
               packagerPathForJSBundleName = reactHostDelegate.jsMainModulePath,
-              enableOnCreate = true,
-              redBoxHandler = null,
-              devBundleDownloadListener = null,
-              minNumShakes = 2,
-              customPackagerCommandHandlers = null,
-              surfaceDelegateFactory = null,
-              devLoadingViewManager = null,
-              pausedInDebuggerOverlayManager = null,
               useDevSupport = useDevSupport,
           )
           .also { devSupportManager ->
@@ -156,12 +148,14 @@ public class ReactHostImpl(
 
   @Volatile private var hostInvalidated = false
 
+  @JvmOverloads
   public constructor(
       context: Context,
       delegate: ReactHostDelegate,
       componentFactory: ComponentFactory,
       allowPackagerServerAccess: Boolean,
       useDevSupport: Boolean,
+      devSupportManagerFactory: DevSupportManagerFactory? = null,
   ) : this(
       context,
       delegate,
@@ -170,6 +164,7 @@ public class ReactHostImpl(
       Task.UI_THREAD_EXECUTOR,
       allowPackagerServerAccess,
       useDevSupport,
+      devSupportManagerFactory,
   )
 
   public override val lifecycleState: LifecycleState
@@ -806,7 +801,7 @@ public class ReactHostImpl(
   internal fun callFunctionOnModule(
       moduleName: String,
       methodName: String,
-      args: NativeArray,
+      args: NativeArray?,
   ): Task<Boolean> {
     val method = "callFunctionOnModule(\"$moduleName\", \"$methodName\")"
     return callWithExistingReactInstance(method) { reactInstance: ReactInstance ->
@@ -856,16 +851,6 @@ public class ReactHostImpl(
           ReactNativeNewArchitectureFeatureFlags.enableBridgelessArchitecture(),
           "enableBridgelessArchitecture FeatureFlag must be set to start ReactNative.",
       )
-
-      Assertions.assertCondition(
-          ReactNativeNewArchitectureFeatureFlags.enableFabricRenderer(),
-          "enableFabricRenderer FeatureFlag must be set to start ReactNative.",
-      )
-
-      Assertions.assertCondition(
-          ReactNativeNewArchitectureFeatureFlags.useTurboModules(),
-          "useTurboModules FeatureFlag must be set to start ReactNative.",
-      )
     }
     if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
       Assertions.assertCondition(

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

@@ -44,7 +44,6 @@ import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.devsupport.InspectorFlags.getIsProfilingBuild
 import com.facebook.react.devsupport.StackTraceHelper
 import com.facebook.react.devsupport.interfaces.DevSupportManager
-import com.facebook.react.fabric.AnimationBackendChoreographer
 import com.facebook.react.fabric.ComponentFactory
 import com.facebook.react.fabric.FabricUIManager
 import com.facebook.react.fabric.FabricUIManagerBinding
@@ -259,8 +258,6 @@ internal class ReactInstance(
     // Misc initialization that needs to be done before Fabric init
     DisplayMetricsHolder.initDisplayMetricsIfNotInitialized(context)
 
-    val animationBackendChoreographer = AnimationBackendChoreographer(context)
-
     val binding = FabricUIManagerBinding()
     binding.register(
         getBufferedRuntimeExecutor(),
@@ -268,7 +265,6 @@ internal class ReactInstance(
         fabricUIManager,
         eventBeatManager,
         componentFactory,
-        animationBackendChoreographer,
     )
 
     // Initialize the FabricUIManager
@@ -462,7 +458,7 @@ internal class ReactInstance(
 
   private external fun getJavaScriptContext(): Long
 
-  external fun callFunctionOnModule(moduleName: String, methodName: String, args: NativeArray)
+  external fun callFunctionOnModule(moduleName: String, methodName: String, args: NativeArray?)
 
   private external fun registerSegmentNative(segmentId: Int, segmentPath: String)
 

package/ReactAndroid/src/main/java/com/facebook/react/touch/ReactInterceptingViewGroup.kt

@@ -10,10 +10,10 @@ package com.facebook.react.touch
 import android.view.ViewGroup
 
 /**
- * This interface should be implemented by all [ViewGroup] subviews that can be instantiating by
- * [com.facebook.react.uimanager.NativeViewHierarchyManager]. It is used to configure
- * onInterceptTouch event listener which then is used to control touch event flow in cases in which
- * they requested to be intercepted by some parent view based on a JS gesture detector.
+ * This interface should be implemented by all [ViewGroup] subviews managed by React Native. It is
+ * used to configure onInterceptTouch event listener which then is used to control touch event flow
+ * in cases in which they requested to be intercepted by some parent view based on a JS gesture
+ * detector.
  */
 internal interface ReactInterceptingViewGroup {
 

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

@@ -8,13 +8,13 @@
 package com.facebook.react.uimanager;
 
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.os.Build;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
 import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
@@ -285,12 +285,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
 
   @ReactProp(name = ViewProps.Z_INDEX)
   public void setZIndex(@NonNull T view, float zIndex) {
-    int integerZIndex = Math.round(zIndex);
-    ViewGroupManager.setViewZIndex(view, integerZIndex);
-    ViewParent parent = view.getParent();
-    if (parent instanceof ReactZIndexedViewGroup) {
-      ((ReactZIndexedViewGroup) parent).updateDrawingOrder();
-    }
+    // No-op: Z-order is managed at the C++ layer in Fabric
   }
 
   @ReactProp(name = ViewProps.RENDER_TO_HARDWARE_TEXTURE)
@@ -315,7 +310,8 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
 
   @ReactProp(name = ViewProps.ACCESSIBILITY_LABELLED_BY)
   public void setAccessibilityLabelledBy(@NonNull T view, @Nullable Dynamic nativeId) {
-    if (nativeId.isNull()) {
+    if (nativeId == null || nativeId.isNull()) {
+      view.setTag(R.id.labelled_by, null);
       return;
     }
     if (nativeId.getType() == ReadableType.String) {
@@ -323,7 +319,8 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     } else if (nativeId.getType() == ReadableType.Array) {
       // On Android, this takes a single View as labeledBy. If an array is specified, set the first
       // element in the tag.
-      view.setTag(R.id.labelled_by, nativeId.asArray().getString(0));
+      ReadableArray array = nativeId.asArray();
+      view.setTag(R.id.labelled_by, array.size() > 0 ? array.getString(0) : null);
     }
   }
 
@@ -583,6 +580,31 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       view.setScaleX(1);
       view.setScaleY(1);
       view.setCameraDistance(0);
+      clearSkewAnimationMatrixIfActive(view);
+      return;
+    }
+
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
+        && SkewMatrixHelper.isAffine2DTransformWithSkew(transforms)) {
+      Matrix affine =
+          SkewMatrixHelper.buildAffine2DMatrix(
+              transforms,
+              PixelUtil.toDIPFromPixel(view.getWidth()),
+              PixelUtil.toDIPFromPixel(view.getHeight()),
+              transformOrigin);
+      view.setTranslationX(0);
+      view.setTranslationY(0);
+      view.setRotation(0);
+      view.setRotationX(0);
+      view.setRotationY(0);
+      view.setScaleX(1);
+      view.setScaleY(1);
+      view.setCameraDistance(0);
+      view.setAnimationMatrix(affine);
+      // Tag value is the matrix itself so TouchTargetHelper can use it for hit testing -- View's
+      // own getMatrix() does not compose mAnimationMatrix, so without this fallback the React
+      // hit-test path would still see the original rectangular bounds.
+      view.setTag(R.id.skew_animation_matrix, affine);
       return;
     }
 
@@ -632,6 +654,21 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
               scale * scale * cameraDistance * CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER);
       view.setCameraDistance(normalizedCameraDistance);
     }
+
+    clearSkewAnimationMatrixIfActive(view);
+  }
+
+  // setAnimationMatrix is called only on the transition out of a skew matrix; calling it
+  // unconditionally would invalidate the View's RenderNode every frame for any non-skew animation.
+  private static <T extends View> void clearSkewAnimationMatrixIfActive(@NonNull T view) {
+    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
+      return;
+    }
+    if (view.getTag(R.id.skew_animation_matrix) == null) {
+      return;
+    }
+    view.setAnimationMatrix(null);
+    view.setTag(R.id.skew_animation_matrix, null);
   }
 
   /**