Removed ESC from global shortcuts to locally handle it in dialog.

ubidefeo · ubidefeo · commit cc935436ef75 · 2024-12-19T08:07:00.000+01:00
Signed-off-by: ubi de feo &lt;me@ubidefeo.com&gt;
diff --git a/backend/shortcuts.js b/backend/shortcuts.js
@@ -11,7 +11,6 @@ module.exports = {
     CLEAR_TERMINAL: 'CommandOrControl+L',
     EDITOR_VIEW: 'CommandOrControl+Alt+1',
     FILES_VIEW: 'CommandOrControl+Alt+2',
-    ESC: 'Escape'
   },
   menu: {
     CONNECT: 'CmdOrCtrl+Shift+C',
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
@@ -1447,11 +1447,11 @@ async function store(state, emitter) {
       if (state.view != 'editor') return
       emitter.emit('change-view', 'file-manager')
     }
-    if (key === shortcuts.ESC) {
-      if (state.isConnectionDialogOpen) {
-        emitter.emit('close-connection-dialog')
-      }
-    }
+    // if (key === shortcuts.ESC) {
+    //   if (state.isConnectionDialogOpen) {
+    //     emitter.emit('close-connection-dialog')
+    //   }
+    // }
 
   })
 
diff --git a/ui/arduino/views/components/connection-dialog.js b/ui/arduino/views/components/connection-dialog.js
@@ -6,6 +6,19 @@ function ConnectionDialog(state, emit) {
     }
   }
 
+  function onKeyDown(e) {
+    if (e.key.toLowerCase() === 'escape') {
+      emit('close-connection-dialog')
+    }
+  }
+
+  // Add/remove event listener based on dialog state
+  if (state.isConnectionDialogOpen) {
+    document.addEventListener('keydown', onKeyDown)
+  } else {
+    document.removeEventListener('keydown', onKeyDown)
+  }
+
   return html`
     <div id="dialog" class="${stateClass}" onclick=${onClick}>
       <div class="dialog-content">
