react-native-tvos 0.76.5-0 → 0.77.0-0

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

@@ -14,6 +14,7 @@ import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
@@ -33,6 +34,7 @@ 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.PointerEventHelper;
+import com.facebook.react.uimanager.style.OutlineStyle;
 import com.facebook.react.uimanager.util.ReactFindViewUtil;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -45,7 +47,7 @@ import java.util.Objects;
  * provides support for base view properties such as backgroundColor, opacity, etc.
  */
 public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode>
-    extends ViewManager<T, C> implements BaseViewManagerInterface<T>, View.OnLayoutChangeListener {
+    extends ViewManager<T, C> implements View.OnLayoutChangeListener {
 
   private static final int PERSPECTIVE_ARRAY_INVERTED_CAMERA_DISTANCE_INDEX = 2;
   private static final float CAMERA_DISTANCE_NORMALIZATION_MULTIPLIER = (float) Math.sqrt(5);
@@ -189,16 +191,14 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(
       name = ViewProps.BACKGROUND_COLOR,
       defaultInt = Color.TRANSPARENT,
       customType = "Color")
-  public void setBackgroundColor(@NonNull T view, int backgroundColor) {
-    view.setBackgroundColor(backgroundColor);
+  public void setBackgroundColor(@NonNull T view, @ColorInt int backgroundColor) {
+    BackgroundStyleApplicator.setBackgroundColor(view, backgroundColor);
   }
 
-  @Override
   @ReactProp(name = ViewProps.FILTER, customType = "Filter")
   public void setFilter(@NonNull T view, @Nullable ReadableArray filter) {
     if (ViewUtil.getUIManagerType(view) == UIManagerType.FABRIC) {
@@ -206,15 +206,18 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @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();
+      }
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.TRANSFORM)
   public void setTransform(@NonNull T view, @Nullable ReadableArray matrix) {
     @Nullable ReadableArray currentTransform = (ReadableArray) view.getTag(R.id.transform);
@@ -224,7 +227,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.TRANSFORM_ORIGIN)
   public void setTransformOrigin(@NonNull T view, @Nullable ReadableArray transformOrigin) {
     @Nullable
@@ -235,19 +237,16 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.OPACITY, defaultFloat = 1.f)
   public void setOpacity(@NonNull T view, float opacity) {
     view.setAlpha(opacity);
   }
 
-  @Override
   @ReactProp(name = ViewProps.ELEVATION)
   public void setElevation(@NonNull T view, float elevation) {
     ViewCompat.setElevation(view, PixelUtil.toPixelFromDIP(elevation));
   }
 
-  @Override
   @ReactProp(name = ViewProps.SHADOW_COLOR, defaultInt = Color.BLACK, customType = "Color")
   public void setShadowColor(@NonNull T view, int shadowColor) {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
@@ -256,7 +255,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.Z_INDEX)
   public void setZIndex(@NonNull T view, float zIndex) {
     int integerZIndex = Math.round(zIndex);
@@ -267,13 +265,11 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.RENDER_TO_HARDWARE_TEXTURE)
   public void setRenderToHardwareTexture(@NonNull T view, boolean useHWTexture) {
     view.setTag(R.id.use_hardware_layer, useHWTexture);
   }
 
-  @Override
   @ReactProp(name = ViewProps.TEST_ID)
   public void setTestId(@NonNull T view, @Nullable String testId) {
     view.setTag(R.id.react_test_id, testId);
@@ -282,14 +278,12 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     view.setTag(testId);
   }
 
-  @Override
   @ReactProp(name = ViewProps.NATIVE_ID)
   public void setNativeId(@NonNull T view, @Nullable String nativeId) {
     view.setTag(R.id.view_tag_native_id, nativeId);
     ReactFindViewUtil.notifyViewRendered(view);
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_LABELLED_BY)
   public void setAccessibilityLabelledBy(@NonNull T view, @Nullable Dynamic nativeId) {
     if (nativeId.isNull()) {
@@ -304,21 +298,18 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_LABEL)
   public void setAccessibilityLabel(@NonNull T view, @Nullable String accessibilityLabel) {
     view.setTag(R.id.accessibility_label, accessibilityLabel);
     updateViewContentDescription(view);
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_HINT)
   public void setAccessibilityHint(@NonNull T view, @Nullable String accessibilityHint) {
     view.setTag(R.id.accessibility_hint, accessibilityHint);
     updateViewContentDescription(view);
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_ROLE)
   public void setAccessibilityRole(@NonNull T view, @Nullable String accessibilityRole) {
     if (accessibilityRole == null) {
@@ -328,21 +319,18 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION)
   public void setAccessibilityCollection(
       @NonNull T view, @Nullable ReadableMap accessibilityCollection) {
     view.setTag(R.id.accessibility_collection, accessibilityCollection);
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_COLLECTION_ITEM)
   public void setAccessibilityCollectionItem(
       @NonNull T view, @Nullable ReadableMap accessibilityCollectionItem) {
     view.setTag(R.id.accessibility_collection_item, accessibilityCollectionItem);
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_STATE)
   public void setViewState(@NonNull T view, @Nullable ReadableMap accessibilityState) {
     if (accessibilityState == null) {
@@ -430,7 +418,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_ACTIONS)
   public void setAccessibilityActions(T view, ReadableArray accessibilityActions) {
     if (accessibilityActions == null) {
@@ -453,7 +440,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.IMPORTANT_FOR_ACCESSIBILITY)
   public void setImportantForAccessibility(
       @NonNull T view, @Nullable String importantForAccessibility) {
@@ -469,7 +455,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @ReactProp(name = ViewProps.ROLE)
   public void setRole(@NonNull T view, @Nullable String role) {
     if (role == null) {
@@ -479,42 +464,36 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     }
   }
 
-  @Override
   @Deprecated
   @ReactProp(name = ViewProps.ROTATION)
   public void setRotation(@NonNull T view, float rotation) {
     view.setRotation(rotation);
   }
 
-  @Override
   @Deprecated
   @ReactProp(name = ViewProps.SCALE_X, defaultFloat = 1f)
   public void setScaleX(@NonNull T view, float scaleX) {
     view.setScaleX(scaleX);
   }
 
-  @Override
   @Deprecated
   @ReactProp(name = ViewProps.SCALE_Y, defaultFloat = 1f)
   public void setScaleY(@NonNull T view, float scaleY) {
     view.setScaleY(scaleY);
   }
 
-  @Override
   @Deprecated
   @ReactProp(name = ViewProps.TRANSLATE_X, defaultFloat = 0f)
   public void setTranslateX(@NonNull T view, float translateX) {
     view.setTranslationX(PixelUtil.toPixelFromDIP(translateX));
   }
 
-  @Override
   @Deprecated
   @ReactProp(name = ViewProps.TRANSLATE_Y, defaultFloat = 0f)
   public void setTranslateY(@NonNull T view, float translateY) {
     view.setTranslationY(PixelUtil.toPixelFromDIP(translateY));
   }
 
-  @Override
   @ReactProp(name = ViewProps.ACCESSIBILITY_LIVE_REGION)
   public void setAccessibilityLiveRegion(@NonNull T view, @Nullable String liveRegion) {
     if (liveRegion == null || liveRegion.equals("none")) {
@@ -771,31 +750,56 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     return eventTypeConstants;
   }
 
-  @Override
+  // TODO: These are all pretty silly, since they do nothing, support less props and shapes than
+  // View, and the only external usage is RNSVG which just calls the superclass ViewManager version.
   public void setBorderRadius(T view, float borderRadius) {
     logUnsupportedPropertyWarning(ViewProps.BORDER_RADIUS);
   }
 
-  @Override
   public void setBorderBottomLeftRadius(T view, float borderRadius) {
     logUnsupportedPropertyWarning(ViewProps.BORDER_BOTTOM_LEFT_RADIUS);
   }
 
-  @Override
   public void setBorderBottomRightRadius(T view, float borderRadius) {
     logUnsupportedPropertyWarning(ViewProps.BORDER_BOTTOM_RIGHT_RADIUS);
   }
 
-  @Override
   public void setBorderTopLeftRadius(T view, float borderRadius) {
     logUnsupportedPropertyWarning(ViewProps.BORDER_TOP_LEFT_RADIUS);
   }
 
-  @Override
   public void setBorderTopRightRadius(T view, float borderRadius) {
     logUnsupportedPropertyWarning(ViewProps.BORDER_TOP_RIGHT_RADIUS);
   }
 
+  @ReactProp(name = ViewProps.OUTLINE_COLOR, customType = "Color")
+  public void setOutlineColor(T view, @Nullable Integer color) {
+    BackgroundStyleApplicator.setOutlineColor(view, color);
+  }
+
+  @ReactProp(name = ViewProps.OUTLINE_OFFSET)
+  public void setOutlineOffset(T view, float offset) {
+    BackgroundStyleApplicator.setOutlineOffset(view, offset);
+  }
+
+  @ReactProp(name = ViewProps.OUTLINE_STYLE)
+  public void setOutlineStyle(T view, @Nullable String outlineStyle) {
+    @Nullable
+    OutlineStyle parsedOutlineStyle =
+        outlineStyle == null ? null : OutlineStyle.fromString(outlineStyle);
+    BackgroundStyleApplicator.setOutlineStyle(view, parsedOutlineStyle);
+  }
+
+  @ReactProp(name = ViewProps.OUTLINE_WIDTH)
+  public void setOutlineWidth(T view, float width) {
+    BackgroundStyleApplicator.setOutlineWidth(view, width);
+  }
+
+  @ReactProp(name = ViewProps.BOX_SHADOW, customType = "BoxShadow")
+  public void setBoxShadow(T view, @Nullable ReadableArray shadows) {
+    BackgroundStyleApplicator.setBoxShadow(view, shadows);
+  }
+
   private void logUnsupportedPropertyWarning(String propName) {
     FLog.w(ReactConstants.TAG, "%s doesn't support property '%s'", getName(), propName);
   }
@@ -955,4 +959,6 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   public void setTouchCancel(@NonNull T view, boolean value) {
     // no-op, handled by JSResponder
   }
+
+  // Please add new props to BaseViewManagerDelegate as well!
 }

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

@@ -19,9 +19,11 @@ import com.facebook.yoga.YogaConstants
  * This is a base implementation of [ViewManagerDelegate] which supports setting properties that
  * every view should support, such as rotation, background color, etc.
  */
-public abstract class BaseViewManagerDelegate<T : View, U : BaseViewManagerInterface<T>>(
+public abstract class BaseViewManagerDelegate<
+    T : View, U : BaseViewManager<T, out LayoutShadowNode>>(
     @Suppress("NoHungarianNotation") @JvmField protected val mViewManager: U
 ) : ViewManagerDelegate<T> {
+  @Suppress("DEPRECATION")
   override public fun setProperty(view: T, propName: String?, value: Any?) {
     when (propName) {
       ViewProps.ACCESSIBILITY_ACTIONS ->
@@ -40,6 +42,9 @@ public abstract class BaseViewManagerDelegate<T : View, U : BaseViewManagerInter
       ViewProps.ACCESSIBILITY_COLLECTION_ITEM ->
           mViewManager.setAccessibilityCollectionItem(view, value as ReadableMap?)
 
+      ViewProps.ACCESSIBILITY_VALUE ->
+          mViewManager.setAccessibilityValue(view, value as ReadableMap?)
+
       ViewProps.BACKGROUND_COLOR ->
           mViewManager.setBackgroundColor(
               view, if (value == null) 0 else ColorPropConverter.getColor(value, view.context))
@@ -64,8 +69,14 @@ public abstract class BaseViewManagerDelegate<T : View, U : BaseViewManagerInter
           mViewManager.setBorderTopRightRadius(
               view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED)
 
+      ViewProps.BOX_SHADOW -> mViewManager.setBoxShadow(view, value as ReadableArray?)
+
       ViewProps.ELEVATION -> mViewManager.setElevation(view, (value as Double?)?.toFloat() ?: 0.0f)
 
+      ViewProps.FILTER -> mViewManager.setFilter(view, value as ReadableArray?)
+
+      ViewProps.MIX_BLEND_MODE -> mViewManager.setMixBlendMode(view, value as String?)
+
       ViewProps.SHADOW_COLOR ->
           mViewManager.setShadowColor(
               view, if (value == null) 0 else ColorPropConverter.getColor(value, view.context))
@@ -82,6 +93,18 @@ public abstract class BaseViewManagerDelegate<T : View, U : BaseViewManagerInter
 
       ViewProps.OPACITY -> mViewManager.setOpacity(view, (value as Double?)?.toFloat() ?: 1.0f)
 
+      ViewProps.OUTLINE_COLOR -> mViewManager.setOutlineColor(view, value as Int?)
+
+      ViewProps.OUTLINE_OFFSET ->
+          mViewManager.setOutlineOffset(
+              view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED)
+
+      ViewProps.OUTLINE_STYLE -> mViewManager.setOutlineStyle(view, value as String?)
+
+      ViewProps.OUTLINE_WIDTH ->
+          mViewManager.setOutlineWidth(
+              view, (value as Double?)?.toFloat() ?: YogaConstants.UNDEFINED)
+
       ViewProps.RENDER_TO_HARDWARE_TEXTURE ->
           mViewManager.setRenderToHardwareTexture(view, value as Boolean? ?: false)
 
@@ -101,6 +124,22 @@ public abstract class BaseViewManagerDelegate<T : View, U : BaseViewManagerInter
           mViewManager.setTranslateY(view, (value as Double?)?.toFloat() ?: 0.0f)
 
       ViewProps.Z_INDEX -> mViewManager.setZIndex(view, (value as Double?)?.toFloat() ?: 0.0f)
+
+      // Experimental pointer events
+      "onPointerEnter" -> mViewManager.setPointerEnter(view, value as Boolean? ?: false)
+      "onPointerEnterCapture" ->
+          mViewManager.setPointerEnterCapture(view, value as Boolean? ?: false)
+      "onPointerOver" -> mViewManager.setPointerOver(view, value as Boolean? ?: false)
+      "onPointerOverCapture" -> mViewManager.setPointerOverCapture(view, value as Boolean? ?: false)
+      "onPointerOut" -> mViewManager.setPointerOut(view, value as Boolean? ?: false)
+      "onPointerOutCapture" -> mViewManager.setPointerOutCapture(view, value as Boolean? ?: false)
+      "onPointerLeave" -> mViewManager.setPointerLeave(view, value as Boolean? ?: false)
+      "onPointerLeaveCapture" ->
+          mViewManager.setPointerLeaveCapture(view, value as Boolean? ?: false)
+      "onPointerMove" -> mViewManager.setPointerMove(view, value as Boolean? ?: false)
+      "onPointerMoveCapture" -> mViewManager.setPointerMoveCapture(view, value as Boolean? ?: false)
+      "onClick" -> mViewManager.setClick(view, value as Boolean? ?: false)
+      "onClickCapture" -> mViewManager.setClickCapture(view, value as Boolean? ?: false)
     }
   }
 

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

@@ -10,6 +10,9 @@ package com.facebook.react.uimanager
 import android.annotation.TargetApi
 import android.graphics.BlendMode
 import android.os.Build
+import android.view.ViewGroup
+import androidx.core.view.children
+import com.facebook.react.R
 
 @TargetApi(29)
 internal object BlendModeHelper {
@@ -41,4 +44,8 @@ internal object BlendModeHelper {
       else -> throw IllegalArgumentException("Invalid mix-blend-mode name: $mixBlendMode")
     }
   }
+
+  @JvmStatic
+  public fun needsIsolatedLayer(view: ViewGroup): Boolean =
+      view.children.any { it.getTag(R.id.mix_blend_mode) != null }
 }

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

@@ -29,7 +29,7 @@ internal object FilterHelper {
     filters ?: return null
     var chainedEffects: RenderEffect? = null
     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
 
       chainedEffects =
@@ -58,7 +58,7 @@ internal object FilterHelper {
     // New ColorMatrix objects represent the identity matrix
     val resultColorMatrix = ColorMatrix()
     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
       val amount = (filter.value as Double).toFloat()
 
@@ -88,7 +88,7 @@ internal object FilterHelper {
     }
 
     for (i in 0 until filters.size()) {
-      val filter = filters.getMap(i).entryIterator.next()
+      val filter = 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/JSPointerDispatcher.java

@@ -38,7 +38,7 @@ public class JSPointerDispatcher {
   private static final int UNSELECTED_VIEW_TAG = -1;
   private static final int UNSET_POINTER_ID = -1;
   private static final float ONMOVE_EPSILON = 0.1f;
-  private static final String TAG = "POINTER EVENTS";
+  private static final String TAG = "PointerEvents";
 
   private Map<Integer, List<ViewTarget>> mLastHitPathByPointerId;
   private Map<Integer, float[]> mLastEventCoordinatesByPointerId;

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

@@ -27,7 +27,6 @@ import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationListener;
@@ -178,9 +177,7 @@ public class NativeViewHierarchyManager {
     try {
       View viewToUpdate = resolveView(tag);
 
-      if (ReactNativeFeatureFlags.setAndroidLayoutDirection()) {
-        viewToUpdate.setLayoutDirection(LayoutDirectionUtil.toAndroidFromYoga(layoutDirection));
-      }
+      viewToUpdate.setLayoutDirection(LayoutDirectionUtil.toAndroidFromYoga(layoutDirection));
 
       // Even though we have exact dimensions, we still call measure because some platform views
       // (e.g.
@@ -674,6 +671,9 @@ public class NativeViewHierarchyManager {
     View rootView = mTagsToViews.get(rootViewTag);
     dropView(rootView);
     mRootTags.delete(rootViewTag);
+    if (rootView != null) {
+      rootView.setId(View.NO_ID);
+    }
   }
 
   /**

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

@@ -69,11 +69,19 @@ public object PixelUtil {
       DisplayMetricsHolder.getWindowDisplayMetrics().density
 
   /* Kotlin extensions */
-  public fun Float.dpToPx(): Float = PixelUtil.toPixelFromDIP(this)
+  public fun Int.dpToPx(): Float = toPixelFromDIP(this.toFloat())
 
-  public fun Double.dpToPx(): Float = PixelUtil.toPixelFromDIP(this)
+  public fun Long.dpToPx(): Float = toPixelFromDIP(this.toFloat())
 
-  public fun Float.pxToDp(): Float = PixelUtil.toDIPFromPixel(this)
+  public fun Float.dpToPx(): Float = toPixelFromDIP(this)
 
-  public fun Double.pxToDp(): Float = PixelUtil.toDIPFromPixel(this.toFloat())
+  public fun Double.dpToPx(): Float = toPixelFromDIP(this.toFloat())
+
+  public fun Int.pxToDp(): Float = toDIPFromPixel(this.toFloat())
+
+  public fun Long.pxToDp(): Float = toDIPFromPixel(this.toFloat())
+
+  public fun Float.pxToDp(): Float = toDIPFromPixel(this)
+
+  public fun Double.pxToDp(): Float = toDIPFromPixel(this.toFloat())
 }

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

@@ -598,20 +598,19 @@ public class ReactAccessibilityDelegate extends ExploreByTouchHelper {
         UIManager uiManager =
             UIManagerHelper.getUIManager(reactContext, ViewUtil.getUIManagerType(reactTag));
         if (uiManager != null) {
-          uiManager
-              .<EventDispatcher>getEventDispatcher()
-              .dispatchEvent(
-                  new Event(surfaceId, reactTag) {
-                    @Override
-                    public String getEventName() {
-                      return TOP_ACCESSIBILITY_ACTION_EVENT;
-                    }
-
-                    @Override
-                    protected WritableMap getEventData() {
-                      return event;
-                    }
-                  });
+          EventDispatcher eventDispatcher = (EventDispatcher) uiManager.getEventDispatcher();
+          eventDispatcher.dispatchEvent(
+              new Event(surfaceId, reactTag) {
+                @Override
+                public String getEventName() {
+                  return TOP_ACCESSIBILITY_ACTION_EVENT;
+                }
+
+                @Override
+                protected WritableMap getEventData() {
+                  return event;
+                }
+              });
         }
       } else {
         ReactSoftExceptionLogger.logSoftException(

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

@@ -5,22 +5,22 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager
 
 /**
  * Some Views may not function if added directly to a ViewGroup that clips them. For example, TTRC
  * markers may rely on `onDraw` functionality to work properly, and will break if they're clipped
  * out of the View hierarchy for any resaon.
  *
- * <p>This situation can occur more often in Fabric with View Flattening. We may prevent this sort
- * of View Flattening from occurring in the future, but the connection is not entirely certain.
+ * This situation can occur more often in Fabric with View Flattening. We may prevent this sort of
+ * View Flattening from occurring in the future, but the connection is not entirely certain.
  *
- * <p>This can occur either because ReactViewGroup clips them out, using the ordinarary subview
+ * This can occur either because ReactViewGroup clips them out, using the ordinarary subview
  * clipping feature. It is also possible if a View is added directly to a ReactRootView below the
  * fold of the screen.
  *
- * <p>Generally the solution is to prevent View flattening in JS by adding `collapsable=false` to a
+ * Generally the solution is to prevent View flattening in JS by adding `collapsable=false` to a
  * parent component of the clipped view, and/or move the View higher up in the hierarchy so it is
  * always rendered within the first page of the screen.
  */
-public interface ReactClippingProhibitedView {}
+public interface ReactClippingProhibitedView

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

@@ -5,13 +5,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
-
-import android.view.View;
+package com.facebook.react.uimanager
 
 /**
  * This interface should be implemented be native {@link View} subclasses that can represent more
- * than a single react node (e.g. TextView). It is use by touch event emitter for determining the
+ * than a single react node (e.g. [TextView]). It is use by touch event emitter for determining the
  * react tag of the inner-view element that was touched.
  */
 public interface ReactCompoundView {
@@ -22,5 +20,5 @@ public interface ReactCompoundView {
    * @param touchX the X touch coordinate relative to the view
    * @param touchY the Y touch coordinate relative to the view
    */
-  int reactTagForTouch(float touchX, float touchY);
+  public fun reactTagForTouch(touchX: Float, touchY: Float): Int
 }

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

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.react.uimanager;
+package com.facebook.react.uimanager
 
 /**
  * This interface should be implemented by native ViewGroup subclasses that can represent more than
@@ -13,10 +13,10 @@ package com.facebook.react.uimanager;
  * overlap, and TouchTargetHelper may incorrectly dispatch touch event to a wrong element because it
  * prioritizes children over parents.
  */
-public interface ReactCompoundViewGroup extends ReactCompoundView {
+public interface ReactCompoundViewGroup : ReactCompoundView {
   /**
    * Returns true if react node responsible for the touch event is flattened into this ViewGroup.
    * Use reactTagForTouch() to get its tag.
    */
-  boolean interceptsTouchEvent(float touchX, float touchY);
+  public fun interceptsTouchEvent(touchX: Float, touchY: Float): Boolean
 }

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

@@ -774,6 +774,8 @@ public class UIImplementation {
     mViewManagers.invalidate();
   }
 
+  // NOTE: When converted to Kotlin this method should be `internal` due to
+  // visibility restriction for `NotThreadSafeViewHierarchyUpdateDebugListener`
   public void setViewHierarchyUpdateDebugListener(
       @Nullable NotThreadSafeViewHierarchyUpdateDebugListener listener) {
     mOperationsQueue.setViewHierarchyUpdateDebugListener(listener);

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

@@ -687,6 +687,8 @@ public class UIManagerModule extends ReactContextBaseJavaModule
     }
   }
 
+  // NOTE: When converted to Kotlin this method should be `internal` due to
+  // visibility restriction for `NotThreadSafeViewHierarchyUpdateDebugListener`
   public void setViewHierarchyUpdateDebugListener(
       @Nullable NotThreadSafeViewHierarchyUpdateDebugListener listener) {
     mUIImplementation.setViewHierarchyUpdateDebugListener(listener);

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

@@ -13,7 +13,6 @@ import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Nullsafe;
 import com.facebook.react.common.MapBuilder;
 import com.facebook.react.common.build.ReactBuildConfig;
-import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -135,7 +134,8 @@ public class UIManagerModuleConstantsHelper {
 
     Map viewManagerBubblingEvents = viewManager.getExportedCustomBubblingEventTypeConstants();
     if (viewManagerBubblingEvents != null) {
-      if (ReactFeatureFlags.enableFabricRenderer && ReactNativeFeatureFlags.useFabricInterop()) {
+      if (ReactNativeFeatureFlags.enableFabricRenderer()
+          && ReactNativeFeatureFlags.useFabricInterop()) {
         // For Fabric, events needs to be fired with a "top" prefix.
         // For the sake of Fabric Interop, here we normalize events adding "top" in their
         // name if the user hasn't provided it.
@@ -151,7 +151,8 @@ public class UIManagerModuleConstantsHelper {
     Map viewManagerDirectEvents = viewManager.getExportedCustomDirectEventTypeConstants();
     validateDirectEventNames(viewManager.getName(), viewManagerDirectEvents);
     if (viewManagerDirectEvents != null) {
-      if (ReactFeatureFlags.enableFabricRenderer && ReactNativeFeatureFlags.useFabricInterop()) {
+      if (ReactNativeFeatureFlags.enableFabricRenderer()
+          && ReactNativeFeatureFlags.useFabricInterop()) {
         // For Fabric, events needs to be fired with a "top" prefix.
         // For the sake of Fabric Interop, here we normalize events adding "top" in their
         // name if the user hasn't provided it.

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

@@ -609,6 +609,8 @@ public class UIViewOperationQueue {
     return mNativeViewHierarchyManager;
   }
 
+  // NOTE: When converted to Kotlin this method should be `internal` due to
+  // visibility restriction for `NotThreadSafeViewHierarchyUpdateDebugListener`
   public void setViewHierarchyUpdateDebugListener(
       @Nullable NotThreadSafeViewHierarchyUpdateDebugListener listener) {
     mViewHierarchyUpdateDebugListener = listener;