Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(docs-ui): first move-selection on fx-bar sometimes not working (#5017)

ZhangWeie6bfa79ce6ae
diff --git a/packages/docs-ui/src/controllers/render-controllers/doc-selection-render.controller.ts b/packages/docs-ui/src/controllers/render-controllers/doc-selection-render.controller.ts
index 0960b9237c..46a01f4d0e 100644
--- a/packages/docs-ui/src/controllers/render-controllers/doc-selection-render.controller.ts
+++ b/packages/docs-ui/src/controllers/render-controllers/doc-selection-render.controller.ts
@@ -166,7 +166,7 @@ export class DocSelectionRenderController extends Disposable implements IRenderM
const { offsetX, offsetY } = evt;
setTimeout(() => {
- if (unitId === this._editorService.getFocusId()) {
+ if (unitId === this._editorService.getFocusId() || this._docSelectionRenderService.isOnPointerEvent) {
return;
}
this._setEditorFocus(unitId);
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx b/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
index 056c5510d0..464da3cf87 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/index.tsx
@@ -251,7 +251,7 @@ export const FormulaEditor = forwardRef((props: IFormulaEditorProps, ref: Ref<IF
const { checkScrollBar } = useResize(editor, isSingle, autoScrollbar);
useRefactorEffect(isFocus, Boolean(isSelecting && docFocusing), unitId, disableContextMenu);
- useLeftAndRightArrow(isFocus && moveCursor, selectingMode, editor, onMoveInEditor);
+ useLeftAndRightArrow(Boolean(isFocus && isFocusing && moveCursor), selectingMode, editor, onMoveInEditor);
const handleSelectionChange = useEvent((refString: string, offset: number, isEnd: boolean) => {
if (!isFocusing) {
diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
index 2121a554ce..a8647cf031 100644
--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
@@ -530,6 +530,7 @@ export class EditingRenderController extends Disposable {
this._editorBridgeService.disableForceKeepVisible();
}
this._moveSelection(keycode, currentUnitId);
+ return;
}
// Reselect the current selections, when exist cell editor by press ESC.I