From 9ae025dc565b8b6e56ff800520a8a779866135aa Mon Sep 17 00:00:00 2001
From: Frank Noirot <frank@zoo.dev>
Date: Thu, 2 Jan 2025 18:04:18 -0500
Subject: [PATCH] Enable enter for autocompletions in the command palette KCL
 input (#4896)

* Enable enter for autocompletions in the command palette KCL input

* Oops I commented out code for the variable name input
Thanks for the catch @pierremtb

---------

Co-authored-by: Pierre Jacquier <pierrejacquier39@gmail.com>
---
 .../CommandBar/CommandBarKclInput.tsx         | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/components/CommandBar/CommandBarKclInput.tsx b/src/components/CommandBar/CommandBarKclInput.tsx
index 54c47e4d42..875ba29996 100644
--- a/src/components/CommandBar/CommandBarKclInput.tsx
+++ b/src/components/CommandBar/CommandBarKclInput.tsx
@@ -1,5 +1,11 @@
-import { Completion } from '@codemirror/autocomplete'
-import { EditorView, ViewUpdate } from '@codemirror/view'
+import {
+  closeBrackets,
+  closeBracketsKeymap,
+  Completion,
+  completionKeymap,
+  completionStatus,
+} from '@codemirror/autocomplete'
+import { EditorView, keymap, ViewUpdate } from '@codemirror/view'
 import { CustomIcon } from 'components/CustomIcon'
 import { useCommandsContext } from 'hooks/useCommandsContext'
 import { useSettingsAuthContext } from 'hooks/useSettingsAuthContext'
@@ -95,6 +101,7 @@ function CommandBarKclInput({
     label: v.key,
     detail: String(roundOff(v.value as number)),
   }))
+  const varMentionsExtension = varMentions(varMentionData)
 
   const { setContainer } = useCodeMirror({
     container: editorRef.current,
@@ -112,23 +119,40 @@ function CommandBarKclInput({
         ? getSystemTheme()
         : settings.context.app.theme.current,
     extensions: [
-      EditorView.domEventHandlers({
-        keydown: (event) => {
-          if (event.key === 'Backspace' && value === '') {
-            event.preventDefault()
-            stepBack()
-          } else if (event.key === 'Enter') {
-            event.preventDefault()
-            handleSubmit()
-          }
-        },
-      }),
-      varMentions(varMentionData),
+      varMentionsExtension,
       EditorView.updateListener.of((vu: ViewUpdate) => {
         if (vu.docChanged) {
           setValue(vu.state.doc.toString())
         }
       }),
+      closeBrackets(),
+      keymap.of([
+        ...closeBracketsKeymap,
+        ...completionKeymap,
+        {
+          key: 'Enter',
+          run: (editor) => {
+            // Only submit if there is no completion active
+            if (completionStatus(editor.state) === null) {
+              handleSubmit()
+              return true
+            } else {
+              return false
+            }
+          },
+        },
+        {
+          key: 'Backspace',
+          run: (editor) => {
+            // Only step back if the editor is empty
+            if (editor.state.doc.toString() === '') {
+              stepBack()
+              return true
+            }
+            return false
+          },
+        },
+      ]),
     ],
   })
 
@@ -227,7 +251,7 @@ function CommandBarKclInput({
               }
             }}
             onKeyUp={(e) => {
-              if (e.key === 'Enter') {
+              if (e.key === 'Enter' && canSubmit) {
                 handleSubmit()
               }
             }}