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

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.kt

@@ -63,6 +63,7 @@ import com.facebook.react.views.text.SelectableTextViewManager
 import com.facebook.react.views.textinput.ReactTextInputManager
 import com.facebook.react.views.unimplementedview.ReactUnimplementedViewManager
 import com.facebook.react.views.view.ReactViewManager
+import com.facebook.react.views.virtual.view.ReactVirtualViewManager
 
 /**
  * Package defining basic modules and view managers.
@@ -155,6 +156,7 @@ constructor(private val config: MainPackageConfig? = null) :
           else ReactTextViewManager(),
           SelectableTextViewManager(),
           ReactViewManager(),
+          ReactVirtualViewManager(),
           ReactUnimplementedViewManager(),
       )
 
@@ -199,6 +201,8 @@ constructor(private val config: MainPackageConfig? = null) :
           SelectableTextViewManager.REACT_CLASS to
               ModuleSpec.viewManagerSpec { SelectableTextViewManager() },
           ReactViewManager.REACT_CLASS to ModuleSpec.viewManagerSpec { ReactViewManager() },
+          ReactVirtualViewManager.REACT_CLASS to
+              ModuleSpec.viewManagerSpec { ReactVirtualViewManager() },
           ReactUnimplementedViewManager.REACT_CLASS to
               ModuleSpec.viewManagerSpec { ReactUnimplementedViewManager() },
       )

package/ReactAndroid/src/main/java/com/facebook/react/soloader/OpenSourceMergedSoMapping.kt

@@ -28,6 +28,7 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
         "react_devsupportjni",
         "react_featureflagsjni",
         "react_newarchdefaults",
+        "react_tracingjni",
         "reactnativeblob",
         "reactnativejni",
         "reactnativejni_common",
@@ -57,6 +58,7 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
       "react_devsupportjni" -> libreact_devsupportjni_so()
       "react_featureflagsjni" -> libreact_featureflagsjni_so()
       "react_newarchdefaults" -> libreact_newarchdefaults_so()
+      "react_tracingjni" -> libreact_tracingjni_so()
       "reactnative" -> libreactnative_so()
       "reactnativeblob" -> libreactnativeblob_so()
       "reactnativejni" -> libreactnativejni_so()
@@ -88,6 +90,8 @@ public object OpenSourceMergedSoMapping : ExternalSoMapping {
 
   public external fun libreact_newarchdefaults_so(): Int
 
+  public external fun libreact_tracingjni_so(): Int
+
   public external fun libreactnative_so(): Int
 
   public external fun libreactnativeblob_so(): Int

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

@@ -20,14 +20,10 @@ import android.os.Build
 import android.view.View
 import android.widget.ImageView
 import androidx.annotation.ColorInt
-import androidx.core.graphics.withClip
 import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.PixelUtil.dpToPx
 import com.facebook.react.uimanager.PixelUtil.pxToDp
-import com.facebook.react.uimanager.common.UIManagerType
-import com.facebook.react.uimanager.common.ViewUtil
 import com.facebook.react.uimanager.drawable.BackgroundDrawable
 import com.facebook.react.uimanager.drawable.BackgroundImageDrawable
 import com.facebook.react.uimanager.drawable.BorderDrawable
@@ -281,17 +277,13 @@ public object BackgroundStyleApplicator {
   }
 
   /**
-   * Sets the outline color for the view (Fabric only).
+   * Sets the outline color for the view.
    *
    * @param view The view to apply the outline color to
    * @param outlineColor The outline color, or null to remove
    */
   @JvmStatic
   public fun setOutlineColor(view: View, @ColorInt outlineColor: Int?) {
-    if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
-      return
-    }
-
     val outline = ensureOutlineDrawable(view)
     if (outlineColor != null) {
       outline.outlineColor = outlineColor
@@ -307,17 +299,13 @@ public object BackgroundStyleApplicator {
   @JvmStatic public fun getOutlineColor(view: View): Int? = getOutlineDrawable(view)?.outlineColor
 
   /**
-   * Sets the outline offset for the view (Fabric only).
+   * Sets the outline offset for the view.
    *
    * @param view The view to apply the outline offset to
    * @param outlineOffset The outline offset in DIPs
    */
   @JvmStatic
   public fun setOutlineOffset(view: View, outlineOffset: Float): Unit {
-    if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
-      return
-    }
-
     val outline = ensureOutlineDrawable(view)
     outline.outlineOffset = outlineOffset.dpToPx()
   }
@@ -331,17 +319,13 @@ public object BackgroundStyleApplicator {
   public fun getOutlineOffset(view: View): Float? = getOutlineDrawable(view)?.outlineOffset
 
   /**
-   * Sets the outline style for the view (Fabric only).
+   * Sets the outline style for the view.
    *
    * @param view The view to apply the outline style to
    * @param outlineStyle The outline style (solid, dashed, dotted), or null to remove
    */
   @JvmStatic
   public fun setOutlineStyle(view: View, outlineStyle: OutlineStyle?): Unit {
-    if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
-      return
-    }
-
     val outline = ensureOutlineDrawable(view)
     if (outlineStyle != null) {
       outline.outlineStyle = outlineStyle
@@ -357,17 +341,13 @@ public object BackgroundStyleApplicator {
   public fun getOutlineStyle(view: View): OutlineStyle? = getOutlineDrawable(view)?.outlineStyle
 
   /**
-   * Sets the outline width for the view (Fabric only).
+   * Sets the outline width for the view.
    *
    * @param view The view to apply the outline width to
    * @param width The outline width in DIPs
    */
   @JvmStatic
   public fun setOutlineWidth(view: View, width: Float) {
-    if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
-      return
-    }
-
     val outline = ensureOutlineDrawable(view)
     outline.outlineWidth = width.dpToPx()
   }
@@ -381,17 +361,13 @@ public object BackgroundStyleApplicator {
   public fun getOutlineWidth(view: View): Float? = getOutlineDrawable(view)?.outlineOffset
 
   /**
-   * Sets box shadows for the view (Fabric only).
+   * Sets box shadows for the view.
    *
    * @param view The view to apply box shadows to
    * @param shadows The list of box shadow styles to apply
    */
   @JvmStatic
   public fun setBoxShadow(view: View, shadows: List<BoxShadow>) {
-    if (ViewUtil.getUIManagerType(view) != UIManagerType.FABRIC) {
-      return
-    }
-
     var innerShadows = mutableListOf<InsetBoxShadowDrawable>()
     var outerShadows = mutableListOf<OutsetBoxShadowDrawable>()
 
@@ -445,7 +421,7 @@ public object BackgroundStyleApplicator {
   }
 
   /**
-   * Sets box shadows for the view from a ReadableArray (Fabric only).
+   * Sets box shadows for the view from a ReadableArray.
    *
    * @param view The view to apply box shadows to
    * @param shadows The array of box shadow definitions, or null to remove all shadows
@@ -489,6 +465,35 @@ public object BackgroundStyleApplicator {
     clipToPaddingBoxWithAntiAliasing(view, canvas, null)
   }
 
+  /**
+   * Populates [outRect] with the padding box rect of the view.
+   *
+   * The padding box is the area within the borders of the view. For views without a
+   * [CompositeBackgroundDrawable] or without borders, this returns the full view bounds.
+   *
+   * This is useful for overriding [View.getClipBounds] to communicate the view's clipping region to
+   * the Android framework (e.g. for [View.getGlobalVisibleRect] calculations).
+   *
+   * @param view The view whose padding box to compute
+   * @param outRect The rect to populate with the padding box bounds
+   */
+  internal fun getPaddingBoxRect(view: View, outRect: Rect) {
+    val composite = getCompositeBackgroundDrawable(view)
+    val computedBorderInsets =
+        composite?.borderInsets?.resolve(composite.layoutDirection, view.context)
+    if (computedBorderInsets == null) {
+      outRect.set(0, 0, view.width, view.height)
+      return
+    }
+
+    val left = (computedBorderInsets.left.dpToPx()).toInt()
+    val top = (computedBorderInsets.top.dpToPx()).toInt()
+    val right = (view.width.toFloat() - computedBorderInsets.right.dpToPx()).toInt()
+    val bottom = (view.height.toFloat() - computedBorderInsets.bottom.dpToPx()).toInt()
+
+    outRect.set(left, top, right, bottom)
+  }
+
   /**
    * Clips the canvas to the padding box of the view.
    *
@@ -542,8 +547,7 @@ public object BackgroundStyleApplicator {
       // 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 &&
+          Build.VERSION.SDK_INT <= Build.VERSION_CODES.P &&
               view.width > 0 &&
               view.height > 0 &&
               drawContent != null
@@ -575,49 +579,50 @@ public object BackgroundStyleApplicator {
       paddingBoxPath: Path,
       drawContent: () -> Unit,
   ) {
-    // Clip to the view's own bounds before saveLayer. On API <= 28 hardware-accelerated canvases,
+    // Save the layer for Porter-Duff compositing
+    val saveCount = canvas.saveLayer(0f, 0f, view.width.toFloat(), view.height.toFloat(), null)
+
+    // Clip to the view's own bounds inside the layer. On API <= 28 hardware-accelerated canvases,
     // the window boundary is tracked by the GPU scissor but not reflected in the canvas clip stack.
     // Without an explicit software clip, saveLayer may allocate a buffer with uninitialized pixels
-    // beyond the GPU scissor. Adding clipRect in the view's local coordinate space forces HWUI to
-    // include it in the clip stack, ensuring saveLayer properly constrains its buffer. This clip is
-    // stable across parent transform animations since it's in the view's own coordinate space.
-    canvas.withClip(0, 0, view.width, view.height) {
-      // 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 {
-        // API < 28: Use a nested saveLayer with DST_IN compositing to mask content to the
-        // padding box path. EVEN_ODD fill + DST_OUT has rendering bugs on API 24's hardware
-        // renderer, so we avoid that technique. Instead, draw the mask shape into a separate
-        // layer; when restored with DST_IN, content is preserved only where the mask is opaque.
-        val dstInPaint = Paint()
-        dstInPaint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_IN)
-        val maskSave =
-            canvas.saveLayer(0f, 0f, view.width.toFloat(), view.height.toFloat(), dstInPaint)
-        // Clear the layer to ensure it starts fully transparent. On API 24, saveLayer may not
-        // initialize the buffer to transparent, causing DST_IN to see non-zero alpha everywhere.
-        canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
-        maskPaint.xfermode = null
-        maskPaint.color = Color.BLACK
-        canvas.drawPath(paddingBoxPath, maskPaint)
-        canvas.restoreToCount(maskSave)
-      }
-
-      // Restore the layer
-      canvas.restoreToCount(saveCount)
+    // beyond the GPU scissor. Adding clipRect inside the layer (rather than wrapping it with
+    // canvas.withClip) avoids an extra save/restore nesting level that breaks Porter-Duff
+    // compositing on API 24's HWUI renderer. The saveLayer already saves and restores the clip
+    // state, so a separate save/restore wrapper is unnecessary.
+    canvas.clipRect(0, 0, view.width, view.height)
+
+    // 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 {
+      // API < 28: Use a nested saveLayer with DST_IN compositing to mask content to the
+      // padding box path. EVEN_ODD fill + DST_OUT has rendering bugs on API 24's hardware
+      // renderer, so we avoid that technique. Instead, draw the mask shape into a separate
+      // layer; when restored with DST_IN, content is preserved only where the mask is opaque.
+      val dstInPaint = Paint()
+      dstInPaint.xfermode = PorterDuffXfermode(PorterDuff.Mode.DST_IN)
+      val maskSave =
+          canvas.saveLayer(0f, 0f, view.width.toFloat(), view.height.toFloat(), dstInPaint)
+      // Clear the layer to ensure it starts fully transparent. On API 24, saveLayer may not
+      // initialize the buffer to transparent, causing DST_IN to see non-zero alpha everywhere.
+      canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
+      maskPaint.xfermode = null
+      maskPaint.color = Color.BLACK
+      canvas.drawPath(paddingBoxPath, maskPaint)
+      canvas.restoreToCount(maskSave)
     }
+
+    // Restore the layer
+    canvas.restoreToCount(saveCount)
   }
 
   /**

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

@@ -33,8 +33,6 @@ import com.facebook.react.common.ReactConstants;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.AccessibilityRole;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate.Role;
 import com.facebook.react.uimanager.annotations.ReactProp;
-import com.facebook.react.uimanager.common.UIManagerType;
-import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.BlurEvent;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.FocusEvent;
@@ -235,20 +233,16 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
 
   @ReactProp(name = ViewProps.FILTER, customType = "Filter")
   public void setFilter(@NonNull T view, @Nullable ReadableArray filter) {
-    if (ViewUtil.getUIManagerType(view) == UIManagerType.FABRIC) {
-      view.setTag(R.id.filter, filter);
-    }
+    view.setTag(R.id.filter, filter);
   }
 
   @ReactProp(name = ViewProps.MIX_BLEND_MODE)
   public void setMixBlendMode(@NonNull T view, @Nullable String mixBlendMode) {
-    if (ViewUtil.getUIManagerType(view) == UIManagerType.FABRIC) {
-      view.setTag(R.id.mix_blend_mode, BlendModeHelper.parseMixBlendMode(mixBlendMode));
-      // We need to trigger drawChild for the parent ViewGroup which will set the
-      // mixBlendMode compositing on the child
-      if (view.getParent() instanceof View) {
-        ((View) view.getParent()).invalidate();
-      }
+    view.setTag(R.id.mix_blend_mode, BlendModeHelper.parseMixBlendMode(mixBlendMode));
+    // We need to trigger drawChild for the parent ViewGroup which will set the
+    // mixBlendMode compositing on the child
+    if (view.getParent() instanceof View) {
+      ((View) view.getParent()).invalidate();
     }
   }
 
@@ -592,16 +586,13 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
       return;
     }
 
-    boolean allowPercentageResolution = ViewUtil.getUIManagerType(view) == UIManagerType.FABRIC;
-
     sMatrixDecompositionContext.reset();
     TransformHelper.processTransform(
         transforms,
         sTransformDecompositionArray,
         PixelUtil.toDIPFromPixel(view.getWidth()),
         PixelUtil.toDIPFromPixel(view.getHeight()),
-        transformOrigin,
-        allowPercentageResolution);
+        transformOrigin);
     MatrixMathHelper.decomposeMatrix(sTransformDecompositionArray, sMatrixDecompositionContext);
     view.setTranslationX(
         PixelUtil.toPixelFromDIP(

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

@@ -7,10 +7,10 @@
 
 package com.facebook.react.uimanager
 
-import android.annotation.TargetApi
 import android.graphics.BlendMode
 import android.os.Build
 import android.view.ViewGroup
+import androidx.annotation.RequiresApi
 import androidx.core.view.children
 import com.facebook.react.R
 
@@ -20,7 +20,7 @@ import com.facebook.react.R
  * This object provides utilities to convert CSS mix-blend-mode string values into Android's
  * [BlendMode] enumeration and to determine when views need isolated layers for proper blending.
  */
-@TargetApi(29)
+@RequiresApi(29)
 internal object BlendModeHelper {
 
   /**
@@ -54,6 +54,7 @@ internal object BlendModeHelper {
       "saturation" -> BlendMode.SATURATION
       "color" -> BlendMode.COLOR
       "luminosity" -> BlendMode.LUMINOSITY
+      "plus-lighter" -> BlendMode.PLUS
       else -> throw IllegalArgumentException("Invalid mix-blend-mode name: $mixBlendMode")
     }
   }

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

@@ -29,6 +29,7 @@ public object DisplayMetricsHolder {
   @JvmStatic private var windowDisplayMetrics: DisplayMetrics? = null
   @JvmStatic private var screenDisplayMetrics: DisplayMetrics? = null
 
+  // TODO(0.87): Remove once we are out of the non-breaking window (see 8d21ffda60)
   /** The metrics of the window associated to the Context used to initialize ReactNative */
   @JvmStatic
   public fun getWindowDisplayMetrics(): DisplayMetrics {
@@ -36,6 +37,7 @@ public object DisplayMetricsHolder {
     return windowDisplayMetrics as DisplayMetrics
   }
 
+  // TODO(0.87): Remove once we are out of the non-breaking window (see 8d21ffda60)
   @JvmStatic
   public fun setWindowDisplayMetrics(displayMetrics: DisplayMetrics?) {
     windowDisplayMetrics = displayMetrics
@@ -84,6 +86,7 @@ public object DisplayMetricsHolder {
     DisplayMetricsHolder.screenDisplayMetrics = screenDisplayMetrics
   }
 
+  // TODO(0.87): Remove once we are out of the non-breaking window (see 8d21ffda60)
   @JvmStatic
   public fun getDisplayMetricsWritableMap(fontScale: Double): WritableMap {
     checkNotNull(windowDisplayMetrics) { INITIALIZATION_MISSING_MESSAGE }

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

@@ -7,6 +7,7 @@
 
 package com.facebook.react.uimanager
 
+import android.annotation.SuppressLint
 import android.annotation.TargetApi
 import android.graphics.BlendMode
 import android.graphics.BlendModeColorFilter
@@ -30,6 +31,7 @@ import kotlin.math.sin
  *
  * @see <a href="https://www.w3.org/TR/filter-effects-1/">CSS Filter Effects Module Level 1</a>
  */
+@SuppressLint("UseRequiresApi")
 @TargetApi(31)
 internal object FilterHelper {
 
@@ -104,7 +106,7 @@ internal object FilterHelper {
     }
 
     for (i in 0 until filters.size()) {
-      val filter = filters.getMap(i)!!.entryIterator.next()
+      val filter = checkNotNull(filters.getMap(i)).entryIterator.next()
       val filterName = filter.key
       if (filterName == "blur" || filterName == "dropShadow") {
         return false

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

@@ -31,16 +31,19 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public NativeViewHierarchyManager(ViewManagerRegistry viewManagers) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public NativeViewHierarchyManager(ViewManagerRegistry viewManagers, RootViewManager manager) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public final synchronized @Nullable View resolveView(int tag) {
     return null;
   }
@@ -48,6 +51,7 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public final synchronized @Nullable ViewManager resolveViewManager(int tag) {
     return null;
   }
@@ -55,21 +59,25 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public void setLayoutAnimationEnabled(boolean enabled) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void updateInstanceHandle(int tag, long instanceHandle) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void updateProperties(int tag, ReactStylesDiffMap props) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void updateViewExtraData(int tag, Object extraData) {}
 
   /**
@@ -82,6 +90,7 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void updateLayout(
       int parentTag,
       int tag,
@@ -94,6 +103,7 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized long getInstanceHandle(int reactTag) {
     return 0;
   }
@@ -101,6 +111,7 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void createView(
       ThemedReactContext themedContext,
       int tag,
@@ -110,6 +121,7 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void manageChildren(
       int tag,
       @Nullable int[] indicesToRemove,
@@ -119,31 +131,37 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void setChildren(int tag, ReadableArray childrenTags) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void addRootView(int tag, View view) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   protected final synchronized void addRootViewGroup(int tag, View view) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   protected synchronized void dropView(View view) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void removeRootView(int rootViewTag) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized int getRootViewNum() {
     return 0;
   }
@@ -151,16 +169,19 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void measure(int tag, int[] outputBuffer) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void measureInWindow(int tag, int[] outputBuffer) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized int findTargetTagForTouch(int reactTag, float touchX, float touchY) {
     return 0;
   }
@@ -168,12 +189,14 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void setJSResponder(
       int reactTag, int initialReactTag, boolean blockNativeResponder) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void clearJSResponder() {}
 
   /**
@@ -186,11 +209,13 @@ public class NativeViewHierarchyManager {
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void dispatchCommand(
       int reactTag, String commandId, @Nullable ReadableArray args) {}
 
   /**
    * @deprecated Use new architecture instead.
    */
+  @Deprecated
   public synchronized void sendAccessibilityEvent(int tag, int eventType) {}
 }

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

@@ -35,7 +35,7 @@ import com.facebook.react.bridge.ReadableType
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.uimanager.UIManagerHelper.getSurfaceId
 import com.facebook.react.uimanager.UIManagerHelper.getUIManager
-import com.facebook.react.uimanager.common.ViewUtil.getUIManagerType
+import com.facebook.react.uimanager.common.UIManagerType
 import com.facebook.react.uimanager.events.Event
 import com.facebook.react.uimanager.util.ReactFindViewUtil.findView
 
@@ -251,7 +251,7 @@ public open class ReactAccessibilityDelegate( // The View this delegate is attac
       if (reactContext.hasActiveReactInstance()) {
         val reactTag = host.id
         val surfaceId = getSurfaceId(reactContext)
-        val uiManager = getUIManager(reactContext, getUIManagerType(reactTag))
+        val uiManager = getUIManager(reactContext, UIManagerType.FABRIC)
         if (uiManager != null) {
           uiManager.eventDispatcher.dispatchEvent(
               AccessibilityActionEvent(eventData, surfaceId, reactTag)

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

@@ -17,6 +17,7 @@ internal object ReactRootViewTagGenerator {
 
   @JvmStatic
   @Synchronized
-  fun getNextRootViewTag(): Int =
-      nextRootViewTag.also { nextRootViewTag += ROOT_VIEW_TAG_INCREMENT }
+  fun getNextRootViewTag(): Int = nextRootViewTag.also {
+    nextRootViewTag += ROOT_VIEW_TAG_INCREMENT
+  }
 }