fix(editor): formula input esc invalid (#1902)

dream-num · Apr 14, 2024 · 87f0994 · 87f0994
1 parent 4a5eca1
commit 87f0994
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/sheets-formula/src/controllers/prompt.controller.ts b/packages/sheets-formula/src/controllers/prompt.controller.ts
@@ -1772,6 +1772,19 @@ export class PromptController extends Disposable {
                         return;
                     }
 
+                    if (keycode === KeyCode.ESC) {
+                        const focusEditor = this._editorService.getFocusEditor();
+                        if (focusEditor && focusEditor.isSheetEditor() === true) {
+                            this._editorBridgeService.changeVisible({
+                                visible: false,
+                                eventType: DeviceInputEventType.Keyboard,
+                                keycode,
+                            });
+                            this._selectionManagerService.refreshSelection();
+                        }
+                        return;
+                    }
+
                     if (this._formulaPromptService.isSearching()) {
                         if (keycode === KeyCode.ARROW_DOWN) {
                             this._formulaPromptService.navigate({ direction: Direction.DOWN });

diff --git a/packages/sheets-formula/src/controllers/shortcuts/prompt.shortcut.ts b/packages/sheets-formula/src/controllers/shortcuts/prompt.shortcut.ts
@@ -31,7 +31,7 @@ export const PROMPT_SELECTION_KEYCODE_ARROW_LIST = [
     KeyCode.ARROW_RIGHT,
 ];
 
-export const PROMPT_SELECTION_KEYCODE_LIST = [...PROMPT_SELECTION_KEYCODE_ARROW_LIST, KeyCode.ENTER, KeyCode.TAB];
+export const PROMPT_SELECTION_KEYCODE_LIST = [...PROMPT_SELECTION_KEYCODE_ARROW_LIST, KeyCode.ENTER, KeyCode.TAB, KeyCode.ESC];
 
 export function promptSelectionShortcutItem() {
     const shortcutList: IShortcutItem[] = [];