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

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

@@ -8,10 +8,12 @@
 package com.facebook.react.uimanager
 
 import android.graphics.Point
-import android.graphics.Rect
 import android.view.View
 import androidx.annotation.UiThread
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import com.facebook.infer.annotation.Assertions
+import com.facebook.react.views.view.isEdgeToEdgeFeatureFlagOn
 
 public object RootViewUtil {
   /** Returns the root view of a given view in a react application. */
@@ -34,12 +36,20 @@ public object RootViewUtil {
     val locationInWindow = IntArray(2)
     v.getLocationInWindow(locationInWindow)
 
-    // we need to subtract visibleWindowCoords - to subtract possible window insets, split
-    // screen or multi window
-    val visibleWindowFrame = Rect()
-    v.getWindowVisibleDisplayFrame(visibleWindowFrame)
-    locationInWindow[0] -= visibleWindowFrame.left
-    locationInWindow[1] -= visibleWindowFrame.top
+    if (!isEdgeToEdgeFeatureFlagOn) {
+      // When not in edge-to-edge mode, subtract the top system bar insets so the offset is
+      // relative to the content area (below the status bar / cutout).
+      ViewCompat.getRootWindowInsets(v)?.apply {
+        val insets =
+            getInsets(
+                WindowInsetsCompat.Type.statusBars() or WindowInsetsCompat.Type.displayCutout()
+            )
+
+        locationInWindow[0] -= insets.left
+        locationInWindow[1] -= insets.top
+      }
+    }
+
     return Point(locationInWindow[0], locationInWindow[1])
   }
 }

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

@@ -11,6 +11,7 @@ package com.facebook.react.uimanager
 
 import android.app.Activity
 import android.content.Context
+import android.view.Window
 import com.facebook.react.bridge.Callback
 import com.facebook.react.bridge.CatalystInstance
 import com.facebook.react.bridge.JavaScriptContextHolder
@@ -22,6 +23,7 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ScrollEndedListeners
 import com.facebook.react.bridge.UIManager
 import com.facebook.react.common.annotations.internal.LegacyArchitecture
+import com.facebook.react.interfaces.ExtraWindowEventListener
 import com.facebook.react.turbomodule.core.interfaces.CallInvokerHolder
 
 /**
@@ -67,6 +69,22 @@ public class ThemedReactContext(
     reactApplicationContext.removeLifecycleEventListener(listener)
   }
 
+  override fun addExtraWindowEventListener(listener: ExtraWindowEventListener) {
+    reactApplicationContext.addExtraWindowEventListener(listener)
+  }
+
+  override fun removeExtraWindowEventListener(listener: ExtraWindowEventListener) {
+    reactApplicationContext.removeExtraWindowEventListener(listener)
+  }
+
+  override fun onExtraWindowCreate(window: Window) {
+    reactApplicationContext.onExtraWindowCreate(window)
+  }
+
+  override fun onExtraWindowDestroy(window: Window) {
+    reactApplicationContext.onExtraWindowDestroy(window)
+  }
+
   override fun hasCurrentActivity(): Boolean = reactApplicationContext.hasCurrentActivity()
 
   override fun getCurrentActivity(): Activity? = reactApplicationContext.getCurrentActivity()

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

@@ -16,8 +16,6 @@ import com.facebook.common.logging.FLog
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.ReactConstants
 import com.facebook.react.touch.ReactHitSlopView
-import com.facebook.react.uimanager.common.UIManagerType
-import com.facebook.react.uimanager.common.ViewUtil
 import java.util.EnumSet
 
 /**
@@ -86,7 +84,7 @@ public object TouchTargetHelper {
     // Store eventCoords in array so that they are modified to be relative to the targetView found.
     viewCoords[0] = eventX
     viewCoords[1] = eventY
-    val nativeTargetView = findTouchTargetViewWithPointerEvents(viewCoords, viewGroup, null)
+    val nativeTargetView = findTouchTargetViewWithPointerEvents(viewCoords, viewGroup)
     if (nativeTargetView != null) {
       val reactTargetView = findClosestReactAncestor(nativeTargetView)
       if (reactTargetView != null) {
@@ -193,10 +191,7 @@ public object TouchTargetHelper {
         if (view is ReactOverflowViewWithInset) {
           // If the touch point is outside of the overflow inset for the view, we can safely ignore
           // it.
-          if (
-              ViewUtil.getUIManagerType(view.id) == UIManagerType.FABRIC &&
-                  !isTouchPointInViewWithOverflowInset(eventCoords[0], eventCoords[1], view)
-          ) {
+          if (!isTouchPointInViewWithOverflowInset(eventCoords[0], eventCoords[1], view)) {
             return null
           }
 
@@ -217,7 +212,11 @@ public object TouchTargetHelper {
       for (i in childrenCount - 1 downTo 0) {
         val child = viewGroup.getChildAt(i)
         val childPoint = tempPoint
-        getChildPoint(eventCoords[0], eventCoords[1], viewGroup, child, childPoint)
+        if (!getChildPoint(eventCoords[0], eventCoords[1], viewGroup, child, childPoint)) {
+          // Child's transform is non-invertible (e.g. scaleX: 0 or scaleY: 0): the child is
+          // visually degenerate, so it must not receive touches.
+          continue
+        }
         // The childPoint value will contain the view coordinates relative to the child.
         // We need to store the existing X,Y for the viewGroup away as it is possible this child
         // will not actually be the target and so we restore them if not
@@ -282,7 +281,13 @@ public object TouchTargetHelper {
   /**
    * Returns the coordinates of a touch in the child View. It is transform-aware and will invert the
    * transform Matrix to find the true local points. This code is taken from {@link
-   * ViewGroup#isTransformedTouchPointInView()}
+   * ViewGroup#isTransformedTouchPointInView()}.
+   *
+   * Returns `true` when [outLocalPoint] was populated with coordinates in the child's coordinate
+   * space. Returns `false` when the child's transform matrix is not invertible (for example
+   * `scaleX: 0` or `scaleY: 0`). On `false`, [outLocalPoint] is left in an indeterminate state and
+   * callers must skip the child — the shared [inverseMatrix] field is retained from the previous
+   * successful `invert`, so using it here would leak coordinates from another view.
    */
   private fun getChildPoint(
       x: Float,
@@ -290,21 +295,24 @@ public object TouchTargetHelper {
       parent: ViewGroup,
       child: View,
       outLocalPoint: PointF,
-  ) {
+  ): Boolean {
     var localX = x + parent.scrollX - child.left
     var localY = y + parent.scrollY - child.top
     val matrix = child.matrix
     if (!matrix.isIdentity) {
+      val inverseMatrix = inverseMatrix
+      if (!matrix.invert(inverseMatrix)) {
+        return false
+      }
       val localXY = matrixTransformCoords
       localXY[0] = localX
       localXY[1] = localY
-      val inverseMatrix = inverseMatrix
-      matrix.invert(inverseMatrix)
       inverseMatrix.mapPoints(localXY)
       localX = localXY[0]
       localY = localXY[1]
     }
     outLocalPoint.set(localX, localY)
+    return true
   }
 
   /**

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

@@ -9,12 +9,16 @@ package com.facebook.react.uimanager
 
 import com.facebook.common.logging.FLog
 import com.facebook.react.bridge.NativeArray
+import com.facebook.react.bridge.ReactNativeJNISoLoader
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.ReadableType
 import com.facebook.react.common.ReactConstants
 
 public object TransformHelper {
+  init {
+    ReactNativeJNISoLoader.staticInit()
+  }
 
   private val helperMatrix: ThreadLocal<DoubleArray> =
       object : ThreadLocal<DoubleArray>() {
@@ -40,16 +44,16 @@ public object TransformHelper {
   }
 
   @Deprecated(
-      "Use processTransform(ReadableArray, DoubleArray, Float, Float, ReadableArray, Boolean) instead",
+      "Use processTransform(ReadableArray, DoubleArray, Float, Float, ReadableArray) instead",
       ReplaceWith("processTransform(...)"),
   )
   @JvmStatic
   public fun processTransform(transforms: ReadableArray, result: DoubleArray) {
-    processTransform(transforms, result, 0f, 0f, null, false)
+    processTransform(transforms, result, 0f, 0f, null)
   }
 
   @Deprecated(
-      "Use processTransform(ReadableArray, DoubleArray, Float, Float, ReadableArray, Boolean) instead",
+      "Use processTransform(ReadableArray, DoubleArray, Float, Float, ReadableArray) instead",
       ReplaceWith("processTransform(...)"),
   )
   @JvmStatic
@@ -59,8 +63,9 @@ public object TransformHelper {
       viewWidth: Float,
       viewHeight: Float,
       transformOrigin: ReadableArray?,
+      allowPercentageResolution: Boolean,
   ) {
-    processTransform(transforms, result, viewWidth, viewHeight, transformOrigin, false)
+    processTransform(transforms, result, viewWidth, viewHeight, transformOrigin)
   }
 
   @JvmStatic
@@ -70,9 +75,8 @@ public object TransformHelper {
       viewWidth: Float,
       viewHeight: Float,
       transformOrigin: ReadableArray?,
-      allowPercentageResolution: Boolean,
   ) {
-    if (allowPercentageResolution && transforms is NativeArray && transformOrigin is NativeArray?) {
+    if (transforms is NativeArray && transformOrigin is NativeArray?) {
       nativeProcessTransform(transforms, result, viewWidth, viewHeight, transformOrigin)
       return
     }
@@ -84,7 +88,6 @@ public object TransformHelper {
             viewWidth,
             viewHeight,
             transformOrigin,
-            allowPercentageResolution,
         )
 
     if (offsets != null) {
@@ -144,11 +147,11 @@ public object TransformHelper {
           "translate" -> {
             val value = transform.getArray(transformType)!!
             val x =
-                if (value.getType(0) == ReadableType.String && allowPercentageResolution)
+                if (value.getType(0) == ReadableType.String)
                     parseTranslateValue(value.getString(0)!!, viewWidth.toDouble())
                 else value.getDouble(0)
             val y =
-                if (value.getType(1) == ReadableType.String && allowPercentageResolution)
+                if (value.getType(1) == ReadableType.String)
                     parseTranslateValue(value.getString(1)!!, viewHeight.toDouble())
                 else value.getDouble(1)
             val z = if (value.size() > 2) value.getDouble(2) else 0.0
@@ -156,20 +159,14 @@ public object TransformHelper {
           }
           "translateX" -> {
             val translateValue =
-                if (
-                    transform.getType(transformType) == ReadableType.String &&
-                        allowPercentageResolution
-                )
+                if (transform.getType(transformType) == ReadableType.String)
                     parseTranslateValue(transform.getString(transformType)!!, viewWidth.toDouble())
                 else transform.getDouble(transformType)
             MatrixMathHelper.applyTranslate2D(helperMatrix, translateValue, 0.0)
           }
           "translateY" -> {
             val translateValue =
-                if (
-                    transform.getType(transformType) == ReadableType.String &&
-                        allowPercentageResolution
-                )
+                if (transform.getType(transformType) == ReadableType.String)
                     parseTranslateValue(transform.getString(transformType)!!, viewHeight.toDouble())
                 else transform.getDouble(transformType)
             MatrixMathHelper.applyTranslate2D(helperMatrix, 0.0, translateValue)
@@ -210,7 +207,6 @@ public object TransformHelper {
       viewWidth: Float,
       viewHeight: Float,
       transformOrigin: ReadableArray?,
-      allowPercentageResolution: Boolean,
   ): DoubleArray? {
     if (transformOrigin == null || (viewHeight == 0f && viewWidth == 0f)) {
       return null
@@ -224,12 +220,10 @@ public object TransformHelper {
       when (transformOrigin.getType(i)) {
         ReadableType.Number -> origin[i] = transformOrigin.getDouble(i)
         ReadableType.String -> {
-          if (allowPercentageResolution) {
-            val part = transformOrigin.getString(i)!!
-            if (part.endsWith("%")) {
-              val valPercent = part.dropLast(1).toDouble()
-              origin[i] = (if (i == 0) viewWidth else viewHeight) * valPercent / 100.0
-            }
+          val part = transformOrigin.getString(i)!!
+          if (part.endsWith("%")) {
+            val valPercent = part.dropLast(1).toDouble()
+            origin[i] = (if (i == 0) viewWidth else viewHeight) * valPercent / 100.0
           }
         }
         else -> {}

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

@@ -11,8 +11,10 @@ import com.facebook.proguard.annotations.DoNotStripAny
 import com.facebook.react.bridge.NativeMap
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.soloader.SoLoader
+import com.facebook.soloader.annotation.SoLoaderLibrary
 import kotlin.jvm.JvmStatic
 
+@SoLoaderLibrary("uimanagerjni")
 @DoNotStripAny
 internal object UIConstantsProviderBinding {
   init {

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

@@ -58,6 +58,7 @@ public class UIImplementation {
   /**
    * @deprecated This method is a stub and always returns null.
    */
+  @Deprecated
   protected ReactShadowNode createRootShadowNode() {
     return null;
   }
@@ -65,6 +66,7 @@ public class UIImplementation {
   /**
    * @deprecated This method is a stub and always returns null.
    */
+  @Deprecated
   protected ReactShadowNode createShadowNode(String className) {
     return null;
   }
@@ -72,6 +74,7 @@ public class UIImplementation {
   /**
    * @deprecated This method is a stub and always returns null.
    */
+  @Deprecated
   public final ReactShadowNode resolveShadowNode(int reactTag) {
     return null;
   }
@@ -79,6 +82,7 @@ public class UIImplementation {
   /**
    * @deprecated This method is a stub and always returns null.
    */
+  @Deprecated
   protected final @Nullable ViewManager resolveViewManager(String className) {
     return null;
   }

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

@@ -14,16 +14,11 @@ import android.content.ContextWrapper
 import android.view.View
 import android.widget.EditText
 import androidx.core.view.ViewCompat
-import com.facebook.react.bridge.CatalystInstance
 import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReactNoCrashSoftException
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.UIManager
-import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel
-import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger
-import com.facebook.react.common.build.ReactBuildConfig
 import com.facebook.react.uimanager.common.UIManagerType
-import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
 import com.facebook.react.uimanager.events.EventDispatcher
 import com.facebook.react.uimanager.events.EventDispatcherProvider
 
@@ -38,78 +33,31 @@ public object UIManagerHelper {
   /** @return a [UIManager] that can handle the react tag received by parameter. */
   @JvmStatic
   public fun getUIManagerForReactTag(context: ReactContext, reactTag: Int): UIManager? =
-      getUIManager(context, getUIManagerType(reactTag))
+      getUIManager(context, UIManagerType.FABRIC)
 
   /** @return a [UIManager] that can handle the react tag received by parameter. */
   @JvmStatic
-  public fun getUIManager(context: ReactContext, @UIManagerType uiManagerType: Int): UIManager? =
-      getUIManager(context, uiManagerType, true)
-
-  @JvmStatic
-  private fun getUIManager(
-      context: ReactContext,
-      @UIManagerType uiManagerType: Int,
-      returnNullIfCatalystIsInactive: Boolean,
-  ): UIManager? {
-    if (ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE || context.isBridgeless()) {
-      val uiManager = context.getFabricUIManager()
-      if (uiManager == null) {
-        ReactSoftExceptionLogger.logSoftException(
-            TAG,
-            ReactNoCrashSoftException(
-                "Cannot get UIManager because the instance hasn't been initialized yet."
-            ),
-        )
-        return null
-      }
-      return uiManager
-    }
-
-    // The following code is compiled-out when `context.isBridgeless() == true &&
-    // ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true ` because:
-    // - BridgelessReactContext.isBridgeless() is set to true statically
-    // - BridgeReactContext is compiled-out when UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE == true
-    //
-    // To detect a potential regression we add the following assertion ERROR
-    LegacyArchitectureLogger.assertLegacyArchitecture(
-        "UIManagerHelper.getUIManager(context, uiManagerType)",
-        LegacyArchitectureLogLevel.ERROR,
-    )
-    if (!context.hasCatalystInstance()) {
+  public fun getUIManager(context: ReactContext, @UIManagerType uiManagerType: Int): UIManager? {
+    if (!context.hasActiveReactInstance()) {
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           ReactNoCrashSoftException(
-              "Cannot get UIManager because the context doesn't contain a CatalystInstance."
+              "Cannot get UIManager because the context doesn't contain an active React instance."
           ),
       )
       return null
     }
-    // TODO T60461551: add tests to verify emission of events when the ReactContext is being turn
-    // down.
-    if (!context.hasActiveReactInstance()) {
+
+    val uiManager = context.getFabricUIManager()
+    if (uiManager == null) {
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           ReactNoCrashSoftException(
-              "Cannot get UIManager because the context doesn't contain an active" +
-                  " CatalystInstance."
+              "Cannot get UIManager because the instance hasn't been initialized yet."
           ),
       )
-      if (returnNullIfCatalystIsInactive) {
-        return null
-      }
-    }
-    val catalystInstance: CatalystInstance = context.getCatalystInstance()
-    try {
-      return if (uiManagerType == UIManagerType.Companion.FABRIC) context.getFabricUIManager()
-      else catalystInstance.getNativeModule<UIManagerModule>(UIManagerModule::class.java)
-    } catch (_: IllegalArgumentException) {
-      // TODO T67518514 Clean this up once we migrate everything over to bridgeless mode
-      ReactSoftExceptionLogger.logSoftException(
-          TAG,
-          ReactNoCrashSoftException("Cannot get UIManager for UIManagerType: $uiManagerType"),
-      )
-      return catalystInstance.getNativeModule<UIManagerModule>(UIManagerModule::class.java)
     }
+    return uiManager
   }
 
   /** @return the [EventDispatcher] that handles events for the given [ReactContext]. */
@@ -170,15 +118,7 @@ public object UIManagerHelper {
   public fun getSurfaceId(view: View): Int {
     if (view is ReactRoot) {
       val rootView = view as ReactRoot
-      return if (rootView.getUIManagerType() == UIManagerType.FABRIC) rootView.getRootViewTag()
-      else -1
-    }
-
-    val reactTag = view.id
-
-    // In non-Fabric we don't have (or use) SurfaceId
-    if (getUIManagerType(reactTag) == UIManagerType.LEGACY) {
-      return -1
+      return rootView.getRootViewTag()
     }
 
     var context = view.context
@@ -192,7 +132,7 @@ public object UIManagerHelper {
       ReactSoftExceptionLogger.logSoftException(
           TAG,
           IllegalStateException(
-              "Fabric View [$reactTag] does not have SurfaceId associated with it"
+              "Fabric View [${view.id}] does not have SurfaceId associated with it"
           ),
       )
     }

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

@@ -10,7 +10,6 @@ package com.facebook.react.uimanager;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_END;
 import static com.facebook.react.bridge.ReactMarkerConstants.CREATE_UI_MANAGER_MODULE_CONSTANTS_START;
 import static com.facebook.react.uimanager.common.UIManagerType.FABRIC;
-import static com.facebook.react.uimanager.common.UIManagerType.LEGACY;
 
 import android.content.ComponentCallbacks2;
 import android.content.res.Configuration;
@@ -44,7 +43,6 @@ import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.module.annotations.ReactModule;
 import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.EventDispatcher;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.facebook.react.uimanager.internal.LegacyArchitectureShadowNodeLogger;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
@@ -511,9 +509,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
       int reactTag, Dynamic commandId, @Nullable ReadableArray commandArgs) {
     // Fabric dispatchCommands should go through the JSI API - this will crash in Fabric.
     @Nullable
-    UIManager uiManager =
-        UIManagerHelper.getUIManager(
-            getReactApplicationContext(), ViewUtil.getUIManagerType(reactTag));
+    UIManager uiManager = UIManagerHelper.getUIManager(getReactApplicationContext(), FABRIC);
     if (uiManager == null) {
       return;
     }
@@ -567,16 +563,13 @@ public class UIManagerModule extends ReactContextBaseJavaModule
     return null;
   }
 
+  @Override
   @ReactMethod
   public void sendAccessibilityEvent(int tag, int eventType) {
-    int uiManagerType = ViewUtil.getUIManagerType(tag);
-    if (uiManagerType == FABRIC) {
-      // TODO: T65793557 Refactor sendAccessibilityEvent to use ViewCommands
-      UIManager fabricUIManager =
-          UIManagerHelper.getUIManager(getReactApplicationContext(), uiManagerType);
-      if (fabricUIManager != null) {
-        fabricUIManager.sendAccessibilityEvent(tag, eventType);
-      }
+    // TODO: T65793557 Refactor sendAccessibilityEvent to use ViewCommands
+    UIManager fabricUIManager = UIManagerHelper.getUIManager(getReactApplicationContext(), FABRIC);
+    if (fabricUIManager != null) {
+      fabricUIManager.sendAccessibilityEvent(tag, eventType);
     }
   }
 
@@ -601,10 +594,12 @@ public class UIManagerModule extends ReactContextBaseJavaModule
    */
   public void prependUIBlock(UIBlock block) {}
 
+  @Override
   public void addUIManagerEventListener(UIManagerListener listener) {
     mUIManagerListeners.add(listener);
   }
 
+  @Override
   public void removeUIManagerEventListener(UIManagerListener listener) {
     mUIManagerListeners.remove(listener);
   }
@@ -631,6 +626,7 @@ public class UIManagerModule extends ReactContextBaseJavaModule
    * Updates the styles of the {@link ReactShadowNode} based on the Measure specs received by
    * parameters. offsetX and offsetY aren't used in non-Fabric, so they're ignored here.
    */
+  @Override
   public void updateRootLayoutSpecs(
       final int rootViewTag,
       final int widthMeasureSpec,
@@ -665,9 +661,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule
   @Override
   public void receiveEvent(
       int surfaceId, int reactTag, String eventName, @Nullable WritableMap event) {
-    assert ViewUtil.getUIManagerType(reactTag) == LEGACY;
-    getReactApplicationContext()
-        .getJSModule(RCTEventEmitter.class)
-        .receiveEvent(reactTag, eventName, event);
+    assert false;
   }
 }

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

@@ -8,6 +8,7 @@
 package com.facebook.react.uimanager.common
 
 import android.view.View
+import com.facebook.react.common.annotations.internal.LegacyArchitecture
 
 /**
  * Utility object providing helper methods for working with React Native views.
@@ -33,53 +34,51 @@ public object ViewUtil {
    * https://github.com/facebook/react/pull/12587
    *
    * @param viewTag tag of the view this is event is dispatched to
+   * @deprecated Fabric is now the only supported UIManager. This method always returns
+   *   [UIManagerType.FABRIC].
    */
+  @Deprecated(
+      "Fabric is now the only supported UIManager. This method always returns UIManagerType.FABRIC.",
+      ReplaceWith("UIManagerType.FABRIC"),
+  )
+  @LegacyArchitecture
   @JvmStatic
   @UIManagerType
-  public fun getUIManagerType(viewTag: Int): Int =
-      if (viewTag % 2 == 0) {
-        UIManagerType.FABRIC
-      } else {
-        UIManagerType.LEGACY
-      }
+  public fun getUIManagerType(viewTag: Int): Int = UIManagerType.FABRIC
 
   /**
    * Overload for [getUIManagerType] that uses the view's id to determine if it originated from
    * Fabric
+   *
+   * @deprecated Fabric is now the only supported UIManager. This method always returns
+   *   [UIManagerType.FABRIC].
    */
-  @JvmStatic @UIManagerType public fun getUIManagerType(view: View): Int = getUIManagerType(view.id)
+  @Deprecated(
+      "Fabric is now the only supported UIManager. This method always returns UIManagerType.FABRIC.",
+      ReplaceWith("UIManagerType.FABRIC"),
+  )
+  @LegacyArchitecture
+  @JvmStatic
+  @UIManagerType
+  public fun getUIManagerType(view: View): Int = UIManagerType.FABRIC
 
   /**
    * Version of getUIManagerType that uses both surfaceId and viewTag heuristics
    *
    * @param viewTag tag of the view this is event is dispatched to
    * @param surfaceId ID of the corresponding surface
+   * @deprecated Fabric is now the only supported UIManager. This method always returns
+   *   [UIManagerType.FABRIC].
    */
-  @Suppress("DEPRECATION")
+  @Deprecated(
+      "Fabric is now the only supported UIManager. This method always returns UIManagerType.FABRIC.",
+      ReplaceWith("UIManagerType.FABRIC"),
+  )
+  @LegacyArchitecture
+  @Suppress("UNUSED_PARAMETER")
   @JvmStatic
   @UIManagerType
-  public fun getUIManagerType(viewTag: Int, surfaceId: Int): Int {
-    // We have a contract that Fabric events *always* have a SurfaceId passed in, and non-Fabric
-    // events NEVER have a SurfaceId passed in (the default/placeholder of -1 is passed in instead).
-    //
-    // Why does this matter?
-    // Events can be sent to Views that are part of the View hierarchy *but not directly managed
-    // by React Native*. For example, embedded custom hierarchies, Litho hierarchies, etc.
-    // In those cases it's important to know that the Event should be sent to the Fabric or
-    // non-Fabric UIManager, and we cannot use the ViewTag for inference since it's not controlled
-    // by RN and is essentially a random number.
-    // At some point it would be great to pass the SurfaceContext here instead.
-    @UIManagerType
-    val uiManagerType = if (surfaceId == -1) UIManagerType.LEGACY else UIManagerType.FABRIC
-    if (uiManagerType == UIManagerType.LEGACY && !isRootTag(viewTag)) {
-      // TODO (T123064648): Some events for Fabric still didn't have the surfaceId set, so if it's
-      // not a React RootView, double check if the tag belongs to Fabric.
-      if (viewTag % 2 == 0) {
-        return UIManagerType.FABRIC
-      }
-    }
-    return uiManagerType
-  }
+  public fun getUIManagerType(viewTag: Int, surfaceId: Int): Int = UIManagerType.FABRIC
 
   /**
    * @param viewTag react tag

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

@@ -134,9 +134,11 @@ internal class BackgroundImageDrawable(
       // So we draw in reverse (last drawn in canvas appears closest)
       for (index in layers.indices.reversed()) {
         val backgroundImageLayer = layers[index]
-        val size = backgroundSize?.let { it.getOrNull(index % it.size) }
-        val repeat = backgroundRepeat?.let { it.getOrNull(index % it.size) }
-        val position = backgroundPosition?.let { it.getOrNull(index % it.size) }
+        val size = backgroundSize?.takeIf { it.isNotEmpty() }?.let { it.getOrNull(index % it.size) }
+        val repeat =
+            backgroundRepeat?.takeIf { it.isNotEmpty() }?.let { it.getOrNull(index % it.size) }
+        val position =
+            backgroundPosition?.takeIf { it.isNotEmpty() }?.let { it.getOrNull(index % it.size) }
 
         // 2. Calculate the size of a single tile.
         val (tileWidth, tileHeight) =