@fileverse-dev/fortune-core 1.3.11-input-ref-1 → 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

@@ -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) {
@@ -1342,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);
@@ -1574,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) {
@@ -618,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);
@@ -1226,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

@@ -50,6 +50,9 @@ export declare function getLastFormulaRangeIndex($editor: HTMLDivElement): numbe
 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;

package/es/modules/formula.js

@@ -1647,11 +1647,44 @@ export function getFormulaEditorOwner(ctx) {
   }
   return null;
 }
+function getActiveFormulaEditorElement(ctx) {
+  var _a;
+  var cellEditor = document.getElementById("luckysheet-rich-text-editor");
+  var fxEditor = document.getElementById("luckysheet-functionbox-cell");
+  var owner = getFormulaEditorOwner(ctx);
+  if (owner === "fx") return fxEditor !== null && fxEditor !== void 0 ? fxEditor : cellEditor;
+  if (owner === "cell") return cellEditor !== null && cellEditor !== void 0 ? cellEditor : fxEditor;
+  var activeId = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id;
+  if (activeId === "luckysheet-functionbox-cell") return fxEditor !== null && fxEditor !== void 0 ? fxEditor : cellEditor;
+  if (activeId === "luckysheet-rich-text-editor") return cellEditor !== null && cellEditor !== void 0 ? cellEditor : fxEditor;
+  return cellEditor !== null && cellEditor !== void 0 ? cellEditor : fxEditor;
+}
 function getCurrentFormulaSlotTextBeforeCaret(editor, caretOffset) {
   var textBefore = editor.innerText.slice(0, caretOffset);
   var parts = textBefore.split(/[=,(+\-*/&<>]/);
   return _.trim(parts[parts.length - 1] || "");
 }
+export function hasIncompleteTruncatedCellRangeSyntax(formulaText) {
+  var t = formulaText.replace(/\s/g, "");
+  if (!t.startsWith("=")) return false;
+  if (/[A-Za-z]+\d+:[A-Za-z]+$/i.test(t)) return true;
+  if (/[A-Za-z]+\d+:\s*$/i.test(t)) return true;
+  return false;
+}
+export function isBareCellOrRangeOnlyFormula(formulaText) {
+  var t = formulaText.trim();
+  if (!t.startsWith("=")) return false;
+  var body = t.slice(1).trim();
+  if (!body) return false;
+  if (body.includes("(") || body.includes(")")) return false;
+  return iscelldata(body);
+}
+export function suppressFormulaRangeSelectionForInitialEdit(ctx) {
+  ctx.formulaCache.rangeSelectionActive = false;
+  ctx.formulaCache.rangestart = false;
+  ctx.formulaCache.rangedrag_column_start = false;
+  ctx.formulaCache.rangedrag_row_start = false;
+}
 export function isCaretAtValidFormulaRangeInsertionPoint(editor) {
   var currSelection = window.getSelection();
   if (!editor || !currSelection || currSelection.rangeCount === 0) {
@@ -1665,9 +1698,15 @@ export function isCaretAtValidFormulaRangeInsertionPoint(editor) {
   if (!inputText.startsWith("=")) {
     return false;
   }
+  if (hasIncompleteTruncatedCellRangeSyntax(inputText)) {
+    return false;
+  }
   if (/^=\s*[A-Za-z_][A-Za-z0-9_]*$/.test(inputText)) {
     return false;
   }
+  if (isBareCellOrRangeOnlyFormula(inputText)) {
+    return false;
+  }
   var caretRange = currSelection.getRangeAt(0).cloneRange();
   var preCaretRange = document.createRange();
   preCaretRange.selectNodeContents(editor);
@@ -1680,7 +1719,22 @@ export function isCaretAtValidFormulaRangeInsertionPoint(editor) {
   var textAfter = editor.innerText.slice(caretOffset);
   var remaining = textAfter.replace(/^\s+/, "");
   if (remaining.length === 0) {
-    return true;
+    var atCaret = getFormulaRangeIndexAtCaret(editor);
+    if (atCaret !== null) {
+      return true;
+    }
+    var textBefore = editor.innerText.slice(0, caretOffset).trimEnd();
+    var lastCh = textBefore.slice(-1);
+    if (!lastCh) {
+      return false;
+    }
+    if (lastCh === ")") {
+      return false;
+    }
+    if (/^[=,(+\-*/&%^<>]$/.test(lastCh)) {
+      return true;
+    }
+    return false;
   }
   var first = remaining[0];
   return first === "," || first === ")" || first === "&" || first in operatorjson;
@@ -1791,9 +1845,7 @@ export function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText, refres
       functionRange(ctx, $editor, value, value1);
       if (refreshRangeSelect) {
         cancelFunctionrangeSelected(ctx);
-        if (kcode !== 46) {
-          createRangeHightlight(ctx, value);
-        }
+        createRangeHightlight(ctx, value);
         ctx.formulaCache.rangestart = false;
         ctx.formulaCache.rangedrag_column_start = false;
         ctx.formulaCache.rangedrag_row_start = false;
@@ -2140,12 +2192,15 @@ export function israngeseleciton(ctx, istooltip) {
   return false;
 }
 export function isFormulaReferenceInputMode(ctx) {
-  var editor = document.getElementById("luckysheet-rich-text-editor");
+  var editor = getActiveFormulaEditorElement(ctx);
   var inputText = ((editor === null || editor === void 0 ? void 0 : editor.innerText) || "").trim();
-  var hasRangeToken = (editor === null || editor === void 0 ? void 0 : editor.querySelector("span.fortune-formula-functionrange-cell")) != null;
-  if (!!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || hasRangeToken || ctx.formulaCache.rangeSelectionActive === true) {
+  var refFlowActive = !!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || ctx.formulaCache.rangeSelectionActive === true;
+  if (refFlowActive) {
     return true;
   }
+  if (ctx.formulaCache.rangeSelectionActive === false) {
+    return false;
+  }
   if (!inputText.startsWith("=")) {
     return false;
   }
@@ -2158,13 +2213,16 @@ export function maybeRecoverDirtyRangeSelection(ctx) {
   if (ctx.formulaCache.rangeSelectionActive !== false) {
     return false;
   }
-  var editor = document.getElementById("luckysheet-rich-text-editor");
+  var editor = getActiveFormulaEditorElement(ctx);
   if (!editor) {
     return false;
   }
   var inputText = (editor.innerText || "").trim();
+  if (hasIncompleteTruncatedCellRangeSyntax(inputText)) {
+    return false;
+  }
   var atCaretRangeIndex = getFormulaRangeIndexAtCaret(editor);
-  if (inputText.startsWith("=") && atCaretRangeIndex === null && israngeseleciton(ctx)) {
+  if (inputText.startsWith("=") && atCaretRangeIndex === null && isCaretAtValidFormulaRangeInsertionPoint(editor) && israngeseleciton(ctx)) {
     ctx.formulaCache.rangeSelectionActive = null;
     return true;
   }

package/es/types.d.ts

@@ -325,6 +325,8 @@ export type Freezen = {
     };
 };
 export type GlobalCache = {
+    enteredEditByTyping?: boolean;
+    pendingTypeOverCell?: [number, number];
     verticalScrollLock?: boolean;
     horizontalScrollLock?: boolean;
     overwriteCell?: boolean;

package/lib/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/lib/events/keyboard.js

@@ -12,12 +12,14 @@ var _2 = require("..");
 var _context = require("../context");
 var _cell = require("../modules/cell");
 var _formula = require("../modules/formula");
+var _inlineString = require("../modules/inline-string");
 var _selection = require("../modules/selection");
 var _toolbar = require("../modules/toolbar");
 var _validation = require("../modules/validation");
 var _utils = require("../utils");
 var _copy = require("./copy");
 var _refresh = require("../modules/refresh");
+var _cursor = require("../modules/cursor");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
@@ -134,11 +136,21 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
     };
   }
 };
+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 || (0, _formula.israngeseleciton)(ctx);
 }
-function handleGlobalEnter(ctx, cellInput, e, canvas) {
-  var _a, _b, _c;
+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 && !_lodash.default.isNil(last.row_focus) && !_lodash.default.isNil(last.column_focus)) {}
@@ -146,33 +158,61 @@ function handleGlobalEnter(ctx, cellInput, e, canvas) {
   } else if (ctx.luckysheetCellUpdate.length > 0) {
     var lastCellUpdate = _lodash.default.clone(ctx.luckysheetCellUpdate);
     (0, _cell.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]
     }];
-    (0, _selection.moveHighlightCell)(ctx, "down", (0, _2.hideCRCount)(ctx, "ArrowDown"), "rangeOfSelect");
+    var rowStep = e.shiftKey ? -(0, _2.hideCRCount)(ctx, "ArrowUp") : (0, _2.hideCRCount)(ctx, "ArrowDown");
+    (0, _selection.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 (!_lodash.default.isNil(row_index) && !_lodash.default.isNil(col_index)) {
+        var flowdata = (0, _context.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() !== "") {
+          (0, _formula.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 (!_lodash.default.isPlainObject(cell)) return !_lodash.default.isNil(cell);
+  if (cell.f != null && String(cell.f) !== "") return true;
+  if (!_lodash.default.isNil(cell.v)) return true;
+  if ((0, _inlineString.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 (!_lodash.default.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) && (_lodash.default.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) || _lodash.default.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;
@@ -181,10 +221,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 && !(0, _formula.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 = (0, _formula.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;
@@ -258,6 +317,9 @@ function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo,
   var _a, _b, _c, _d;
   var flowdata = (0, _context.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 = _lodash.default.cloneDeep((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1]);
     ctx.luckysheet_shiftkeydown = true;
@@ -270,6 +332,8 @@ function handleWithCtrlOrMetaKey(ctx, cache, e, cellInput, fxInput, handleUndo,
       var col_index = last.column_focus;
       (0, _cell.updateCell)(ctx, row_index, col_index, cellInput);
       ctx.luckysheetCellUpdate = [row_index, col_index];
+      cache.enteredEditByTyping = false;
+      clearTypeOverPending(cache);
       cache.ignoreWriteCell = true;
       var value = (0, _utils.getNowDateTime)(2);
       cellInput.innerText = value;
@@ -406,10 +470,10 @@ function handleArrowKey(ctx, e) {
   e.preventDefault();
 }
 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();
@@ -470,10 +534,12 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
       }
       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) {
           (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+          cache.enteredEditByTyping = false;
+          clearTypeOverPending(cache);
         }
         if (e.shiftKey) {
           (0, _selection.moveHighlightCell)(ctx, "right", -(0, _2.hideCRCount)(ctx, "ArrowLeft"), "rangeOfSelect");
@@ -490,11 +556,22 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
         if (!last) return [2];
         row_index = last.row_focus;
         col_index = last.column_focus;
+        if (!_lodash.default.isNil(row_index) && !_lodash.default.isNil(col_index)) {
+          flowdataF2 = (0, _context.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() !== "") {
+            (0, _formula.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);
         (0, _cell.cancelNormalSelected)(ctx);
         (0, _selection.moveHighlightCell)(ctx, "down", 0, "rangeOfSelect");
         e.preventDefault();
@@ -520,16 +597,53 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
           (0, _refresh.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) {
+            (0, _cell.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 && !_lodash.default.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 (_lodash.default.isNil(row_index) || _lodash.default.isNil(col_index)) return [2];
+            flowdata = (0, _context.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) {
+              (0, _formula.suppressFormulaRangeSelectionForInitialEdit)(ctx);
+            }
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
-            (0, _formula.handleFormulaInput)(ctx, fxInput, cellInput, kcode);
+            cache.pendingTypeOverCell = [row_index, col_index];
+            (0, _formula.setFormulaEditorOwner)(ctx, "cell");
+            cache.enteredEditByTyping = true;
+            cellInput.focus();
+            initial = getTypeOverInitialContent(e);
+            if (initial !== undefined) {
+              cellInput.textContent = initial;
+              if (fxInput) fxInput.textContent = initial;
+              (0, _formula.handleFormulaInput)(ctx, fxInput, cellInput, kcode);
+              e.preventDefault();
+            } else {
+              cellInput.textContent = "";
+              if (fxInput) fxInput.textContent = "";
+              (0, _formula.handleFormulaInput)(ctx, fxInput, cellInput, kcode);
+            }
+            queueMicrotask(function () {
+              (0, _cursor.moveToEnd)(cellInput);
+            });
           }
         }
       }

package/lib/events/mouse.js

@@ -196,6 +196,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
   ctx.luckysheet_scroll_status = true;
   if (ctx.luckysheetCellUpdate.length > 0) {
     if (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start || (0, _modules.israngeseleciton)(ctx)) {
+      var formulaEditorForCmdComma = (0, _modules.getFormulaEditorOwner)(ctx) === "fx" && fxInput ? fxInput : cellInput;
       var rowseleted = [row_index, row_index_ed];
       var columnseleted = [col_index, col_index_ed];
       var left = col_pre;
@@ -262,13 +263,14 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
         last.top_move = top_1;
         last.height_move = height;
         ctx.formulaCache.func_selectedrange = last;
-      } else if (e.ctrlKey && ((_g = _lodash.default.last(cellInput.querySelectorAll("span"))) === null || _g === void 0 ? void 0 : _g.innerText) !== ",") {
-        var vText = cellInput.innerText;
+      } else if ((e.ctrlKey || e.metaKey) && ((_g = _lodash.default.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 += ",";
           }
@@ -284,15 +286,21 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
             ctx.formulaCache.functionRangeIndex = textRange;
           }
           cellInput.innerHTML = vText;
+          if (fxInput) fxInput.innerHTML = vText;
           (0, _cell.cancelFunctionrangeSelected)(ctx);
           (0, _modules.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;
-        (0, _modules.rangeHightlightselected)(ctx, cellInput);
+        (0, _modules.rangeHightlightselected)(ctx, formulaEditorForCmdComma);
         (0, _modules.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,
@@ -326,6 +334,7 @@ function handleCellAreaMouseDown(ctx, globalCache, e, cellInput, container, fxIn
       ctx.formulaCache.rangestart = true;
       ctx.formulaCache.rangedrag_column_start = false;
       ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangeSelectionActive = true;
       (0, _modules.rangeSetValue)(ctx, cellInput, {
         row: rowseleted,
         column: columnseleted
@@ -504,6 +513,8 @@ function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
     row_index = row_focus;
     col_index = column_focus;
   }
+  globalCache.enteredEditByTyping = false;
+  delete globalCache.pendingTypeOverCell;
   (0, _cell.luckysheetUpdateCell)(ctx, row_index, col_index);
 }
 function handleContextMenu(ctx, settings, e, workbookContainer, container, area) {
@@ -1363,6 +1374,7 @@ function handleRowHeaderMouseDown(ctx, globalCache, e, container, cellInput, fxI
       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) {
         (0, _modules.createRangeHightlight)(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);
@@ -1595,6 +1607,7 @@ function handleColumnHeaderMouseDown(ctx, globalCache, e, container, cellInput,
       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) {
         (0, _modules.createRangeHightlight)(ctx, cellInput.innerHTML, ctx.formulaCache.rangechangeindex);

package/lib/modules/cell.js

@@ -102,6 +102,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));
+}
 function getCellValue(r, c, data, attr) {
   var _a;
   if (!attr) {
@@ -651,6 +677,11 @@ function updateCell(ctx, r, c, $input, value, canvas) {
       }
     }
     value = value || inputText;
+    if (_lodash.default.isString(value) && value.startsWith("=") && value.length > 1) {
+      value = closeUnclosedParenthesesInFormula(value);
+    } else if (_lodash.default.isPlainObject(value) && _lodash.default.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) {
       (0, _api.clearCellError)(ctx, r, c);
@@ -1259,6 +1290,12 @@ function getdatabyselection(ctx, range, sheetId) {
   return data;
 }
 function luckysheetUpdateCell(ctx, row_index, col_index) {
+  var _a;
+  var flowdata = (0, _context.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() !== "") {
+    (0, _formula.suppressFormulaRangeSelectionForInitialEdit)(ctx);
+  }
   ctx.luckysheetCellUpdate = [row_index, col_index];
 }
 function getDataBySelectionNoCopy(ctx, range) {

package/lib/modules/formula.d.ts

@@ -50,6 +50,9 @@ export declare function getLastFormulaRangeIndex($editor: HTMLDivElement): numbe
 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;

package/lib/modules/formula.js

@@ -21,7 +21,9 @@ exports.getcellrange = getcellrange;
 exports.getrangeseleciton = getrangeseleciton;
 exports.groupValuesRefresh = groupValuesRefresh;
 exports.handleFormulaInput = handleFormulaInput;
+exports.hasIncompleteTruncatedCellRangeSyntax = hasIncompleteTruncatedCellRangeSyntax;
 exports.insertUpdateFunctionGroup = insertUpdateFunctionGroup;
+exports.isBareCellOrRangeOnlyFormula = isBareCellOrRangeOnlyFormula;
 exports.isCaretAtValidFormulaRangeInsertionPoint = isCaretAtValidFormulaRangeInsertionPoint;
 exports.isFormulaReferenceInputMode = isFormulaReferenceInputMode;
 exports.iscelldata = iscelldata;
@@ -37,6 +39,7 @@ exports.rangeHightlightselected = rangeHightlightselected;
 exports.rangeSetValue = rangeSetValue;
 exports.setCaretPosition = setCaretPosition;
 exports.setFormulaEditorOwner = setFormulaEditorOwner;
+exports.suppressFormulaRangeSelectionForInitialEdit = suppressFormulaRangeSelectionForInitialEdit;
 var _formulaParser = require("@fileverse-dev/formula-parser");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _context = require("../context");
@@ -1686,11 +1689,44 @@ function getFormulaEditorOwner(ctx) {
   }
   return null;
 }
+function getActiveFormulaEditorElement(ctx) {
+  var _a;
+  var cellEditor = document.getElementById("luckysheet-rich-text-editor");
+  var fxEditor = document.getElementById("luckysheet-functionbox-cell");
+  var owner = getFormulaEditorOwner(ctx);
+  if (owner === "fx") return fxEditor !== null && fxEditor !== void 0 ? fxEditor : cellEditor;
+  if (owner === "cell") return cellEditor !== null && cellEditor !== void 0 ? cellEditor : fxEditor;
+  var activeId = (_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id;
+  if (activeId === "luckysheet-functionbox-cell") return fxEditor !== null && fxEditor !== void 0 ? fxEditor : cellEditor;
+  if (activeId === "luckysheet-rich-text-editor") return cellEditor !== null && cellEditor !== void 0 ? cellEditor : fxEditor;
+  return cellEditor !== null && cellEditor !== void 0 ? cellEditor : fxEditor;
+}
 function getCurrentFormulaSlotTextBeforeCaret(editor, caretOffset) {
   var textBefore = editor.innerText.slice(0, caretOffset);
   var parts = textBefore.split(/[=,(+\-*/&<>]/);
   return _lodash.default.trim(parts[parts.length - 1] || "");
 }
+function hasIncompleteTruncatedCellRangeSyntax(formulaText) {
+  var t = formulaText.replace(/\s/g, "");
+  if (!t.startsWith("=")) return false;
+  if (/[A-Za-z]+\d+:[A-Za-z]+$/i.test(t)) return true;
+  if (/[A-Za-z]+\d+:\s*$/i.test(t)) return true;
+  return false;
+}
+function isBareCellOrRangeOnlyFormula(formulaText) {
+  var t = formulaText.trim();
+  if (!t.startsWith("=")) return false;
+  var body = t.slice(1).trim();
+  if (!body) return false;
+  if (body.includes("(") || body.includes(")")) return false;
+  return iscelldata(body);
+}
+function suppressFormulaRangeSelectionForInitialEdit(ctx) {
+  ctx.formulaCache.rangeSelectionActive = false;
+  ctx.formulaCache.rangestart = false;
+  ctx.formulaCache.rangedrag_column_start = false;
+  ctx.formulaCache.rangedrag_row_start = false;
+}
 function isCaretAtValidFormulaRangeInsertionPoint(editor) {
   var currSelection = window.getSelection();
   if (!editor || !currSelection || currSelection.rangeCount === 0) {
@@ -1704,9 +1740,15 @@ function isCaretAtValidFormulaRangeInsertionPoint(editor) {
   if (!inputText.startsWith("=")) {
     return false;
   }
+  if (hasIncompleteTruncatedCellRangeSyntax(inputText)) {
+    return false;
+  }
   if (/^=\s*[A-Za-z_][A-Za-z0-9_]*$/.test(inputText)) {
     return false;
   }
+  if (isBareCellOrRangeOnlyFormula(inputText)) {
+    return false;
+  }
   var caretRange = currSelection.getRangeAt(0).cloneRange();
   var preCaretRange = document.createRange();
   preCaretRange.selectNodeContents(editor);
@@ -1719,7 +1761,22 @@ function isCaretAtValidFormulaRangeInsertionPoint(editor) {
   var textAfter = editor.innerText.slice(caretOffset);
   var remaining = textAfter.replace(/^\s+/, "");
   if (remaining.length === 0) {
-    return true;
+    var atCaret = getFormulaRangeIndexAtCaret(editor);
+    if (atCaret !== null) {
+      return true;
+    }
+    var textBefore = editor.innerText.slice(0, caretOffset).trimEnd();
+    var lastCh = textBefore.slice(-1);
+    if (!lastCh) {
+      return false;
+    }
+    if (lastCh === ")") {
+      return false;
+    }
+    if (/^[=,(+\-*/&%^<>]$/.test(lastCh)) {
+      return true;
+    }
+    return false;
   }
   var first = remaining[0];
   return first === "," || first === ")" || first === "&" || first in operatorjson;
@@ -1830,9 +1887,7 @@ function handleFormulaInput(ctx, $copyTo, $editor, kcode, preText, refreshRangeS
       functionRange(ctx, $editor, value, value1);
       if (refreshRangeSelect) {
         (0, _2.cancelFunctionrangeSelected)(ctx);
-        if (kcode !== 46) {
-          createRangeHightlight(ctx, value);
-        }
+        createRangeHightlight(ctx, value);
         ctx.formulaCache.rangestart = false;
         ctx.formulaCache.rangedrag_column_start = false;
         ctx.formulaCache.rangedrag_row_start = false;
@@ -2179,12 +2234,15 @@ function israngeseleciton(ctx, istooltip) {
   return false;
 }
 function isFormulaReferenceInputMode(ctx) {
-  var editor = document.getElementById("luckysheet-rich-text-editor");
+  var editor = getActiveFormulaEditorElement(ctx);
   var inputText = ((editor === null || editor === void 0 ? void 0 : editor.innerText) || "").trim();
-  var hasRangeToken = (editor === null || editor === void 0 ? void 0 : editor.querySelector("span.fortune-formula-functionrange-cell")) != null;
-  if (!!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || hasRangeToken || ctx.formulaCache.rangeSelectionActive === true) {
+  var refFlowActive = !!ctx.formulaCache.rangestart || !!ctx.formulaCache.rangedrag_column_start || !!ctx.formulaCache.rangedrag_row_start || ctx.formulaCache.rangeSelectionActive === true;
+  if (refFlowActive) {
     return true;
   }
+  if (ctx.formulaCache.rangeSelectionActive === false) {
+    return false;
+  }
   if (!inputText.startsWith("=")) {
     return false;
   }
@@ -2197,13 +2255,16 @@ function maybeRecoverDirtyRangeSelection(ctx) {
   if (ctx.formulaCache.rangeSelectionActive !== false) {
     return false;
   }
-  var editor = document.getElementById("luckysheet-rich-text-editor");
+  var editor = getActiveFormulaEditorElement(ctx);
   if (!editor) {
     return false;
   }
   var inputText = (editor.innerText || "").trim();
+  if (hasIncompleteTruncatedCellRangeSyntax(inputText)) {
+    return false;
+  }
   var atCaretRangeIndex = getFormulaRangeIndexAtCaret(editor);
-  if (inputText.startsWith("=") && atCaretRangeIndex === null && israngeseleciton(ctx)) {
+  if (inputText.startsWith("=") && atCaretRangeIndex === null && isCaretAtValidFormulaRangeInsertionPoint(editor) && israngeseleciton(ctx)) {
     ctx.formulaCache.rangeSelectionActive = null;
     return true;
   }

package/lib/types.d.ts

@@ -325,6 +325,8 @@ export type Freezen = {
     };
 };
 export type GlobalCache = {
+    enteredEditByTyping?: boolean;
+    pendingTypeOverCell?: [number, number];
     verticalScrollLock?: boolean;
     horizontalScrollLock?: boolean;
     overwriteCell?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.11-input-ref-1",
+  "version": "1.3.11-input-ref-2",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",