react-native 0.84.0-nightly-20251118-d314e5f4e → 0.84.0-nightly-20251120-88447cf20

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

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<b2c2e874b05283e0ebd62899f7c417d8>>
+ * @generated SignedSource<<15bb2229e65b6a6ae728d512ff51885f>>
  */
 
 /**
@@ -91,6 +91,7 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
   private var preventShadowTreeCommitExhaustionCache: Boolean? = null
   private var shouldPressibilityUseW3CPointerEventsForHoverCache: Boolean? = null
   private var shouldSetEnabledBasedOnAccessibilityStateCache: Boolean? = null
+  private var shouldSetIsClickableByDefaultCache: Boolean? = null
   private var shouldTriggerResponderTransferOnScrollAndroidCache: Boolean? = null
   private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
@@ -749,6 +750,15 @@ internal class ReactNativeFeatureFlagsCxxAccessor : ReactNativeFeatureFlagsAcces
     return cached
   }
 
+  override fun shouldSetIsClickableByDefault(): Boolean {
+    var cached = shouldSetIsClickableByDefaultCache
+    if (cached == null) {
+      cached = ReactNativeFeatureFlagsCxxInterop.shouldSetIsClickableByDefault()
+      shouldSetIsClickableByDefaultCache = cached
+    }
+    return cached
+  }
+
   override fun shouldTriggerResponderTransferOnScrollAndroid(): Boolean {
     var cached = shouldTriggerResponderTransferOnScrollAndroidCache
     if (cached == null) {

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

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<ccb22ddcd1a76b7c52cf0f1b23e6152b>>
+ * @generated SignedSource<<85a6247f6049f60c18efdce5db0cccdf>>
  */
 
 /**
@@ -170,6 +170,8 @@ public object ReactNativeFeatureFlagsCxxInterop {
 
   @DoNotStrip @JvmStatic public external fun shouldSetEnabledBasedOnAccessibilityState(): Boolean
 
+  @DoNotStrip @JvmStatic public external fun shouldSetIsClickableByDefault(): Boolean
+
   @DoNotStrip @JvmStatic public external fun shouldTriggerResponderTransferOnScrollAndroid(): Boolean
 
   @DoNotStrip @JvmStatic public external fun skipActivityIdentityAssertionOnHostPause(): Boolean

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

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<30ca2685ceb6f2733531f5e7fce4416d>>
+ * @generated SignedSource<<614d228af81090b8b1dee65f4bfb67d7>>
  */
 
 /**
@@ -165,6 +165,8 @@ public open class ReactNativeFeatureFlagsDefaults : ReactNativeFeatureFlagsProvi
 
   override fun shouldSetEnabledBasedOnAccessibilityState(): Boolean = true
 
+  override fun shouldSetIsClickableByDefault(): Boolean = false
+
   override fun shouldTriggerResponderTransferOnScrollAndroid(): Boolean = false
 
   override fun skipActivityIdentityAssertionOnHostPause(): Boolean = false

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

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<6d1a15e64f42cc7d8869300720276215>>
+ * @generated SignedSource<<e4971d843cf79d94f8c61394f4c27204>>
  */
 
 /**
@@ -95,6 +95,7 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
   private var preventShadowTreeCommitExhaustionCache: Boolean? = null
   private var shouldPressibilityUseW3CPointerEventsForHoverCache: Boolean? = null
   private var shouldSetEnabledBasedOnAccessibilityStateCache: Boolean? = null
+  private var shouldSetIsClickableByDefaultCache: Boolean? = null
   private var shouldTriggerResponderTransferOnScrollAndroidCache: Boolean? = null
   private var skipActivityIdentityAssertionOnHostPauseCache: Boolean? = null
   private var traceTurboModulePromiseRejectionsOnAndroidCache: Boolean? = null
@@ -824,6 +825,16 @@ internal class ReactNativeFeatureFlagsLocalAccessor : ReactNativeFeatureFlagsAcc
     return cached
   }
 
+  override fun shouldSetIsClickableByDefault(): Boolean {
+    var cached = shouldSetIsClickableByDefaultCache
+    if (cached == null) {
+      cached = currentProvider.shouldSetIsClickableByDefault()
+      accessedFeatureFlags.add("shouldSetIsClickableByDefault")
+      shouldSetIsClickableByDefaultCache = cached
+    }
+    return cached
+  }
+
   override fun shouldTriggerResponderTransferOnScrollAndroid(): Boolean {
     var cached = shouldTriggerResponderTransferOnScrollAndroidCache
     if (cached == null) {

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

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<48d0d5486793b60914cfd595f0fc78d1>>
+ * @generated SignedSource<<e7b49105c0cea6be905be90610f0c7e4>>
  */
 
 /**
@@ -165,6 +165,8 @@ public interface ReactNativeFeatureFlagsProvider {
 
   @DoNotStrip public fun shouldSetEnabledBasedOnAccessibilityState(): Boolean
 
+  @DoNotStrip public fun shouldSetIsClickableByDefault(): Boolean
+
   @DoNotStrip public fun shouldTriggerResponderTransferOnScrollAndroid(): Boolean
 
   @DoNotStrip public fun skipActivityIdentityAssertionOnHostPause(): Boolean

package/ReactAndroid/src/main/java/com/facebook/react/modules/debug/FpsDebugFrameCallback.kt

@@ -26,8 +26,6 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     Choreographer.FrameCallback {
 
   private var choreographer: Choreographer? = null
-  private val didJSUpdateUiDuringFrameDetector: DidJSUpdateUiDuringFrameDetector =
-      DidJSUpdateUiDuringFrameDetector()
   private var firstFrameTime: Long = -1
   private var lastFrameTime: Long = -1
   private var numFrameCallbacks = 0
@@ -40,11 +38,7 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     if (firstFrameTime == -1L) {
       firstFrameTime = l
     }
-    val lastFrameStartTime = lastFrameTime
     lastFrameTime = l
-    if (didJSUpdateUiDuringFrameDetector.getDidJSHitFrameAndCleanup(lastFrameStartTime, l)) {
-      numFrameCallbacksWithBatchDispatches++
-    }
     numFrameCallbacks++
     val expectedNumFrames = expectedNumFrames
     val framesDropped = expectedNumFrames - expectedNumFramesPrev - 1
@@ -61,17 +55,9 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
     // removeBridgeIdleDebugListener for Bridgeless
     @Suppress("DEPRECATION")
     if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      val uiManagerModule =
-          reactContext.getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
-      if (!reactContext.isBridgeless) {
-        reactContext.catalystInstance.addBridgeIdleDebugListener(didJSUpdateUiDuringFrameDetector)
-        isRunningOnFabric = false
-      } else {
-        // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
-        // for Fabric or point users to use RNDT.
-        isRunningOnFabric = true
-      }
-      uiManagerModule?.setViewHierarchyUpdateDebugListener(didJSUpdateUiDuringFrameDetector)
+      // T172641976 Consider either implementing a mechanism similar to addBridgeIdleDebugListener
+      // for Fabric or point users to use RNDT.
+      isRunningOnFabric = true
     }
     this.targetFps = targetFps
     UiThreadUtil.runOnUiThread {
@@ -82,16 +68,6 @@ internal class FpsDebugFrameCallback(private val reactContext: ReactContext) :
 
   fun stop() {
     @Suppress("DEPRECATION")
-    if (!ReactBuildConfig.UNSTABLE_ENABLE_MINIFY_LEGACY_ARCHITECTURE) {
-      val uiManagerModule =
-          reactContext.getNativeModule(com.facebook.react.uimanager.UIManagerModule::class.java)
-      if (!reactContext.isBridgeless) {
-        reactContext.catalystInstance.removeBridgeIdleDebugListener(
-            didJSUpdateUiDuringFrameDetector
-        )
-      }
-      uiManagerModule?.setViewHierarchyUpdateDebugListener(null)
-    }
     UiThreadUtil.runOnUiThread {
       choreographer = Choreographer.getInstance()
       choreographer?.removeFrameCallback(this)

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

@@ -15,6 +15,6 @@ public object ReactNativeVersion {
     "major" to 0,
     "minor" to 84,
     "patch" to 0,
-    "prerelease" to "nightly-20251118-d314e5f4e"
+    "prerelease" to "nightly-20251120-88447cf20"
   )
 }

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

@@ -19,7 +19,6 @@ import com.facebook.react.bridge.NativeArray
 import com.facebook.react.bridge.NativeArrayInterface
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.NativeModuleRegistry
-import com.facebook.react.bridge.NotThreadSafeBridgeIdleDebugListener
 import com.facebook.react.bridge.RuntimeExecutor
 import com.facebook.react.bridge.RuntimeScheduler
 import com.facebook.react.bridge.UIManager
@@ -140,14 +139,6 @@ internal class BridgelessCatalystInstance(private val reactHost: ReactHostImpl)
   override val sourceURL: String
     get() = throw UnsupportedOperationException("Unimplemented method 'getSourceURL'")
 
-  override fun addBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
-    throw UnsupportedOperationException("Unimplemented method 'addBridgeIdleDebugListener'")
-  }
-
-  override fun removeBridgeIdleDebugListener(listener: NotThreadSafeBridgeIdleDebugListener) {
-    throw UnsupportedOperationException("Unimplemented method 'removeBridgeIdleDebugListener'")
-  }
-
   override fun registerSegment(segmentId: Int, path: String) {
     throw UnsupportedOperationException("Unimplemented method 'registerSegment'")
   }

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

@@ -12,6 +12,7 @@ package com.facebook.react.runtime
 import android.content.Context
 import android.graphics.Point
 import android.graphics.Rect
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import com.facebook.common.logging.FLog
@@ -20,7 +21,9 @@ import com.facebook.react.bridge.ReactContext
 import com.facebook.react.common.annotations.FrameworkAPI
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlags
 import com.facebook.react.uimanager.IllegalViewOperationException
+import com.facebook.react.uimanager.JSKeyDispatcher
 import com.facebook.react.uimanager.JSPointerDispatcher
 import com.facebook.react.uimanager.JSTouchDispatcher
 import com.facebook.react.uimanager.common.UIManagerType
@@ -37,6 +40,7 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     ReactRootView(context) {
   private val jsTouchDispatcher: JSTouchDispatcher = JSTouchDispatcher(this)
   private var jsPointerDispatcher: JSPointerDispatcher? = null
+  private var jsKeyDispatcher: JSKeyDispatcher? = null
   private var wasMeasured = false
   private var widthMeasureSpec = 0
   private var heightMeasureSpec = 0
@@ -45,6 +49,9 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     if (ReactFeatureFlags.dispatchPointerEvents) {
       jsPointerDispatcher = JSPointerDispatcher(this)
     }
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      jsKeyDispatcher = JSKeyDispatcher()
+    }
   }
 
   override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
@@ -188,6 +195,51 @@ public class ReactSurfaceView(context: Context?, private val surface: ReactSurfa
     }
   }
 
+  override fun dispatchJSKeyEvent(event: KeyEvent) {
+    if (jsKeyDispatcher == null) {
+      if (!ReactNativeFeatureFlags.enableKeyEvents()) {
+        return
+      }
+      FLog.w(TAG, "Unable to dispatch key events to JS before the dispatcher is available")
+      return
+    }
+    val eventDispatcher = surface.eventDispatcher
+    if (eventDispatcher != null) {
+      jsKeyDispatcher?.handleKeyEvent(event, eventDispatcher, surface.surfaceID)
+    } else {
+      FLog.w(
+          TAG,
+          "Unable to dispatch key events to JS as the React instance has not been attached",
+      )
+    }
+  }
+
+  override fun requestChildFocus(child: View?, focused: View?) {
+    super.requestChildFocus(child, focused)
+
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      val focusedViewTag = focused?.id
+      if (focusedViewTag != null) {
+        jsKeyDispatcher?.setFocusedView(focusedViewTag)
+      }
+    }
+  }
+
+  override fun onFocusChanged(gainFocus: Boolean, direction: Int, previouslyFocusedRect: Rect?) {
+    super.onFocusChanged(gainFocus, direction, previouslyFocusedRect)
+
+    if (ReactNativeFeatureFlags.enableKeyEvents()) {
+      if (gainFocus) {
+        val focusedViewTag = focusedChild?.id
+        if (focusedViewTag != null) {
+          jsKeyDispatcher?.setFocusedView(focusedViewTag)
+        }
+      } else {
+        jsKeyDispatcher?.clearFocus()
+      }
+    }
+  }
+
   override fun hasActiveReactContext(): Boolean =
       surface.isAttached && surface.reactHost?.currentReactContext != null
 

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

@@ -149,6 +149,9 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
     // https://android.googlesource.com/platform/frameworks/base/+/a175a5b/core/java/android/view/View.java#2712
     // `mViewFlags = SOUND_EFFECTS_ENABLED | HAPTIC_FEEDBACK_ENABLED | LAYOUT_DIRECTION_INHERIT`
     // Therefore we set the following options as such:
+    if (ReactNativeFeatureFlags.shouldSetIsClickableByDefault()) {
+      view.setClickable(true);
+    }
     view.setFocusable(false);
     view.setFocusableInTouchMode(false);
 
@@ -678,6 +681,7 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
   @Override
   protected void onAfterUpdateTransaction(@NonNull T view) {
     super.onAfterUpdateTransaction(view);
+    configureClickableState(view);
     updateViewAccessibility(view);
 
     Boolean invalidateTransform = (Boolean) view.getTag(R.id.invalidate_transform);
@@ -770,6 +774,16 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
                 MapBuilder.of(
                     "phasedRegistrationNames",
                     MapBuilder.of("bubbled", "onFocus", "captured", "onFocusCapture")))
+            .put(
+                "topKeyDown",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onKeyDown", "captured", "onKeyDownCapture")))
+            .put(
+                "topKeyUp",
+                MapBuilder.of(
+                    "phasedRegistrationNames",
+                    MapBuilder.of("bubbled", "onKeyUp", "captured", "onKeyUpCapture")))
             .build());
     return eventTypeConstants;
   }
@@ -1001,6 +1015,25 @@ public abstract class BaseViewManager<T extends View, C extends LayoutShadowNode
 
   // Please add new props to BaseViewManagerDelegate as well!
 
+  private static <T extends View> void configureClickableState(@NonNull T view) {
+    if (!ReactNativeFeatureFlags.shouldSetIsClickableByDefault()) {
+      return;
+    }
+
+    boolean shouldBeClickable =
+        !(view instanceof ReactPointerEventsView)
+            || PointerEvents.canBeTouchTarget(((ReactPointerEventsView) view).getPointerEvents());
+
+    // NOTE: In Android O+, setClickable(true) has the side effect of setting focusable=true.
+    // We need to preserve the original focusable state to respect the focusable prop.
+    boolean wasFocusable = view.isFocusable();
+    boolean wasFocusableInTouchMode = view.isFocusableInTouchMode();
+
+    view.setClickable(shouldBeClickable);
+    view.setFocusable(wasFocusable);
+    view.setFocusableInTouchMode(wasFocusableInTouchMode);
+  }
+
   /**
    * A helper class to keep track of the original focus change listener if one is set. This is
    * especially helpful for views that are recycled so we can retain and restore the original

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

@@ -0,0 +1,65 @@
+/*
+ * 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
+
+import android.view.KeyEvent as AndroidKeyEvent
+import android.view.View
+import com.facebook.react.uimanager.events.EventDispatcher
+import com.facebook.react.uimanager.events.KeyDownEvent
+import com.facebook.react.uimanager.events.KeyUpEvent
+
+/**
+ * JSKeyDispatcher handles dispatching keyboard events to JS from RootViews. It sends keydown and
+ * keyup events according to the W3C KeyboardEvent specification, supporting both capture and bubble
+ * phases.
+ *
+ * The keydown and keyup events provide a code indicating which key is pressed. The event target is
+ * derived from the currently focused Android view.
+ */
+internal class JSKeyDispatcher {
+  private var focusedViewTag: Int = View.NO_ID
+
+  fun handleKeyEvent(
+      keyEvent: AndroidKeyEvent,
+      eventDispatcher: EventDispatcher,
+      surfaceId: Int,
+  ) {
+    if (focusedViewTag == View.NO_ID) {
+      return
+    }
+
+    when (keyEvent.action) {
+      AndroidKeyEvent.ACTION_DOWN -> {
+        eventDispatcher.dispatchEvent(
+            KeyDownEvent(
+                surfaceId,
+                focusedViewTag,
+                keyEvent,
+            )
+        )
+      }
+      AndroidKeyEvent.ACTION_UP -> {
+        eventDispatcher.dispatchEvent(
+            KeyUpEvent(
+                surfaceId,
+                focusedViewTag,
+                keyEvent,
+            )
+        )
+      }
+    }
+  }
+
+  fun setFocusedView(viewTag: Int) {
+    focusedViewTag = viewTag
+  }
+
+  fun clearFocus() {
+    focusedViewTag = View.NO_ID
+  }
+}

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;
@@ -782,13 +781,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

@@ -45,7 +45,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;
@@ -699,13 +698,6 @@ 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);
-  }
-
   @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/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"
+  }
+}