fix(formula-editor): shortcut key priority

dream-num · Oct 26, 2024 · 1fc0456 · 1fc0456
1 parent f3d3e49
commit 1fc0456
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/hooks/useLeftAndRightArrow.ts b/packages/sheets-formula-ui/src/views/formula-editor/hooks/useLeftAndRightArrow.ts
@@ -19,14 +19,13 @@ import { CommandType, DisposableCollection, ICommandService, useDependency } fro
 import { DeviceInputEventType } from '@univerjs/engine-render';
 import { IShortcutService, KeyCode } from '@univerjs/ui';
 import { useEffect } from 'react';
-import { PROMPT_SELECTION_KEYCODE_ARROW_LIST } from '../../../controllers/shortcuts/prompt.shortcut';
 
-export const useLeftAndRightArrow = (editor?: Editor) => {
+export const useLeftAndRightArrow = (isNeed: boolean, editor?: Editor) => {
     const commandService = useDependency(ICommandService);
     const shortcutService = useDependency(IShortcutService);
 
     useEffect(() => {
-        if (!editor) {
+        if (!editor || !isNeed) {
             return;
         }
         const editorId = editor.getEditorId();
@@ -64,7 +63,7 @@ export const useLeftAndRightArrow = (editor?: Editor) => {
             },
         }));
 
-        PROMPT_SELECTION_KEYCODE_ARROW_LIST.map((keyCode) => {
+        [KeyCode.ARROW_LEFT, KeyCode.ARROW_RIGHT].map((keyCode) => {
             return {
                 id: operationId,
                 binding: keyCode,
@@ -82,5 +81,5 @@ export const useLeftAndRightArrow = (editor?: Editor) => {
         return () => {
             d.dispose();
         };
-    }, [editor]);
+    }, [editor, isNeed]);
 };
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx b/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
@@ -129,7 +129,7 @@ export function FormulaEditor(props: IFormulaEditorProps) {
     useSheetHighlight(isFocus, unitId, subUnitId, refSelections);
     useResize(editor);
     useRefactorEffect(isFocus, unitId);
-    useLeftAndRightArrow(editor);
+    useLeftAndRightArrow(isFocus, editor);
     useSheetSelectionChange(isFocus, unitId, subUnitId, sequenceNodes, isSupportAcrossSheet, editor, handleSelectionChange);
     useBlur(editorId, isFocusSet);
     const { searchList, searchText, handlerFormulaReplace, reset: resetFormulaSearch } = useFormulaSearch(sequenceNodes, editor);