Fix Modal not invoking onRequestClose on hardware ESC key on Android

- Root cause: the platform's default Dialog.onKeyUp routed KEYCODE_ESCAPE straight to onBackPressed, dismissing the dialog before our OnKeyListener observed ACTION_UP, so onRequestClose never fired and React state stayed stuck at visible=true.
- Fix: consume both ACTION_DOWN and ACTION_UP (return true) for KEYCODE_BACK/KEYCODE_ESCAPE in ReactModalHostView's dialog OnKeyListener, while still invoking handleCloseAction() exactly once on ACTION_UP. Other keys continue to flow through to currentActivity.onKeyUp on ACTION_UP only.
- Adds Robolectric regression tests (escapeKeyOnDialog_invokesOnRequestCloseListener, backKeyOnDialog_invokesOnRequestCloseListener) that dispatch DOWN+UP through the real dialog and assert the OnRequestCloseListener fires exactly once.

Fixes #56411

Author: mohanrajvenkatesan23-04

packages/react-native/ReactAndroid/src/main/java/com/facebook/react/views/modal/ReactModalHostView.kt

@@ -305,23 +305,27 @@ public class ReactModalHostView(context: ThemedReactContext) :
     newDialog.setOnKeyListener(
         object : DialogInterface.OnKeyListener {
           override fun onKey(dialog: DialogInterface, keyCode: Int, event: KeyEvent): Boolean {
-            if (event.action == KeyEvent.ACTION_UP) {
-              // We need to stop the BACK button and ESCAPE key from closing the dialog by default
-              // so we capture that event and instead inform JS so that it can make the decision as
-              // to whether or not to allow the back/escape key to close the dialog. If it chooses
-              // to, it can just set visible to false on the Modal and the Modal will go away
-              if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
+            // We need to stop the BACK button and ESCAPE key from closing the dialog by default
+            // so we capture that event and instead inform JS so that it can make the decision as
+            // to whether or not to allow the back/escape key to close the dialog. If it chooses
+            // to, it can just set visible to false on the Modal and the Modal will go away.
+            // We consume both ACTION_DOWN and ACTION_UP for these keys so that the platform
+            // cannot dismiss the dialog via a separate path (e.g. Dialog.onKeyUp routing
+            // KEYCODE_ESCAPE directly to onBackPressed) before our listener observes ACTION_UP.
+            if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
+              if (event.action == KeyEvent.ACTION_UP) {
                 handleCloseAction()
-                return true
-              } else {
-                // We redirect the rest of the key events to the current activity, since the
-                // activity expects to receive those events and react to them, ie. in the case of
-                // the dev menu
-                val innerCurrentActivity =
-                    (this@ReactModalHostView.context as ReactContext).currentActivity
-                if (innerCurrentActivity != null) {
-                  return innerCurrentActivity.onKeyUp(keyCode, event)
-                }
+              }
+              return true
+            }
+            if (event.action == KeyEvent.ACTION_UP) {
+              // We redirect the rest of the key events to the current activity, since the
+              // activity expects to receive those events and react to them, ie. in the case of
+              // the dev menu
+              val innerCurrentActivity =
+                  (this@ReactModalHostView.context as ReactContext).currentActivity
+              if (innerCurrentActivity != null) {
+                return innerCurrentActivity.onKeyUp(keyCode, event)
               }
             }
             return false

packages/react-native/ReactAndroid/src/test/java/com/facebook/react/views/modal/ReactModalHostViewTest.kt

@@ -0,0 +1,95 @@
+/*
+ * 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.
+ */
+
+// TODO T207169925: Migrate CatalystInstance to Reacthost and remove the Suppress("DEPRECATION")
+// annotation
+@file:Suppress("DEPRECATION")
+
+package com.facebook.react.views.modal
+
+import android.app.Activity
+import android.view.KeyEvent
+import androidx.core.content.res.ResourcesCompat.ID_NULL
+import com.facebook.react.bridge.BridgeReactContext
+import com.facebook.react.bridge.CatalystInstance
+import com.facebook.react.bridge.ReactTestHelper.createMockCatalystInstance
+import com.facebook.react.internal.featureflags.ReactNativeFeatureFlagsForTests
+import com.facebook.react.uimanager.ThemedReactContext
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.RuntimeEnvironment
+import org.robolectric.android.controller.ActivityController
+
+/**
+ * Verifies that hardware key events on the modal's dialog are routed to the registered
+ * [ReactModalHostView.OnRequestCloseListener]. Regression test for issue #56411 where pressing the
+ * hardware ESC key on Android (e.g. external/Bluetooth keyboard) closed the dialog without ever
+ * invoking the JS `onRequestClose` callback.
+ */
+@RunWith(RobolectricTestRunner::class)
+class ReactModalHostViewTest {
+
+  private lateinit var reactContext: BridgeReactContext
+  private lateinit var catalystInstanceMock: CatalystInstance
+  private lateinit var activityController: ActivityController<Activity>
+  private lateinit var themedContext: ThemedReactContext
+
+  @Before
+  fun setUp() {
+    ReactNativeFeatureFlagsForTests.setUp()
+
+    catalystInstanceMock = createMockCatalystInstance()
+    reactContext = BridgeReactContext(RuntimeEnvironment.getApplication())
+    reactContext.initializeWithInstance(catalystInstanceMock)
+
+    activityController = Robolectric.buildActivity(Activity::class.java).create().start().resume()
+    // Attach the activity to the React context so ReactModalHostView can locate it via
+    // `currentActivity` when constructing the dialog.
+    reactContext.onHostResume(activityController.get())
+
+    themedContext = ThemedReactContext(reactContext, activityController.get(), null, ID_NULL)
+  }
+
+  @Test
+  fun escapeKeyOnDialog_invokesOnRequestCloseListener() {
+    val view = ReactModalHostView(themedContext)
+    var requestCloseInvocations = 0
+    view.onRequestCloseListener =
+        ReactModalHostView.OnRequestCloseListener { requestCloseInvocations++ }
+
+    // Build the underlying ComponentDialog and register the modal's key handlers.
+    view.showOrUpdate()
+    val dialog = checkNotNull(view.dialog) { "Dialog should have been created by showOrUpdate" }
+
+    // Dispatching ACTION_DOWN + ACTION_UP for KEYCODE_ESCAPE through the dialog should be treated
+    // the same as KEYCODE_BACK and trigger onRequestClose exactly once.
+    dialog.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_ESCAPE))
+    dialog.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_ESCAPE))
+
+    assertThat(requestCloseInvocations).isEqualTo(1)
+  }
+
+  @Test
+  fun backKeyOnDialog_invokesOnRequestCloseListener() {
+    val view = ReactModalHostView(themedContext)
+    var requestCloseInvocations = 0
+    view.onRequestCloseListener =
+        ReactModalHostView.OnRequestCloseListener { requestCloseInvocations++ }
+
+    view.showOrUpdate()
+    val dialog = checkNotNull(view.dialog) { "Dialog should have been created by showOrUpdate" }
+
+    dialog.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK))
+    dialog.dispatchKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_BACK))
+
+    assertThat(requestCloseInvocations).isEqualTo(1)
+  }
+}