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

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) {
@@ -971,7 +982,7 @@ function handleOverlayMouseMove(ctx, globalCache, e, cellInput, scrollX, scrollY
   }
 }
 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();
   (0, _modules.onImageMoveEnd)(ctx, globalCache);
   (0, _modules.onImageResizeEnd)(ctx, globalCache);
@@ -984,11 +995,17 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
   (0, _hyperlink.onRangeSelectionModalMoveEnd)(globalCache);
   (0, _modules.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 ((0, _modules.getFormulaEditorOwner)(ctx) === "fx") {
       (0, _formula.handleFormulaInput)(ctx, cellInput, fxInput, 0, undefined, false);
     } else {
       (0, _formula.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) {
@@ -1030,10 +1047,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     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;
         }
@@ -1042,9 +1059,9 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     }
     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);
         }
@@ -1088,10 +1105,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     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;
         }
@@ -1100,9 +1117,9 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     }
     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);
         }
@@ -1119,10 +1136,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     ctx.luckysheet_cols_freeze_drag = false;
     var scrollLeft = ctx.scrollLeft;
     var x = e.pageX - rect.left - ctx.rowHeaderWidth + scrollLeft - window.scrollX;
-    var _p = (0, _location.colLocation)(x, ctx.visibledatacolumn),
-      col_pre = _p[0],
-      col_curr = _p[1],
-      col_index_curr = _p[2];
+    var _o = (0, _location.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 = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1170,10 +1187,10 @@ function handleOverlayMouseUp(ctx, globalCache, settings, e, scrollbarX, scrollb
     ctx.luckysheet_rows_freeze_drag = false;
     var scrollTop = ctx.scrollTop;
     var y = e.pageY - rect.top - ctx.columnHeaderHeight + scrollTop - window.scrollY;
-    var _q = (0, _location.rowLocation)(y, ctx.visibledatarow),
-      row_pre = _q[0],
-      row_curr = _q[1],
-      row_index_curr = _q[2];
+    var _p = (0, _location.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 = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
     if (idx == null) return;
@@ -1357,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);
@@ -1589,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) {
@@ -575,6 +601,7 @@ function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangedrag_column_start = false;
   ctx.formulaCache.rangedrag_row_start = false;
   ctx.formulaCache.rangeSelectionActive = null;
+  ctx.formulaCache.formulaEditorOwner = null;
 }
 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;
@@ -650,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);
@@ -1258,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

@@ -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;

package/lib/modules/formula.js

@@ -13,6 +13,7 @@ exports.functionCopy = functionCopy;
 exports.functionHTMLGenerate = functionHTMLGenerate;
 exports.functionStrChange = functionStrChange;
 exports.getAllFunctionGroup = getAllFunctionGroup;
+exports.getFormulaEditorOwner = getFormulaEditorOwner;
 exports.getFormulaRangeIndexAtCaret = getFormulaRangeIndexAtCaret;
 exports.getFormulaRangeIndexForKeyboardSync = getFormulaRangeIndexForKeyboardSync;
 exports.getLastFormulaRangeIndex = getLastFormulaRangeIndex;
@@ -20,7 +21,10 @@ 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;
 exports.israngeseleciton = israngeseleciton;
@@ -34,6 +38,8 @@ exports.rangeDragRow = rangeDragRow;
 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");
@@ -44,7 +50,6 @@ var _locale = require("../locale");
 var _color = require("./color");
 var _location = require("./location");
 var _2 = require(".");
-var _index = require("../utils/index");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var __assign = void 0 && (void 0).__assign || function () {
@@ -93,6 +98,7 @@ var FormulaCache = exports.FormulaCache = function () {
     this.data_parm_index = 0;
     this.selectingRangeIndex = -1;
     this.rangeSelectionActive = null;
+    this.formulaEditorOwner = null;
     this.functionlistMap = {};
     this.execFunctionGlobalData = {};
     this.cellTextToIndexList = {};
@@ -1666,6 +1672,115 @@ function getFormulaRangeIndexAtCaret($editor) {
   var n = parseInt(ri, 10);
   return Number.isNaN(n) ? null : n;
 }
+function setFormulaEditorOwner(ctx, owner) {
+  ctx.formulaCache.formulaEditorOwner = owner;
+}
+function getFormulaEditorOwner(ctx) {
+  var _a, _b;
+  var cachedOwner = ctx.formulaCache.formulaEditorOwner;
+  if (cachedOwner === "cell" || cachedOwner === "fx") {
+    return cachedOwner;
+  }
+  if (((_a = document.activeElement) === null || _a === void 0 ? void 0 : _a.id) === "luckysheet-functionbox-cell") {
+    return "fx";
+  }
+  if (((_b = document.activeElement) === null || _b === void 0 ? void 0 : _b.id) === "luckysheet-rich-text-editor") {
+    return "cell";
+  }
+  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) {
+    return false;
+  }
+  var anchorNode = currSelection.anchorNode;
+  if (anchorNode && !editor.contains(anchorNode)) {
+    return false;
+  }
+  var inputText = editor.innerText.trim();
+  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);
+  preCaretRange.setEnd(caretRange.endContainer, caretRange.endOffset);
+  var caretOffset = preCaretRange.toString().length;
+  var slotTextBeforeCaret = getCurrentFormulaSlotTextBeforeCaret(editor, caretOffset);
+  if (slotTextBeforeCaret.length > 0 && !iscelldata(slotTextBeforeCaret)) {
+    return false;
+  }
+  var textAfter = editor.innerText.slice(caretOffset);
+  var remaining = textAfter.replace(/^\s+/, "");
+  if (remaining.length === 0) {
+    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;
+}
 function hasCommaOrAnotherRefAfterRangeCell(cell) {
   var _a, _b;
   var n = cell.nextSibling;
@@ -1772,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;
@@ -2060,31 +2173,7 @@ function israngeseleciton(ctx, istooltip) {
       return true;
     }
     var editor = ((_a = anchorElement.closest) === null || _a === void 0 ? void 0 : _a.call(anchorElement, "#luckysheet-rich-text-editor, #luckysheet-functionbox-cell")) || ((_b = parentElement.closest) === null || _b === void 0 ? void 0 : _b.call(parentElement, "#luckysheet-rich-text-editor, #luckysheet-functionbox-cell")) || document.getElementById("luckysheet-rich-text-editor");
-    if (!editor || currSelection.rangeCount === 0) {
-      return true;
-    }
-    var inputText = editor.innerText.trim();
-    if (!inputText.startsWith("=")) {
-      return false;
-    }
-    if (/^=\s*[A-Za-z_][A-Za-z0-9_]*$/.test(inputText)) {
-      return false;
-    }
-    var caretRange = currSelection.getRangeAt(0).cloneRange();
-    var preCaretRange = document.createRange();
-    preCaretRange.selectNodeContents(editor);
-    preCaretRange.setEnd(caretRange.endContainer, caretRange.endOffset);
-    var caretOffset = preCaretRange.toString().length;
-    var textAfter = editor.innerText.slice(caretOffset);
-    var remaining = textAfter.replace(/^\s+/, "");
-    if (remaining.length === 0) {
-      return true;
-    }
-    var first = remaining[0];
-    if (first === "," || first === ")" || first === "&" || first in operatorjson) {
-      return true;
-    }
-    return false;
+    return isCaretAtValidFormulaRangeInsertionPoint(editor);
   };
   if (((_a = anchor === null || anchor === void 0 ? void 0 : anchor.parentNode) === null || _a === void 0 ? void 0 : _a.nodeName.toLowerCase()) === "span" && anchorOffset !== 0) {
     var txt = _lodash.default.trim((_b = anchor.textContent) !== null && _b !== void 0 ? _b : "");
@@ -2145,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;
   }
@@ -2163,12 +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 (inputText.startsWith("=") && israngeseleciton(ctx)) {
+  if (hasIncompleteTruncatedCellRangeSyntax(inputText)) {
+    return false;
+  }
+  var atCaretRangeIndex = getFormulaRangeIndexAtCaret(editor);
+  if (inputText.startsWith("=") && atCaretRangeIndex === null && isCaretAtValidFormulaRangeInsertionPoint(editor) && israngeseleciton(ctx)) {
     ctx.formulaCache.rangeSelectionActive = null;
     return true;
   }
@@ -2269,14 +2365,14 @@ function functionStrChange(txt, type, rc, orient, stindex, step) {
   return function_str;
 }
 function rangeSetValue(ctx, cellInput, selected, fxInput) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   var parser = new DOMParser();
   var doc = parser.parseFromString("<div>".concat(cellInput.innerHTML, "</div>"), "text/html");
   var spans = doc.querySelectorAll("span");
   var lastSpan = spans[spans.length - 1];
   var isManagedRangeSpan = (_b = (_a = lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.classList) === null || _a === void 0 ? void 0 : _a.contains("fortune-formula-functionrange-cell")) !== null && _b !== void 0 ? _b : false;
-  if (lastSpan && (0, _index.isLetterNumberPattern)(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !isManagedRangeSpan) {
-    var htmlR = (0, _index.removeLastSpan)(cellInput.innerHTML);
+  if (lastSpan && (0, _utils.isLetterNumberPattern)(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !isManagedRangeSpan) {
+    var htmlR = (0, _utils.removeLastSpan)(cellInput.innerHTML);
     cellInput.innerHTML = "".concat(htmlR);
     cellInput.focus();
     var kids = cellInput.childNodes;
@@ -2284,7 +2380,7 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
   }
   var $editor = cellInput;
   var $copyTo = fxInput;
-  if (((_c = document.activeElement) === null || _c === void 0 ? void 0 : _c.id) === "luckysheet-functionbox-cell") {
+  if (getFormulaEditorOwner(ctx) === "fx") {
     $editor = fxInput;
     $copyTo = cellInput;
   }
@@ -2313,9 +2409,9 @@ function rangeSetValue(ctx, cellInput, selected, fxInput) {
       refEle = ctx.formulaCache.rangeSetValueTo;
     }
     if (refEle && refEle.parentNode) {
-      var leftPar = (_d = document.getElementsByClassName("luckysheet-formula-text-lpar")) === null || _d === void 0 ? void 0 : _d[0];
-      if ((_e = leftPar === null || leftPar === void 0 ? void 0 : leftPar.parentElement) === null || _e === void 0 ? void 0 : _e.classList.contains("luckysheet-formula-text-color")) {
-        (_g = (_f = document.getElementsByClassName("luckysheet-formula-text-lpar")) === null || _f === void 0 ? void 0 : _f[0].parentNode) === null || _g === void 0 ? void 0 : _g.appendChild(newEle);
+      var leftPar = (_c = document.getElementsByClassName("luckysheet-formula-text-lpar")) === null || _c === void 0 ? void 0 : _c[0];
+      if ((_d = leftPar === null || leftPar === void 0 ? void 0 : leftPar.parentElement) === null || _d === void 0 ? void 0 : _d.classList.contains("luckysheet-formula-text-color")) {
+        (_f = (_e = document.getElementsByClassName("luckysheet-formula-text-lpar")) === null || _e === void 0 ? void 0 : _e[0].parentNode) === null || _f === void 0 ? void 0 : _f.appendChild(newEle);
       } else {
         refEle.parentNode.insertBefore(newEle, refEle.nextSibling);
       }

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",
+  "version": "1.3.11-input-ref-2",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",