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

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

@@ -26,7 +26,6 @@ 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.modules.i18nmanager.I18nUtil;
-import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
@@ -730,9 +729,7 @@ public class UIImplementation {
       return;
     }
 
-    while (node.getNativeKind() == NativeKind.NONE) {
-      node = node.getParent();
-    }
+    // While loop removed due to NativeKind removal
     mOperationsQueue.enqueueSetJSResponder(node.getReactTag(), reactTag, blockNativeResponder);
   }
 
@@ -782,13 +779,6 @@ 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);
-  }
-
   protected final void removeShadowNode(ReactShadowNode nodeToRemove) {
     removeShadowNodeRecursive(nodeToRemove);
     nodeToRemove.dispose();

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

@@ -25,7 +25,6 @@ import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Dynamic;
 import com.facebook.react.bridge.GuardedRunnable;
 import com.facebook.react.bridge.LifecycleEventListener;
-import com.facebook.react.bridge.OnBatchCompleteListener;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMarker;
@@ -45,7 +44,6 @@ import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
 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.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.facebook.react.uimanager.events.EventDispatcherImpl;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
@@ -90,7 +88,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
 @Deprecated(
     since = "This class is part of Legacy Architecture and will be removed in a future release")
 public class UIManagerModule extends ReactContextBaseJavaModule
-    implements OnBatchCompleteListener, LifecycleEventListener, UIManager {
+    implements LifecycleEventListener, UIManager {
   static {
     LegacyArchitectureLogger.assertLegacyArchitecture(
         "UIManagerModule", LegacyArchitectureLogLevel.ERROR);
@@ -662,50 +660,6 @@ public class UIManagerModule extends ReactContextBaseJavaModule
     mUIImplementation.configureNextLayoutAnimation(config, success);
   }
 
-  /**
-   * To implement the transactional requirement mentioned in the class javadoc, we only commit UI
-   * changes to the actual view hierarchy once a batch of JS->Java calls have been completed. We
-   * know this is safe because all JS->Java calls that are triggered by a Java->JS call (e.g. the
-   * delivery of a touch event or execution of 'renderApplication') end up in a single JS->Java
-   * transaction.
-   *
-   * <p>A better way to do this would be to have JS explicitly signal to this module when a UI
-   * transaction is done. Right now, though, this is how iOS does it, and we should probably update
-   * the JS and native code and make this change at the same time.
-   *
-   * <p>TODO(5279396): Make JS UI library explicitly notify the native UI module of the end of a UI
-   * transaction using a standard native call
-   */
-  @Override
-  public void onBatchComplete() {
-    int batchId = mBatchId;
-    mBatchId++;
-
-    SystraceMessage.beginSection(Systrace.TRACE_TAG_REACT, "onBatchCompleteUI")
-        .arg("BatchId", batchId)
-        .flush();
-    for (UIManagerListener listener : mUIManagerListeners) {
-      listener.willDispatchViewUpdates(this);
-    }
-    try {
-      // If there are no RootViews registered, there will be no View updates to dispatch.
-      // This is a hack to prevent this from being called when Fabric is used everywhere.
-      // This should no longer be necessary in Bridgeless Mode.
-      if (mUIImplementation.getRootViewNum() > 0) {
-        mUIImplementation.dispatchViewUpdates(batchId);
-      }
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT);
-    }
-  }
-
-  // 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);
-  }
-
   @Override
   public EventDispatcher getEventDispatcher() {
     return mEventDispatcher;

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

@@ -29,7 +29,6 @@ import com.facebook.react.common.annotations.internal.LegacyArchitecture;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogLevel;
 import com.facebook.react.common.annotations.internal.LegacyArchitectureLogger;
 import com.facebook.react.modules.core.ReactChoreographer;
-import com.facebook.react.uimanager.debug.NotThreadSafeViewHierarchyUpdateDebugListener;
 import com.facebook.systrace.Systrace;
 import com.facebook.systrace.SystraceMessage;
 import com.facebook.yoga.YogaDirection;
@@ -584,7 +583,6 @@ public class UIViewOperationQueue {
   @GuardedBy("mNonBatchedOperationsLock")
   private ArrayDeque<UIOperation> mNonBatchedOperations = new ArrayDeque<>();
 
-  private @Nullable NotThreadSafeViewHierarchyUpdateDebugListener mViewHierarchyUpdateDebugListener;
   private boolean mIsDispatchUIFrameCallbackEnqueued = false;
   private boolean mIsInIllegalUIState = false;
   private boolean mIsProfilingNextBatch = false;
@@ -619,13 +617,6 @@ 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;
-  }
-
   public void profileNextBatch() {
     mIsProfilingNextBatch = true;
     mProfiledBatchCommitStartTime = 0;
@@ -833,10 +824,6 @@ public class UIViewOperationQueue {
         }
       }
 
-      if (mViewHierarchyUpdateDebugListener != null) {
-        mViewHierarchyUpdateDebugListener.onViewHierarchyUpdateEnqueued();
-      }
-
       Runnable runOperations =
           new Runnable() {
             @Override
@@ -926,9 +913,6 @@ public class UIViewOperationQueue {
                 // Clear layout animation, as animation only apply to current UI operations batch.
                 mNativeViewHierarchyManager.clearLayoutAnimation();
 
-                if (mViewHierarchyUpdateDebugListener != null) {
-                  mViewHierarchyUpdateDebugListener.onViewHierarchyUpdateFinished();
-                }
               } catch (Exception e) {
                 mIsInIllegalUIState = true;
                 throw e;

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

@@ -82,7 +82,7 @@ internal class OutlineDrawable(
     }
 
   private val outlinePaint: Paint =
-      Paint().apply {
+      Paint(Paint.ANTI_ALIAS_FLAG).apply {
         style = Paint.Style.STROKE
         color = outlineColor
         strokeWidth = outlineWidth

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

@@ -7,14 +7,12 @@
 
 package com.facebook.react.uimanager.events
 
-import android.os.Handler
 import android.view.Choreographer
 import com.facebook.react.bridge.LifecycleEventListener
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactSoftExceptionLogger
 import com.facebook.react.bridge.UiThreadUtil
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
-import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.modules.core.ReactChoreographer
 import com.facebook.react.uimanager.UIManagerHelper
 import com.facebook.react.uimanager.common.UIManagerType
@@ -41,19 +39,6 @@ internal class FabricEventDispatcher(
   private val postEventDispatchListeners = CopyOnWriteArrayList<BatchEventDispatchedListener>()
   private val currentFrameCallback = ScheduleDispatchFrameCallback()
 
-  private var isDispatchScheduled = false
-  private val dispatchEventsRunnable = Runnable {
-    isDispatchScheduled = false
-    Systrace.beginSection(Systrace.TRACE_TAG_REACT, "BatchEventDispatchedListeners")
-    try {
-      for (listener in postEventDispatchListeners) {
-        listener.onBatchEventDispatched()
-      }
-    } finally {
-      Systrace.endSection(Systrace.TRACE_TAG_REACT)
-    }
-  }
-
   init {
     reactContext.addLifecycleEventListener(this)
     eventEmitter.registerFabricEventEmitter(fabricEventEmitter)
@@ -109,14 +94,7 @@ internal class FabricEventDispatcher(
   }
 
   private fun scheduleDispatchOfBatchedEvents() {
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      if (!isDispatchScheduled) {
-        isDispatchScheduled = true
-        uiThreadHandler.postAtFrontOfQueue(dispatchEventsRunnable)
-      }
-    } else {
-      currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
-    }
+    currentFrameCallback.maybeScheduleDispatchOfBatchedEvents()
   }
 
   /** Add a listener to this EventDispatcher. */
@@ -139,9 +117,7 @@ internal class FabricEventDispatcher(
 
   override fun onHostResume() {
     scheduleDispatchOfBatchedEvents()
-    if (!ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      currentFrameCallback.resume()
-    }
+    currentFrameCallback.resume()
   }
 
   override fun onHostPause() {
@@ -165,12 +141,7 @@ internal class FabricEventDispatcher(
 
   private fun cancelDispatchOfBatchedEvents() {
     UiThreadUtil.assertOnUiThread()
-    if (ReactNativeFeatureFlags.useOptimizedEventBatchingOnAndroid()) {
-      isDispatchScheduled = false
-      uiThreadHandler.removeCallbacks(dispatchEventsRunnable)
-    } else {
-      currentFrameCallback.stop()
-    }
+    currentFrameCallback.stop()
   }
 
   private inner class ScheduleDispatchFrameCallback : Choreographer.FrameCallback {
@@ -229,8 +200,4 @@ internal class FabricEventDispatcher(
       }
     }
   }
-
-  private companion object {
-    private val uiThreadHandler: Handler = UiThreadUtil.getUiThreadHandler()
-  }
 }

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

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events
+
+import android.view.KeyEvent as AndroidKeyEvent
+
+internal class KeyDownEvent(
+    surfaceId: Int,
+    viewTag: Int,
+    keyEvent: AndroidKeyEvent,
+) : KeyEvent(surfaceId, viewTag, keyEvent) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  companion object {
+    private const val EVENT_NAME: String = "topKeyDown"
+  }
+}

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

@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events
+
+import android.view.KeyEvent as AndroidKeyEvent
+import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.WritableMap
+
+internal abstract class KeyEvent(
+    surfaceId: Int,
+    viewTag: Int,
+    keyEvent: AndroidKeyEvent,
+) : Event<KeyEvent>(surfaceId, viewTag) {
+
+  // Extract all needed data from keyEvent immediately to avoid storing the AndroidKeyEvent itself
+  private val keyCode: Int = keyEvent.keyCode
+  private val unicodeChar: Int = keyEvent.unicodeChar
+  private val isAltPressed: Boolean = keyEvent.isAltPressed
+  private val isCtrlPressed: Boolean = keyEvent.isCtrlPressed
+  private val isMetaPressed: Boolean = keyEvent.isMetaPressed
+  private val isShiftPressed: Boolean = keyEvent.isShiftPressed
+
+  override fun canCoalesce(): Boolean = false
+
+  override fun getEventCategory(): Int = EventCategoryDef.DISCRETE
+
+  override fun getEventData(): WritableMap {
+    val eventData = Arguments.createMap()
+
+    eventData.putInt("target", viewTag)
+
+    // W3C KeyboardEvent properties
+    eventData.putString("key", getKeyString())
+    eventData.putString("code", getCodeString())
+
+    // Modifier keys
+    eventData.putBoolean("altKey", isAltPressed)
+    eventData.putBoolean("ctrlKey", isCtrlPressed)
+    eventData.putBoolean("metaKey", isMetaPressed)
+    eventData.putBoolean("shiftKey", isShiftPressed)
+
+    // Additional properties
+    eventData.putDouble("timestamp", timestampMs.toDouble())
+
+    return eventData
+  }
+
+  private fun getKeyString(): String {
+    return when {
+      unicodeChar != 0 && !Character.isISOControl(unicodeChar) -> unicodeChar.toChar().toString()
+      else -> KEY_NAME_MAP[keyCode] ?: UNIDENTIFIED
+    }
+  }
+
+  private fun getCodeString(): String {
+    return CODE_MAP[keyCode] ?: UNIDENTIFIED
+  }
+
+  internal companion object {
+    private const val UNIDENTIFIED = "Unidentified"
+
+    private val CODE_MAP: Map<Int, String> by
+        lazy(LazyThreadSafetyMode.PUBLICATION) {
+          mapOf(
+              // Letter keys
+              AndroidKeyEvent.KEYCODE_A to "KeyA",
+              AndroidKeyEvent.KEYCODE_B to "KeyB",
+              AndroidKeyEvent.KEYCODE_C to "KeyC",
+              AndroidKeyEvent.KEYCODE_D to "KeyD",
+              AndroidKeyEvent.KEYCODE_E to "KeyE",
+              AndroidKeyEvent.KEYCODE_F to "KeyF",
+              AndroidKeyEvent.KEYCODE_G to "KeyG",
+              AndroidKeyEvent.KEYCODE_H to "KeyH",
+              AndroidKeyEvent.KEYCODE_I to "KeyI",
+              AndroidKeyEvent.KEYCODE_J to "KeyJ",
+              AndroidKeyEvent.KEYCODE_K to "KeyK",
+              AndroidKeyEvent.KEYCODE_L to "KeyL",
+              AndroidKeyEvent.KEYCODE_M to "KeyM",
+              AndroidKeyEvent.KEYCODE_N to "KeyN",
+              AndroidKeyEvent.KEYCODE_O to "KeyO",
+              AndroidKeyEvent.KEYCODE_P to "KeyP",
+              AndroidKeyEvent.KEYCODE_Q to "KeyQ",
+              AndroidKeyEvent.KEYCODE_R to "KeyR",
+              AndroidKeyEvent.KEYCODE_S to "KeyS",
+              AndroidKeyEvent.KEYCODE_T to "KeyT",
+              AndroidKeyEvent.KEYCODE_U to "KeyU",
+              AndroidKeyEvent.KEYCODE_V to "KeyV",
+              AndroidKeyEvent.KEYCODE_W to "KeyW",
+              AndroidKeyEvent.KEYCODE_X to "KeyX",
+              AndroidKeyEvent.KEYCODE_Y to "KeyY",
+              AndroidKeyEvent.KEYCODE_Z to "KeyZ",
+              // Digit keys
+              AndroidKeyEvent.KEYCODE_0 to "Digit0",
+              AndroidKeyEvent.KEYCODE_1 to "Digit1",
+              AndroidKeyEvent.KEYCODE_2 to "Digit2",
+              AndroidKeyEvent.KEYCODE_3 to "Digit3",
+              AndroidKeyEvent.KEYCODE_4 to "Digit4",
+              AndroidKeyEvent.KEYCODE_5 to "Digit5",
+              AndroidKeyEvent.KEYCODE_6 to "Digit6",
+              AndroidKeyEvent.KEYCODE_7 to "Digit7",
+              AndroidKeyEvent.KEYCODE_8 to "Digit8",
+              AndroidKeyEvent.KEYCODE_9 to "Digit9",
+              // Special keys
+              AndroidKeyEvent.KEYCODE_ENTER to "Enter",
+              AndroidKeyEvent.KEYCODE_SPACE to "Space",
+              AndroidKeyEvent.KEYCODE_TAB to "Tab",
+              AndroidKeyEvent.KEYCODE_DEL to "Backspace",
+              AndroidKeyEvent.KEYCODE_ESCAPE to "Escape",
+              // Modifier keys
+              AndroidKeyEvent.KEYCODE_SHIFT_LEFT to "ShiftLeft",
+              AndroidKeyEvent.KEYCODE_SHIFT_RIGHT to "ShiftRight",
+              AndroidKeyEvent.KEYCODE_CTRL_LEFT to "ControlLeft",
+              AndroidKeyEvent.KEYCODE_CTRL_RIGHT to "ControlRight",
+              AndroidKeyEvent.KEYCODE_ALT_LEFT to "AltLeft",
+              AndroidKeyEvent.KEYCODE_ALT_RIGHT to "AltRight",
+              AndroidKeyEvent.KEYCODE_META_LEFT to "MetaLeft",
+              AndroidKeyEvent.KEYCODE_META_RIGHT to "MetaRight",
+              // Arrow keys
+              AndroidKeyEvent.KEYCODE_DPAD_UP to "ArrowUp",
+              AndroidKeyEvent.KEYCODE_DPAD_DOWN to "ArrowDown",
+              AndroidKeyEvent.KEYCODE_DPAD_LEFT to "ArrowLeft",
+              AndroidKeyEvent.KEYCODE_DPAD_RIGHT to "ArrowRight",
+              AndroidKeyEvent.KEYCODE_DPAD_CENTER to "Enter",
+          )
+        }
+
+    private val KEY_NAME_MAP: Map<Int, String> by
+        lazy(LazyThreadSafetyMode.PUBLICATION) {
+          mapOf(
+              AndroidKeyEvent.KEYCODE_ENTER to "Enter",
+              AndroidKeyEvent.KEYCODE_DPAD_CENTER to "Enter",
+              AndroidKeyEvent.KEYCODE_SPACE to " ",
+              AndroidKeyEvent.KEYCODE_TAB to "Tab",
+              AndroidKeyEvent.KEYCODE_DEL to "Backspace",
+              AndroidKeyEvent.KEYCODE_ESCAPE to "Escape",
+              AndroidKeyEvent.KEYCODE_SHIFT_LEFT to "Shift",
+              AndroidKeyEvent.KEYCODE_SHIFT_RIGHT to "Shift",
+              AndroidKeyEvent.KEYCODE_CTRL_LEFT to "Control",
+              AndroidKeyEvent.KEYCODE_CTRL_RIGHT to "Control",
+              AndroidKeyEvent.KEYCODE_ALT_LEFT to "Alt",
+              AndroidKeyEvent.KEYCODE_ALT_RIGHT to "Alt",
+              AndroidKeyEvent.KEYCODE_META_LEFT to "Meta",
+              AndroidKeyEvent.KEYCODE_META_RIGHT to "Meta",
+              AndroidKeyEvent.KEYCODE_DPAD_UP to "ArrowUp",
+              AndroidKeyEvent.KEYCODE_DPAD_DOWN to "ArrowDown",
+              AndroidKeyEvent.KEYCODE_DPAD_LEFT to "ArrowLeft",
+              AndroidKeyEvent.KEYCODE_DPAD_RIGHT to "ArrowRight",
+          )
+        }
+  }
+}

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uimanager.events
+
+import android.view.KeyEvent as AndroidKeyEvent
+
+/** An event representing a key release (keyup). Corresponds to W3C KeyboardEvent specification. */
+internal class KeyUpEvent(
+    surfaceId: Int,
+    viewTag: Int,
+    keyEvent: AndroidKeyEvent,
+) : KeyEvent(surfaceId, viewTag, keyEvent) {
+
+  override fun getEventName(): String = EVENT_NAME
+
+  companion object {
+    private const val EVENT_NAME: String = "topKeyUp"
+  }
+}

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

@@ -29,7 +29,8 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
   private lateinit var _eventName: String
   private var coalescingKey = UNSET_COALESCING_KEY
   private var pointersEventData: List<WritableMap>? = null
-  private lateinit var eventState: PointerEventState
+  private var eventState: PointerEventState? = null
+  private var activeHitPathViewIds: List<Int>? = null
 
   private fun init(
       eventName: String,
@@ -37,12 +38,14 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
       eventState: PointerEventState,
       motionEventToCopy: MotionEvent,
       coalescingKey: Short,
+      activeHitPathViewIds: List<Int>?,
   ) {
     super.init(eventState.getSurfaceId(), targetTag, motionEventToCopy.eventTime)
     this._eventName = eventName
     this.motionEvent = MotionEvent.obtain(motionEventToCopy)
     this.coalescingKey = coalescingKey
     this.eventState = eventState
+    this.activeHitPathViewIds = activeHitPathViewIds
   }
 
   override fun getEventName(): String = _eventName
@@ -84,7 +87,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
             return@EventAnimationDriverMatchSpec false
           }
           if (isBubblingEvent(eventName)) {
-            for (viewTarget in eventState.hitPathForActivePointer) {
+            for (viewTarget in checkNotNull(eventState).hitPathForActivePointer) {
               if (viewTarget.getViewId() == viewTag) {
                 return@EventAnimationDriverMatchSpec true
               }
@@ -97,10 +100,10 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
       }
 
   override fun onDispose() {
+    eventState = null
     pointersEventData = null
-    val motionEvent = motionEvent
-    this.motionEvent = null
     motionEvent?.recycle()
+    motionEvent = null
 
     // Either `this` is in the event pool, or motionEvent
     // is null. It is in theory not possible for a PointerEvent to
@@ -137,6 +140,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
     val pointerEvent = Arguments.createMap()
     val motionEvent = checkNotNull(motionEvent)
     val pointerId = motionEvent.getPointerId(index)
+    val eventState = checkNotNull(eventState)
 
     // https://www.w3.org/TR/pointerevents/#pointerevent-interface
     pointerEvent.putDouble("pointerId", pointerId.toDouble())
@@ -212,6 +216,13 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
     pointerEvent.putDouble("pressure", pressure)
     pointerEvent.putDouble("tangentialPressure", 0.0)
 
+    if (activeHitPathViewIds != null) {
+      pointerEvent.putArray(
+          "hitPathForEventListener",
+          Arguments.makeNativeArray(activeHitPathViewIds),
+      )
+    }
+
     addModifierKeyData(pointerEvent, motionEvent.metaState)
 
     return pointerEvent
@@ -295,6 +306,9 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
 
     val hitPathForActivePointer: List<ViewTarget>
       get() = checkNotNull(hitPathByPointerId[activePointerId])
+
+    val hitPathViewIdsForActivePointer: List<Int>
+      get() = checkNotNull(hitPathByPointerId[activePointerId]).map { it.getViewId() }
   }
 
   companion object {
@@ -309,6 +323,15 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
         targetTag: Int,
         eventState: PointerEventState,
         motionEventToCopy: MotionEvent?,
+    ): PointerEvent = obtain(eventName, targetTag, eventState, motionEventToCopy, null)
+
+    @JvmStatic
+    fun obtain(
+        eventName: String,
+        targetTag: Int,
+        eventState: PointerEventState,
+        motionEventToCopy: MotionEvent?,
+        activeHitPathViewIds: List<Int>?,
     ): PointerEvent {
       var event = EVENTS_POOL.acquire()
       if (event == null) {
@@ -320,6 +343,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
           eventState,
           Assertions.assertNotNull(motionEventToCopy),
           0.toShort(),
+          activeHitPathViewIds,
       )
       return event
     }
@@ -342,6 +366,7 @@ internal class PointerEvent private constructor() : Event<PointerEvent>() {
           eventState,
           Assertions.assertNotNull(motionEventToCopy),
           coalescingKey,
+          null,
       )
       return event
     }

package/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageView.kt

@@ -372,15 +372,18 @@ public class ReactImageView(
   public override fun hasOverlappingRendering(): Boolean = false
 
   public override fun onDraw(canvas: Canvas) {
-    BackgroundStyleApplicator.clipToPaddingBox(this, canvas)
-    try {
-      super.onDraw(canvas)
-    } catch (e: RuntimeException) {
-      // Only provide updates if downloadListener is set (shouldNotify is true)
-      if (downloadListener != null) {
-        val eventDispatcher =
-            UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
-        eventDispatcher?.dispatchEvent(createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e))
+    BackgroundStyleApplicator.clipToPaddingBoxWithAntiAliasing(this, canvas) {
+      try {
+        super.onDraw(canvas)
+      } catch (e: RuntimeException) {
+        // Only provide updates if downloadListener is set (shouldNotify is true)
+        if (downloadListener != null) {
+          val eventDispatcher =
+              UIManagerHelper.getEventDispatcherForReactTag(context as ReactContext, id)
+          eventDispatcher?.dispatchEvent(
+              createErrorEvent(UIManagerHelper.getSurfaceId(this), id, e)
+          )
+        }
       }
     }
   }

package/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -646,7 +646,7 @@ public class ReactModalHostView(context: ThemedReactContext) :
 
     override fun onInterceptHoverEvent(event: MotionEvent): Boolean {
       eventDispatcher?.let { jSPointerDispatcher?.handleMotionEvent(event, it, true) }
-      return super.onHoverEvent(event)
+      return super.onInterceptHoverEvent(event)
     }
 
     override fun onHoverEvent(event: MotionEvent): Boolean {