@fileverse-dev/fortune-core 1.3.11-input-ref → 1.3.11-input-ref-2

package/es/events/keyboard.d.ts

@@ -1,6 +1,6 @@
 import { Context } from "../context";
 import { GlobalCache } from "../types";
-export declare function handleGlobalEnter(ctx: Context, cellInput: HTMLDivElement, e: KeyboardEvent, canvas?: CanvasRenderingContext2D): void;
+export declare function handleGlobalEnter(ctx: Context, cellInput: HTMLDivElement, e: KeyboardEvent, cache: GlobalCache, canvas?: CanvasRenderingContext2D): void;
 export declare function handleWithCtrlOrMetaKey(ctx: Context, cache: GlobalCache, e: KeyboardEvent, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, handleUndo: () => void, handleRedo: () => void): void;
 export declare function handleArrowKey(ctx: Context, e: KeyboardEvent): void;
 export declare function handleGlobalKeyDown(ctx: Context, cellInput: HTMLDivElement, fxInput: HTMLDivElement | null | undefined, e: KeyboardEvent, cache: GlobalCache, handleUndo: () => void, handleRedo: () => void, canvas?: CanvasRenderingContext2D): Promise<void>;

package/es/events/keyboard.js

@@ -117,18 +117,30 @@ import _ from "lodash";
 import { hideCRCount, removeActiveImage } from "..";
 import { getFlowdata } from "../context";
 import { updateCell, cancelNormalSelected } from "../modules/cell";
-import { handleFormulaInput, israngeseleciton, maybeRecoverDirtyRangeSelection, markRangeSelectionDirty } from "../modules/formula";
+import { handleFormulaInput, israngeseleciton, maybeRecoverDirtyRangeSelection, markRangeSelectionDirty, setFormulaEditorOwner, getFormulaEditorOwner, suppressFormulaRangeSelectionForInitialEdit } from "../modules/formula";
+import { isInlineStringCell } from "../modules/inline-string";
 import { copy, deleteSelectedCellText, deleteSelectedCellFormat, textFormat, fillDate, fillTime, fillRightData, fillDownData, moveHighlightCell, moveHighlightRange, selectAll, selectionCache } from "../modules/selection";
 import { cancelPaintModel, handleBold, handleItalic, handleUnderline, handleLink } from "../modules/toolbar";
 import { hasPartMC } from "../modules/validation";
 import { getNowDateTime, getSheetIndex, isAllowEdit } from "../utils";
 import { handleCopy } from "./copy";
 import { jfrefreshgrid } from "../modules/refresh";
+import { moveToEnd } from "../modules/cursor";
+function clearTypeOverPending(cache) {
+  delete cache.pendingTypeOverCell;
+}
+function getTypeOverInitialContent(e) {
+  if (e.keyCode === 229) return undefined;
+  if (e.ctrlKey || e.metaKey || e.altKey) return undefined;
+  if (e.key === "Backspace" || e.key === "Delete") return "";
+  if (e.key.length === 1) return e.key;
+  return undefined;
+}
 function isLegacyFormulaRangeMode(ctx) {
   return !!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || ctx.formulaCache.rangeSelectionActive === true || israngeseleciton(ctx);
 }
-export function handleGlobalEnter(ctx, cellInput, e, canvas) {
-  var _a, _b, _c;
+export function handleGlobalEnter(ctx, cellInput, e, cache, canvas) {
+  var _a, _b, _c, _d;
   if ((e.altKey || e.metaKey) && ctx.luckysheetCellUpdate.length > 0) {
     var last = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
     if (last && !_.isNil(last.row_focus) && !_.isNil(last.column_focus)) {}
@@ -136,33 +148,61 @@ export function handleGlobalEnter(ctx, cellInput, e, canvas) {
   } else if (ctx.luckysheetCellUpdate.length > 0) {
     var lastCellUpdate = _.clone(ctx.luckysheetCellUpdate);
     updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+    cache.enteredEditByTyping = false;
+    clearTypeOverPending(cache);
     ctx.luckysheet_select_save = [{
       row: [lastCellUpdate[0], lastCellUpdate[0]],
       column: [lastCellUpdate[1], lastCellUpdate[1]],
       row_focus: lastCellUpdate[0],
       column_focus: lastCellUpdate[1]
     }];
-    moveHighlightCell(ctx, "down", hideCRCount(ctx, "ArrowDown"), "rangeOfSelect");
+    var rowStep = e.shiftKey ? -hideCRCount(ctx, "ArrowUp") : hideCRCount(ctx, "ArrowDown");
+    moveHighlightCell(ctx, "down", rowStep, "rangeOfSelect");
     e.preventDefault();
   } else {
     if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
       var last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
       var row_index = last.row_focus;
       var col_index = last.column_focus;
+      if (!_.isNil(row_index) && !_.isNil(col_index)) {
+        var flowdata = getFlowdata(ctx);
+        var cellAt = (_d = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _d === void 0 ? void 0 : _d[col_index];
+        if ((cellAt === null || cellAt === void 0 ? void 0 : cellAt.f) != null && String(cellAt.f).trim() !== "") {
+          suppressFormulaRangeSelectionForInitialEdit(ctx);
+        }
+      }
       ctx.luckysheetCellUpdate = [row_index, col_index];
+      cache.enteredEditByTyping = false;
+      clearTypeOverPending(cache);
       e.preventDefault();
     }
   }
 }
+function cellCountsForDataEdge(cell) {
+  var _a, _b;
+  if (cell == null) return false;
+  if (!_.isPlainObject(cell)) return !_.isNil(cell);
+  if (cell.f != null && String(cell.f) !== "") return true;
+  if (!_.isNil(cell.v)) return true;
+  if (isInlineStringCell(cell)) {
+    return ((_b = (_a = cell.ct) === null || _a === void 0 ? void 0 : _a.s) !== null && _b !== void 0 ? _b : []).some(function (seg) {
+      return (seg === null || seg === void 0 ? void 0 : seg.v) != null && String(seg.v).length > 0;
+    });
+  }
+  return false;
+}
 function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, startC, endC, maxRow, maxCol) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c;
   var selectedLimit = -1;
   if (key === "ArrowUp") selectedLimit = startR - 1;else if (key === "ArrowDown") selectedLimit = endR + 1;else if (key === "ArrowLeft") selectedLimit = startC - 1;else if (key === "ArrowRight") selectedLimit = endC + 1;
   var maxRowCol = colDelta === 0 ? maxRow : maxCol;
   var r = colDelta === 0 ? selectedLimit : curr;
   var c = colDelta === 0 ? curr : selectedLimit;
   while (r >= 0 && c >= 0 && (colDelta === 0 ? r : c) < maxRowCol - 1) {
-    if (!_.isNil((_b = (_a = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r]) === null || _a === void 0 ? void 0 : _a[c]) === null || _b === void 0 ? void 0 : _b.v) && (_.isNil((_d = (_c = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r - rowDelta]) === null || _c === void 0 ? void 0 : _c[c - colDelta]) === null || _d === void 0 ? void 0 : _d.v) || _.isNil((_f = (_e = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r + rowDelta]) === null || _e === void 0 ? void 0 : _e[c + colDelta]) === null || _f === void 0 ? void 0 : _f.v))) {
+    var here = (_a = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r]) === null || _a === void 0 ? void 0 : _a[c];
+    var behind = (_b = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r - rowDelta]) === null || _b === void 0 ? void 0 : _b[c - colDelta];
+    var ahead = (_c = sheetData === null || sheetData === void 0 ? void 0 : sheetData[r + rowDelta]) === null || _c === void 0 ? void 0 : _c[c + colDelta];
+    if (cellCountsForDataEdge(here) && (!cellCountsForDataEdge(behind) || !cellCountsForDataEdge(ahead))) {
       break;
     } else {
       r += 1 * rowDelta;
@@ -171,10 +211,29 @@ function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, star
   }
   return colDelta === 0 ? r : c;
 }
-function handleControlPlusArrowKey(ctx, e, shiftPressed) {
-  if (ctx.formulaCache.rangeSelectionActive === false && !maybeRecoverDirtyRangeSelection(ctx)) {
-    return;
+function isPlainTextCellOrFxEdit(ctx, cellInput, fxInput) {
+  var _a, _b, _c;
+  if (ctx.luckysheetCellUpdate.length === 0) return false;
+  var cellT = ((_a = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _a !== void 0 ? _a : "").trim();
+  var fxT = ((_b = fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerText) !== null && _b !== void 0 ? _b : "").trim();
+  var owner = getFormulaEditorOwner(ctx);
+  if (owner === "fx" && fxInput) {
+    return !fxT.startsWith("=");
   }
+  if (owner === "cell") {
+    return !cellT.startsWith("=");
+  }
+  var aid = (_c = document.activeElement) === null || _c === void 0 ? void 0 : _c.id;
+  if (aid === "luckysheet-functionbox-cell" && fxInput) {
+    return !fxT.startsWith("=");
+  }
+  if (aid === "luckysheet-rich-text-editor") {
+    return !cellT.startsWith("=");
+  }
+  if (cellT.startsWith("=") || fxT.startsWith("=")) return false;
+  return true;
+}
+function handleControlPlusArrowKey(ctx, e, shiftPressed) {
   var isFormulaRefMode = isLegacyFormulaRangeMode(ctx);
   if (isFormulaRefMode) {
     ctx.formulaCache.rangeSelectionActive = true;
@@ -248,6 +307,9 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
   var _a, _b, _c, _d;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
+  if ((e.ctrlKey || e.metaKey) && ["ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight"].includes(e.key) && isPlainTextCellOrFxEdit(ctx, cellInput, fxInput)) {
+    return;
+  }
   if (e.shiftKey) {
     ctx.luckysheet_shiftpositon = _.cloneDeep((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1]);
     ctx.luckysheet_shiftkeydown = true;
@@ -260,6 +322,8 @@ export function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handl
       var col_index = last.column_focus;
       updateCell(ctx, row_index, col_index, cellInput);
       ctx.luckysheetCellUpdate = [row_index, col_index];
+      cache.enteredEditByTyping = false;
+      clearTypeOverPending(cache);
       cache.ignoreWriteCell = true;
       var value = getNowDateTime(2);
       cellInput.innerText = value;
@@ -396,10 +460,10 @@ export function handleArrowKey(ctx, e) {
   e.preventDefault();
 }
 export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g;
   return __awaiter(this, void 0, void 0, function () {
-    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
-    return __generator(this, function (_d) {
+    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, flowdataF2, cellF2, isEditing, inlineText, fxText, isFormulaEdit, enteredByTyping, last, row_index, col_index, flowdata, cellAt, existingFormula, initial;
+    return __generator(this, function (_h) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
         e.stopPropagation();
@@ -460,10 +524,12 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
       }
       if (kstr === "Enter") {
         if (!allowEdit) return [2];
-        handleGlobalEnter(ctx, cellInput, e, canvas);
+        handleGlobalEnter(ctx, cellInput, e, cache, canvas);
       } else if (kstr === "Tab") {
         if (ctx.luckysheetCellUpdate.length > 0) {
           updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+          cache.enteredEditByTyping = false;
+          clearTypeOverPending(cache);
         }
         if (e.shiftKey) {
           moveHighlightCell(ctx, "right", -hideCRCount(ctx, "ArrowLeft"), "rangeOfSelect");
@@ -480,11 +546,22 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
         if (!last) return [2];
         row_index = last.row_focus;
         col_index = last.column_focus;
+        if (!_.isNil(row_index) && !_.isNil(col_index)) {
+          flowdataF2 = getFlowdata(ctx);
+          cellF2 = (_d = flowdataF2 === null || flowdataF2 === void 0 ? void 0 : flowdataF2[row_index]) === null || _d === void 0 ? void 0 : _d[col_index];
+          if ((cellF2 === null || cellF2 === void 0 ? void 0 : cellF2.f) != null && String(cellF2.f).trim() !== "") {
+            suppressFormulaRangeSelectionForInitialEdit(ctx);
+          }
+        }
+        cache.enteredEditByTyping = false;
+        clearTypeOverPending(cache);
         ctx.luckysheetCellUpdate = [row_index, col_index];
         e.preventDefault();
       } else if (kstr === "F4" && ctx.luckysheetCellUpdate.length > 0) {
         e.preventDefault();
       } else if (kstr === "Escape" && ctx.luckysheetCellUpdate.length > 0) {
+        cache.enteredEditByTyping = false;
+        clearTypeOverPending(cache);
         cancelNormalSelected(ctx);
         moveHighlightCell(ctx, "down", 0, "rangeOfSelect");
         e.preventDefault();
@@ -510,16 +587,53 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
           jfrefreshgrid(ctx, null, undefined);
           e.preventDefault();
         } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
-          handleArrowKey(ctx, e);
+          isEditing = ctx.luckysheetCellUpdate.length > 0;
+          inlineText = (_e = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _e !== void 0 ? _e : "";
+          fxText = (_f = fxInput === null || fxInput === void 0 ? void 0 : fxInput.innerText) !== null && _f !== void 0 ? _f : "";
+          isFormulaEdit = isEditing && (inlineText.trim().startsWith("=") || fxText.trim().startsWith("="));
+          enteredByTyping = cache.enteredEditByTyping === true;
+          if (isEditing && !isFormulaEdit && enteredByTyping && !e.shiftKey) {
+            updateCell(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+            cache.enteredEditByTyping = false;
+            clearTypeOverPending(cache);
+            handleArrowKey(ctx, e);
+            e.preventDefault();
+          } else {
+            handleArrowKey(ctx, e);
+          }
         } else if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || kcode === 0 || e.ctrlKey && kcode === 86) {
           if (!allowEdit) return [2];
           if (String.fromCharCode(kcode) != null && !_.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
             last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
             row_index = last.row_focus;
             col_index = last.column_focus;
+            if (_.isNil(row_index) || _.isNil(col_index)) return [2];
+            flowdata = getFlowdata(ctx);
+            cellAt = (_g = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _g === void 0 ? void 0 : _g[col_index];
+            existingFormula = (cellAt === null || cellAt === void 0 ? void 0 : cellAt.f) != null && String(cellAt.f).trim() !== "" ? String(cellAt.f).replace(/[\r\n]/g, "") : null;
+            if (existingFormula != null) {
+              suppressFormulaRangeSelectionForInitialEdit(ctx);
+            }
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
-            handleFormulaInput(ctx, fxInput, cellInput, kcode);
+            cache.pendingTypeOverCell = [row_index, col_index];
+            setFormulaEditorOwner(ctx, "cell");
+            cache.enteredEditByTyping = true;
+            cellInput.focus();
+            initial = getTypeOverInitialContent(e);
+            if (initial !== undefined) {
+              cellInput.textContent = initial;
+              if (fxInput) fxInput.textContent = initial;
+              handleFormulaInput(ctx, fxInput, cellInput, kcode);
+              e.preventDefault();
+            } else {
+              cellInput.textContent = "";
+              if (fxInput) fxInput.textContent = "";
+              handleFormulaInput(ctx, fxInput, cellInput, kcode);
+            }
+            queueMicrotask(function () {
+              moveToEnd(cellInput);
+            });
           }
         }
       }

package/es/events/mouse.js

@@ -1,6 +1,6 @@
 import _ from "lodash";
 import { getFlowdata } from "../context";
-import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, maybeRecoverDirtyRangeSelection, rangeHightlightselected, rangeSetValue, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
+import { cancelActiveImgItem, cancelPaintModel, functionHTMLGenerate, israngeseleciton, maybeRecoverDirtyRangeSelection, rangeHightlightselected, rangeSetValue, getFormulaEditorOwner, onCommentBoxMove, onCommentBoxMoveEnd, onCommentBoxResize, onCommentBoxResizeEnd, onImageMove, onImageMoveEnd, onImageResize, onImageResizeEnd, removeEditingComment, removeOverShowComment, rangeDrag, onFormulaRangeDragEnd, createFormulaRangeSelect, createRangeHightlight, onCellsMoveEnd, onCellsMove, cellFocus, editComment, onIframeMoveEnd, onIframeResizeEnd, overShowError } from "../modules";
 import { getFrozenHandleLeft, getFrozenHandleTop, scrollToFrozenRowCol } from "../modules/freeze";
 import { cancelFunctionrangeSelected, mergeBorder, mergeMoveMain, updateCell, luckysheetUpdateCell } from "../modules/cell";
 import { colLocation, colLocationByIndex, rowLocation, rowLocationByIndex } from "../modules/location";
@@ -175,6 +175,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
   ctx.luckysheet_scroll_status = true;
   if (ctx.luckysheetCellUpdate.length > 0) {
     if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || israngeseleciton(ctx)) {
+      var formulaEditorForCmdComma = getFormulaEditorOwner(ctx) === "fx" && fxInput ? fxInput : cellInput;
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -241,13 +242,14 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_g = _.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
-        var vText = cellInput.innerText;
+      } else if ((e.ctrlKey || e.metaKey) && ((_g = _.last(formulaEditorForCmdComma.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
+        var didCmdCommaFormulaHtml = false;
+        var vText = formulaEditorForCmdComma.innerText;
         if (vText[vText.length - 1] === ")") {
           vText = vText.substring(0, vText.length - 1);
         }
         if (vText.length > 0) {
-          var lastWord = vText.substring(vText.length - 1, 1);
+          var lastWord = vText.slice(-1);
           if (lastWord !== "," && lastWord !== "=" && lastWord !== "(") {
             vText += ",";
           }
@@ -263,15 +265,21 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
             ctx.formulaCache.functionRangeIndex = textRange;
           }
           cellInput.innerHTML = vText;
+          if (fxInput) fxInput.innerHTML = vText;
           cancelFunctionrangeSelected(ctx);
           createRangeHightlight(ctx, vText);
+          didCmdCommaFormulaHtml = true;
         }
         ctx.formulaCache.rangestart = false;
         ctx.formulaCache.rangedrag_column_start = false;
         ctx.formulaCache.rangedrag_row_start = false;
-        if (fxInput) fxInput.innerHTML = vText;
-        rangeHightlightselected(ctx, cellInput);
+        rangeHightlightselected(ctx, formulaEditorForCmdComma);
         israngeseleciton(ctx);
+        if (didCmdCommaFormulaHtml) {
+          ctx.formulaCache.rangechangeindex = undefined;
+          var ch = formulaEditorForCmdComma.childNodes;
+          ctx.formulaCache.rangeSetValueTo = ch.length > 0 ? ch[ch.length - 1] : undefined;
+        }
         ctx.formulaCache.func_selectedrange = {
           left: left,
           width: width,
@@ -305,6 +313,7 @@ export function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, containe
       ctx.formulaCache.rangestart = true;
       ctx.formulaCache.rangedrag_column_start = false;
       ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       rangeSetValue(ctx, cellInput, {
         row: rowseleted,
         column: columnseleted
@@ -483,6 +492,8 @@ export function handleCellAreaDoubleClick(ctx, globalCache, settings, e, contain
     row_index = row_focus;
     col_index = column_focus;
   }
+  globalCache.enteredEditByTyping = false;
+  delete globalCache.pendingTypeOverCell;
   luckysheetUpdateCell(ctx, row_index, col_index);
 }
 export function handleContextMenu(ctx, settings, e, workbookContainer, container, area) {
@@ -950,7 +961,7 @@ export function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX,
   }
 }
 export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollbarY, container, cellInput, fxInput) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var rect = container.getBoundingClientRect();
   onImageMoveEnd(ctx, globalCache);
   onImageResizeEnd(ctx, globalCache);
@@ -963,11 +974,17 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
   onRangeSelectionModalMoveEnd(globalCache);
   onCellsMoveEnd(ctx, globalCache, e, scrollbarX, scrollbarY, container);
   if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start) {
-    if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {
+    if (getFormulaEditorOwner(ctx) === "fx") {
       handleFormulaInput(ctx, cellInput, fxInput, 0, undefined, false);
     } else {
       handleFormulaInput(ctx, fxInput, cellInput, 0, undefined, false);
     }
+    ctx.luckysheet_select_status = false;
+    ctx.luckysheet_scroll_status = false;
+    ctx.luckysheet_rows_selected_status = false;
+    ctx.luckysheet_cols_selected_status = false;
+    e.preventDefault();
+    return;
   }
   if (ctx.luckysheet_select_status) {
     if (ctx.luckysheetPaintModelOn) {
@@ -1009,10 +1026,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     cfg_1.customHeight[ctx.luckysheet_rows_change_size_start[1]] = 1;
     var changeRowIndex_1 = ctx.luckysheet_rows_change_size_start[1];
     var changeRowSelected_1 = false;
-    if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) > 0) {
-      (_e = (_d = ctx.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d.filter(function (select) {
+    if (((_b = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0) {
+      (_d = (_c = ctx.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c.filter(function (select) {
         return select.row_select;
-      })) === null || _e === void 0 ? void 0 : _e.some(function (select) {
+      })) === null || _d === void 0 ? void 0 : _d.some(function (select) {
         if (changeRowIndex_1 >= select.row[0] && changeRowIndex_1 <= select.row[1]) {
           changeRowSelected_1 = true;
         }
@@ -1021,9 +1038,9 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     }
     if (changeRowSelected_1) {
       cfg_1.rowlen || (cfg_1.rowlen = {});
-      (_g = (_f = ctx.luckysheet_select_save) === null || _f === void 0 ? void 0 : _f.filter(function (select) {
+      (_f = (_e = ctx.luckysheet_select_save) === null || _e === void 0 ? void 0 : _e.filter(function (select) {
         return select.row_select;
-      })) === null || _g === void 0 ? void 0 : _g.forEach(function (select) {
+      })) === null || _f === void 0 ? void 0 : _f.forEach(function (select) {
         for (var r = select.row[0]; r <= select.row[1]; r += 1) {
           cfg_1.rowlen[r] = Math.ceil(size_1 / ctx.zoomRatio);
         }
@@ -1067,10 +1084,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     cfg_2.customWidth[ctx.luckysheet_cols_change_size_start[1]] = 1;
     var changeColumnIndex_1 = ctx.luckysheet_cols_change_size_start[1];
     var changeColumnSelected_1 = false;
-    if (((_j = (_h = ctx.luckysheet_select_save) === null || _h === void 0 ? void 0 : _h.length) !== null && _j !== void 0 ? _j : 0) > 0) {
-      (_l = (_k = ctx.luckysheet_select_save) === null || _k === void 0 ? void 0 : _k.filter(function (select) {
+    if (((_h = (_g = ctx.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0) > 0) {
+      (_k = (_j = ctx.luckysheet_select_save) === null || _j === void 0 ? void 0 : _j.filter(function (select) {
         return select.column_select;
-      })) === null || _l === void 0 ? void 0 : _l.some(function (select) {
+      })) === null || _k === void 0 ? void 0 : _k.some(function (select) {
         if (changeColumnIndex_1 >= select.column[0] && changeColumnIndex_1 <= select.column[1]) {
           changeColumnSelected_1 = true;
         }
@@ -1079,9 +1096,9 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     }
     if (changeColumnSelected_1) {
       cfg_2.columnlen || (cfg_2.columnlen = {});
-      (_o = (_m = ctx.luckysheet_select_save) === null || _m === void 0 ? void 0 : _m.filter(function (select) {
+      (_m = (_l = ctx.luckysheet_select_save) === null || _l === void 0 ? void 0 : _l.filter(function (select) {
         return select.column_select;
-      })) === null || _o === void 0 ? void 0 : _o.forEach(function (select) {
+      })) === null || _m === void 0 ? void 0 : _m.forEach(function (select) {
         for (var r = select.column[0]; r <= select.column[1]; r += 1) {
           cfg_2.columnlen[r] = Math.ceil(size_2 / ctx.zoomRatio);
         }
@@ -1098,10 +1115,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     ctx.luckysheet_cols_freeze_drag = false;
     var scrollLeft = ctx.scrollLeft;
     var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft - window.scrollX;
-    var _p = colLocation(x, ctx.visibledatacolumn),
-      col_pre = _p[0],
-      col_curr = _p[1],
-      col_index_curr = _p[2];
+    var _o = colLocation(x, ctx.visibledatacolumn),
+      col_pre = _o[0],
+      col_curr = _o[1],
+      col_index_curr = _o[2];
     var col_index = x > (col_curr + col_pre) / 2 ? col_index_curr : col_index_curr - 1;
     var idx = getSheetIndex(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1149,10 +1166,10 @@ export function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX,
     ctx.luckysheet_rows_freeze_drag = false;
     var scrollTop = ctx.scrollTop;
     var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop - window.scrollY;
-    var _q = rowLocation(y, ctx.visibledatarow),
-      row_pre = _q[0],
-      row_curr = _q[1],
-      row_index_curr = _q[2];
+    var _p = rowLocation(y, ctx.visibledatarow),
+      row_pre = _p[0],
+      row_curr = _p[1],
+      row_index_curr = _p[2];
     var row_index = y > (row_curr + row_pre) / 2 ? row_index_curr : row_index_curr - 1;
     var idx = getSheetIndex(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1336,6 +1353,7 @@ export function handleRowHeaderMouseDown(ctx, globalCache, e, container, cellInp
       ctx.formulaCache.rangedrag_row_start = true;
       ctx.formulaCache.rangestart = false;
       ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         createRangeHightlight(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -1568,6 +1586,7 @@ export function handleColumnHeaderMouseDown(ctx, globalCache, e, container, cell
       ctx.formulaCache.rangedrag_column_start = true;
       ctx.formulaCache.rangestart = false;
       ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
       if (ctx.formulaCache.rangechangeindex > ctx.formulaRangeHighlight.length) {
         createRangeHightlight(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);

package/es/modules/cell.js

@@ -16,7 +16,7 @@ import { checkCF, getComputeMap } from "./ConditionFormat";
 import { getFailureText, validateCellData } from "./dataVerification";
 import { genarate, update } from "./format";
 import { clearCellError, getRowHeight } from "../api";
-import { delFunctionGroup, execfunction, execFunctionGroup, functionHTMLGenerate, getcellrange, iscelldata } from "./formula";
+import { delFunctionGroup, execfunction, execFunctionGroup, functionHTMLGenerate, getcellrange, iscelldata, suppressFormulaRangeSelectionForInitialEdit } from "./formula";
 import { attrToCssName, convertSpanToShareString, isInlineStringCell, isInlineStringCT } from "./inline-string";
 import { isRealNull, isRealNum, valueIsError } from "./validation";
 import { getCellTextInfo } from "./text";
@@ -69,6 +69,32 @@ function newlinesToBr(text) {
   if (!text) return "";
   return text.replace(/\r\n|\r|\n/g, "<br />");
 }
+function closeUnclosedParenthesesInFormula(formula) {
+  if (!formula.startsWith("=") || formula.length <= 1) return formula;
+  var body = formula.slice(1);
+  var depth = 0;
+  var inString = false;
+  for (var i = 0; i < body.length; i += 1) {
+    var ch = body[i];
+    if (inString) {
+      if (ch === '"') {
+        if (body[i + 1] === '"') {
+          i += 1;
+        } else {
+          inString = false;
+        }
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      continue;
+    }
+    if (ch === "(") depth += 1;else if (ch === ")") depth = Math.max(0, depth - 1);
+  }
+  if (depth <= 0) return formula;
+  return "".concat(formula).concat(")".repeat(depth));
+}
 export function getCellValue(r, c, data, attr) {
   var _a;
   if (!attr) {
@@ -542,6 +568,7 @@ export function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangedrag_column_start = false;
   ctx.formulaCache.rangedrag_row_start = false;
   ctx.formulaCache.rangeSelectionActive = null;
+  ctx.formulaCache.formulaEditorOwner = null;
 }
 export function updateCell(ctx, r, c, $input, value, canvas) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
@@ -617,6 +644,11 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
       }
     }
     value = value || inputText;
+    if (_.isString(value) && value.startsWith("=") && value.length > 1) {
+      value = closeUnclosedParenthesesInFormula(value);
+    } else if (_.isPlainObject(value) && _.isString(value.f) && value.f.startsWith("=") && value.f.length > 1) {
+      value.f = closeUnclosedParenthesesInFormula(value.f);
+    }
     var shouldClearError = (oldValue_1 === null || oldValue_1 === void 0 ? void 0 : oldValue_1.f) ? oldValue_1.f !== value : (oldValue_1 === null || oldValue_1 === void 0 ? void 0 : oldValue_1.v) !== value;
     if (shouldClearError) {
       clearCellError(ctx, r, c);
@@ -1225,6 +1257,12 @@ export function getdatabyselection(ctx, range, sheetId) {
   return data;
 }
 export function luckysheetUpdateCell(ctx, row_index, col_index) {
+  var _a;
+  var flowdata = getFlowdata(ctx);
+  var cell = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _a === void 0 ? void 0 : _a[col_index];
+  if ((cell === null || cell === void 0 ? void 0 : cell.f) != null && String(cell.f).trim() !== "") {
+    suppressFormulaRangeSelectionForInitialEdit(ctx);
+  }
   ctx.luckysheetCellUpdate = [row_index, col_index];
 }
 export function getDataBySelectionNoCopy(ctx, range) {

package/es/modules/formula.d.ts

@@ -21,6 +21,7 @@ export declare class FormulaCache {
     rangedrag_column_start?: boolean;
     rangedrag_row_start?: boolean;
     rangeSelectionActive?: boolean | null;
+    formulaEditorOwner?: "cell" | "fx" | null;
     functionRangeIndex?: number[];
     functionlistMap: any;
     execFunctionExist?: any[];
@@ -47,6 +48,12 @@ export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivEl
 export declare function functionHTMLGenerate(txt: string): string;
 export declare function getLastFormulaRangeIndex($editor: HTMLDivElement): number | null;
 export declare function getFormulaRangeIndexAtCaret($editor: HTMLDivElement): number | null;
+export declare function setFormulaEditorOwner(ctx: Context, owner: "cell" | "fx" | null): void;
+export declare function getFormulaEditorOwner(ctx: Context): "cell" | "fx" | null;
+export declare function hasIncompleteTruncatedCellRangeSyntax(formulaText: string): boolean;
+export declare function isBareCellOrRangeOnlyFormula(formulaText: string): boolean;
+export declare function suppressFormulaRangeSelectionForInitialEdit(ctx: Context): void;
+export declare function isCaretAtValidFormulaRangeInsertionPoint(editor: HTMLElement | null): boolean;
 export declare function markRangeSelectionDirty(ctx: Context): void;
 export declare function getFormulaRangeIndexForKeyboardSync($editor: HTMLDivElement): number | null;
 export declare function handleFormulaInput(ctx: Context, $copyTo: HTMLDivElement | null | undefined, $editor: HTMLDivElement, kcode: number, preText?: string, refreshRangeSelect?: boolean): void;