Remove handling Esc key explicitly

JetBrains · Jul 26, 2023 · 9be340c · 9be340c
1 parent dc65d7a
commit 9be340c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 21 deletions.
diff --git a/.../desktopMain/kotlin/androidx/compose/foundation/BasicContextMenuRepresentation.desktop.kt b/.../desktopMain/kotlin/androidx/compose/foundation/BasicContextMenuRepresentation.desktop.kt
@@ -115,10 +115,6 @@ class DefaultContextMenuRepresentation(
                 onKeyEvent = {
                     if (it.type == KeyEventType.KeyDown) {
                         when (it.key.nativeKeyCode) {
-                            java.awt.event.KeyEvent.VK_ESCAPE -> {
-                                state.status = ContextMenuState.Status.Closed
-                                true
-                            }
                             java.awt.event.KeyEvent.VK_DOWN  -> {
                                 inputModeManager!!.requestInputMode(InputMode.Keyboard)
                                 focusManager!!.moveFocus(FocusDirection.Next)

diff --git a/...l/material/src/desktopMain/kotlin/androidx/compose/material/DesktopAlertDialog.desktop.kt b/...l/material/src/desktopMain/kotlin/androidx/compose/material/DesktopAlertDialog.desktop.kt
@@ -368,14 +368,6 @@ object PopupAlertDialogProvider : AlertDialogProvider {
             },
             focusable = true,
             onDismissRequest = onDismissRequest,
-            onKeyEvent = {
-                if (it.type == KeyEventType.KeyDown && it.awtEventOrNull?.keyCode == KeyEvent.VK_ESCAPE) {
-                    onDismissRequest()
-                    true
-                } else {
-                    false
-                }
-            },
         ) {
             val scrimColor = Color.Black.copy(alpha = 0.32f) //todo configure scrim color in function arguments
             Box(

diff --git a/...se/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/SkikoMenu.skiko.kt b/...se/material3/material3/src/skikoMain/kotlin/androidx/compose/material3/SkikoMenu.skiko.kt
@@ -124,7 +124,7 @@ fun DropdownMenu(
             onDismissRequest = onDismissRequest,
             popupPositionProvider = popupPositionProvider,
             onKeyEvent = {
-                handlePopupOnKeyEvent(it, onDismissRequest, focusManager!!, inputModeManager!!)
+                handlePopupOnKeyEvent(it, focusManager!!, inputModeManager!!)
             },
         ) {
             focusManager = LocalFocusManager.current
@@ -195,21 +195,17 @@ fun DropdownMenuItem(
 @ExperimentalComposeUiApi
 private fun handlePopupOnKeyEvent(
     keyEvent: KeyEvent,
-    onDismissRequest: () -> Unit,
     focusManager: FocusManager,
     inputModeManager: InputModeManager
 ): Boolean {
-    return if (keyEvent.type == KeyEventType.KeyDown && keyEvent.key == Key.Escape) {
-        onDismissRequest()
-        true
-    } else if (keyEvent.type == KeyEventType.KeyDown) {
-        when {
-            keyEvent.key == Key.DirectionDown -> {
+    return if (keyEvent.type == KeyEventType.KeyDown) {
+        when (keyEvent.key) {
+            Key.DirectionDown -> {
                 inputModeManager.requestInputMode(InputMode.Keyboard)
                 focusManager.moveFocus(FocusDirection.Next)
                 true
             }
-            keyEvent.key == Key.DirectionUp -> {
+            Key.DirectionUp -> {
                 inputModeManager.requestInputMode(InputMode.Keyboard)
                 focusManager.moveFocus(FocusDirection.Previous)
                 true