@fileverse-dev/fortune-react 1.3.11-input-ref → 1.3.11-input-ref-1

package/lib/components/SheetOverlay/InputBox.js

@@ -14,6 +14,8 @@ var _ContentEditable = _interopRequireDefault(require("./ContentEditable"));
 var _FormulaSearch = _interopRequireDefault(require("./FormulaSearch"));
 var _FormulaHint = _interopRequireDefault(require("./FormulaHint"));
 var _usePrevious = _interopRequireDefault(require("../../hooks/usePrevious"));
+var _useFormulaEditorHistory = require("../../hooks/useFormulaEditorHistory");
+var _useRerenderOnFormulaCaret = require("../../hooks/useRerenderOnFormulaCaret");
 var _helper = require("./helper");
 var _LucideIcon = require("./LucideIcon");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -29,59 +31,65 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 var InputBox = function InputBox() {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-  var _o = (0, _react.useContext)(_context.default),
-    context = _o.context,
-    setContext = _o.setContext,
-    refs = _o.refs;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+  var _q = (0, _react.useContext)(_context.default),
+    context = _q.context,
+    setContext = _q.setContext,
+    refs = _q.refs;
   var inputRef = (0, _react.useRef)(null);
   var lastKeyDownEventRef = (0, _react.useRef)(null);
   var prevCellUpdate = (0, _usePrevious.default)(context.luckysheetCellUpdate);
   var prevSheetId = (0, _usePrevious.default)(context.currentSheetId);
-  var _p = (0, _react.useState)(false),
-    isHidenRC = _p[0],
-    setIsHidenRC = _p[1];
-  var _q = (0, _react.useState)(false),
-    isInputBoxActive = _q[0],
-    setIsInputBoxActive = _q[1];
-  var _r = (0, _react.useState)(""),
-    activeCell = _r[0],
-    setActiveCell = _r[1];
-  var _s = (0, _react.useState)(""),
-    activeRefCell = _s[0],
-    setActiveRefCell = _s[1];
-  var _t = (0, _react.useState)({
+  var _r = (0, _react.useState)(false),
+    isHidenRC = _r[0],
+    setIsHidenRC = _r[1];
+  var _s = (0, _react.useState)(false),
+    isInputBoxActive = _s[0],
+    setIsInputBoxActive = _s[1];
+  var _t = (0, _react.useState)(""),
+    activeCell = _t[0],
+    setActiveCell = _t[1];
+  var _u = (0, _react.useState)(""),
+    activeRefCell = _u[0],
+    setActiveRefCell = _u[1];
+  var _v = (0, _react.useState)({
       left: 0,
       top: 0
     }),
-    frozenPosition = _t[0],
-    setFrozenPosition = _t[1];
+    frozenPosition = _v[0],
+    setFrozenPosition = _v[1];
   var firstSelection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
-  var _u = (0, _react.useState)({}),
-    firstSelectionActiveCell = _u[0],
-    setFirstSelectionActiveCell = _u[1];
-  var _v = (0, _react.useState)(0),
-    commaCount = _v[0],
-    setCommaCount = _v[1];
+  var _w = (0, _react.useState)({}),
+    firstSelectionActiveCell = _w[0],
+    setFirstSelectionActiveCell = _w[1];
+  var _x = (0, _react.useState)(0),
+    commaCount = _x[0],
+    setCommaCount = _x[1];
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
-  var _w = (0, _react.useState)(!hideFormulaHintLocal),
-    showFormulaHint = _w[0],
-    setShowFormulaHint = _w[1];
-  var _x = (0, _react.useState)(false),
-    showSearchHint = _x[0],
-    setShowSearchHint = _x[1];
+  var _y = (0, _react.useState)(!hideFormulaHintLocal),
+    showFormulaHint = _y[0],
+    setShowFormulaHint = _y[1];
+  var _z = (0, _react.useState)(false),
+    showSearchHint = _z[0],
+    setShowSearchHint = _z[1];
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
-  var preText = (0, _react.useRef)("");
   var isComposingRef = (0, _react.useRef)(false);
   var formulaAnchorCellRef = (0, _react.useRef)(null);
   var skipNextAnchorSelectionSyncRef = (0, _react.useRef)(false);
   var lastHandledMouseDragSignatureRef = (0, _react.useRef)("");
+  var _0 = (0, _useFormulaEditorHistory.useFormulaEditorHistory)(inputRef, refs.cellInput, refs.fxInput, setContext, "cell"),
+    formulaHistoryRef = _0.formulaHistoryRef,
+    preTextRef = _0.preTextRef,
+    resetFormulaHistory = _0.resetFormulaHistory,
+    handleFormulaHistoryUndoRedo = _0.handleFormulaHistoryUndoRedo,
+    capturePreFormulaState = _0.capturePreFormulaState,
+    appendFormulaHistoryFromPrimaryEditor = _0.appendFormulaHistoryFromPrimaryEditor;
   var ZWSP = "\u200B";
   var inputBoxInnerRef = (0, _react.useRef)(null);
-  var _y = (0, _react.useState)([]),
-    linkSelectionHighlightRects = _y[0],
-    setLinkSelectionHighlightRects = _y[1];
+  var _1 = (0, _react.useState)([]),
+    linkSelectionHighlightRects = _1[0],
+    setLinkSelectionHighlightRects = _1[1];
   var ensureNotEmpty = function ensureNotEmpty() {
     var el = inputRef.current;
     if (!el) return;
@@ -176,8 +184,9 @@ var InputBox = function InputBox() {
       if (inputRef.current) {
         inputRef.current.innerHTML = "";
       }
+      resetFormulaHistory();
     }
-  }, [context.luckysheetCellUpdate]);
+  }, [context.luckysheetCellUpdate, resetFormulaHistory]);
   (0, _react.useEffect)(function () {
     var _a;
     if (_lodash.default.isEmpty(context.luckysheetCellUpdate) || !refs.cellInput.current) {
@@ -249,10 +258,11 @@ var InputBox = function InputBox() {
       fxEditor.innerHTML = html;
     }
     (0, _helper.setCursorPosition)(textEditor, caretOffset);
+    setShowSearchHint((0, _helper.shouldShowFormulaFunctionList)(textEditor));
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];
-      draftCtx.functionHint = formulaName;
+      draftCtx.functionHint = (formulaName || "").toUpperCase();
     });
   }, [setContext]);
   var clearSearchItemActiveClass = (0, _react.useCallback)(function () {
@@ -275,7 +285,7 @@ var InputBox = function InputBox() {
     var _a, _b;
     if (isComposingRef.current || !inputRef.current) return;
     if (e.target.className.includes("sign-fortune")) return;
-    preText.current = inputRef.current.innerText;
+    preTextRef.current = inputRef.current.innerText;
     var formulaName = (_b = (_a = getActiveFormula()) === null || _a === void 0 ? void 0 : _a.querySelector(".luckysheet-formula-search-func")) === null || _b === void 0 ? void 0 : _b.textContent;
     var lastSpanText = getLastInputSpanText();
     if (formulaName && !(0, _helper.isLetterNumberPattern)(lastSpanText)) {
@@ -296,8 +306,7 @@ var InputBox = function InputBox() {
       var _a;
       var currentSelection = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
       if (!currentSelection) return;
-      var isMouseFormulaRangeDrag = !!ctx.formulaCache.func_selectedrange && (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start);
-      if (isMouseFormulaRangeDrag) {
+      if ((0, _fortuneCore.getFormulaEditorOwner)(ctx) === "fx") {
         return;
       }
       (0, _fortuneCore.israngeseleciton)(ctx);
@@ -374,8 +383,11 @@ var InputBox = function InputBox() {
   }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
+    setContext(function (draftCtx) {
+      (0, _fortuneCore.setFormulaEditorOwner)(draftCtx, "cell");
+    });
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
-    preText.current = inputRef.current.innerText;
+    capturePreFormulaState();
     var currentInputText = ((_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText) === null || _b === void 0 ? void 0 : _b.trim()) || "";
     if ((e.key === "=" || currentInputText.startsWith("=")) && context.luckysheetCellUpdate.length === 2 && formulaAnchorCellRef.current == null) {
       setContext(function (draftCtx) {
@@ -398,6 +410,7 @@ var InputBox = function InputBox() {
       skipNextAnchorSelectionSyncRef.current = true;
       setTimeout(function () {
         setContext(function (draftCtx) {
+          var _a, _b;
           draftCtx.luckysheetCellUpdate = [anchorRow_1, anchorCol_1];
           draftCtx.luckysheet_select_save = [{
             row: [anchorRow_1, anchorRow_1],
@@ -405,7 +418,6 @@ var InputBox = function InputBox() {
             row_focus: anchorRow_1,
             column_focus: anchorCol_1
           }];
-          draftCtx.formulaRangeHighlight = [];
           draftCtx.formulaRangeSelect = undefined;
           draftCtx.formulaCache.selectingRangeIndex = -1;
           draftCtx.formulaCache.func_selectedrange = undefined;
@@ -413,11 +425,23 @@ var InputBox = function InputBox() {
           draftCtx.formulaCache.rangestart = false;
           draftCtx.formulaCache.rangedrag_column_start = false;
           draftCtx.formulaCache.rangedrag_row_start = false;
+          (0, _fortuneCore.createRangeHightlight)(draftCtx, ((_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.innerHTML) || ((_b = refs.fxInput.current) === null || _b === void 0 ? void 0 : _b.innerHTML) || "");
           (0, _fortuneCore.moveHighlightCell)(draftCtx, "down", 0, "rangeOfSelect");
         });
       }, 0);
     }
-    if (e.metaKey && context.luckysheetCellUpdate.length > 0) {
+    if ((e.metaKey || e.ctrlKey) && context.luckysheetCellUpdate.length > 0) {
+      if (e.code === "KeyZ" || e.code === "KeyY") {
+        var shouldUseFormulaHistory = currentInputText.startsWith("=") || formulaHistoryRef.current.active;
+        if (shouldUseFormulaHistory) {
+          var handledByFormulaHistory = handleFormulaHistoryUndoRedo(e.code === "KeyY" || e.code === "KeyZ" && e.shiftKey);
+          if (handledByFormulaHistory) {
+            e.preventDefault();
+          }
+        }
+        e.stopPropagation();
+        return;
+      }
       if (e.code === "KeyB") {
         (0, _fortuneCore.handleBold)(context, inputRef.current);
         stopPropagation(e);
@@ -439,6 +463,23 @@ var InputBox = function InputBox() {
     var allowListNavigation = true;
     var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
     if (e.key === "Delete" || e.key === "Backspace") {
+      var anchor = formulaAnchorCellRef.current;
+      if (anchor != null) {
+        var anchorRow_2 = anchor[0],
+          anchorCol_2 = anchor[1];
+        skipNextAnchorSelectionSyncRef.current = true;
+        setTimeout(function () {
+          setContext(function (draftCtx) {
+            draftCtx.luckysheetCellUpdate = [anchorRow_2, anchorCol_2];
+            draftCtx.luckysheet_select_save = [{
+              row: [anchorRow_2, anchorRow_2],
+              column: [anchorCol_2, anchorCol_2],
+              row_focus: anchorRow_2,
+              column_focus: anchorCol_2
+            }];
+          });
+        }, 0);
+      }
       if (isComposingRef.current) requestAnimationFrame(ensureNotEmpty);
       if ((0, _helper.getCursorPosition)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
         setTimeout(function () {
@@ -503,7 +544,7 @@ var InputBox = function InputBox() {
       }
       e.preventDefault();
     }
-  }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext, firstSelection]);
+  }, [capturePreFormulaState, clearSearchItemActiveClass, context.luckysheetCellUpdate.length, handleFormulaHistoryUndoRedo, selectActiveFormula, setContext, firstSelection]);
   var handleHideShowHint = function handleHideShowHint() {
     var _a, _b, _c, _d;
     var searchElFx = (_a = document.getElementsByClassName("fx-search")) === null || _a === void 0 ? void 0 : _a[0];
@@ -527,11 +568,7 @@ var InputBox = function InputBox() {
     var _a, _b, _c;
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
-    if (((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
-      setShowSearchHint(true);
-    } else {
-      setShowSearchHint(false);
-    }
+    setShowSearchHint((0, _helper.shouldShowFormulaFunctionList)((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) !== null && _a !== void 0 ? _a : null));
     if (!isComposingRef.current) {
       var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
       setCommaCount(currentCommaCount);
@@ -549,16 +586,19 @@ var InputBox = function InputBox() {
     }
     var kcode = e.keyCode;
     if (!kcode) return;
+    appendFormulaHistoryFromPrimaryEditor(function () {
+      return (0, _helper.getCursorPosition)(inputRef.current);
+    });
     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 || e.ctrlKey && kcode === 86) {
       setContext(function (draftCtx) {
         if ((draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start || (0, _fortuneCore.israngeseleciton)(draftCtx)) && isBlur) return;
         if (!(0, _fortuneCore.isAllowEdit)(draftCtx, draftCtx.luckysheet_select_save)) {
           return;
         }
-        (0, _fortuneCore.handleFormulaInput)(draftCtx, refs.fxInput.current, refs.cellInput.current, kcode, preText.current);
+        (0, _fortuneCore.handleFormulaInput)(draftCtx, refs.fxInput.current, refs.cellInput.current, kcode, preTextRef.current);
       });
     }
-  }, [refs.cellInput, refs.fxInput, setContext]);
+  }, [refs.cellInput, refs.fxInput, setContext, appendFormulaHistoryFromPrimaryEditor]);
   var onPaste = (0, _react.useCallback)(function (e) {
     if (_lodash.default.isEmpty(context.luckysheetCellUpdate)) {
       e.preventDefault();
@@ -689,6 +729,7 @@ var InputBox = function InputBox() {
     }
     return activeCell || cell;
   };
+  (0, _useRerenderOnFormulaCaret.useRerenderOnFormulaCaret)(inputRef, context.luckysheetCellUpdate.length > 0);
   var getFunctionNameFromInput = (0, _react.useCallback)(function () {
     var _a, _b;
     var inputText = ((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText) || "";
@@ -705,8 +746,9 @@ var InputBox = function InputBox() {
     }
     return null;
   }, []);
-  var functionName = context.functionHint || getFunctionNameFromInput();
+  var functionName = (_o = (_m = (0, _helper.getFunctionNameFromFormulaCaretSpans)(inputRef.current)) !== null && _m !== void 0 ? _m : context.functionHint) !== null && _o !== void 0 ? _o : getFunctionNameFromInput();
   var fn = functionName ? context.formulaCache.functionlistMap[functionName] : null;
+  var showCellFormulaChrome = context.luckysheetCellUpdate.length > 0 && (0, _fortuneCore.getFormulaEditorOwner)(context) === "cell";
   var inputBoxBaseSelection = isInputBoxActive && firstSelectionActiveCell ? firstSelectionActiveCell : firstSelection;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-input-box",
@@ -718,7 +760,7 @@ var InputBox = function InputBox() {
     onMouseUp: function onMouseUp(e) {
       return e.stopPropagation();
     }
-  }, firstSelection && !((_m = context.rangeDialog) === null || _m === void 0 ? void 0 : _m.show) && (/*#__PURE__*/_react.default.createElement("div", {
+  }, firstSelection && !((_p = context.rangeDialog) === null || _p === void 0 ? void 0 : _p.show) && (/*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-cell-address-indicator",
     style: getAddressIndicatorPosition()
   }, wraperGetCell())), /*#__PURE__*/_react.default.createElement("div", {
@@ -748,10 +790,23 @@ var InputBox = function InputBox() {
     },
     onMouseUp: function onMouseUp() {
       handleHideShowHint();
+      setContext(function (draftCtx) {
+        (0, _fortuneCore.setFormulaEditorOwner)(draftCtx, "cell");
+      });
       if (!isComposingRef.current) {
         var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
         setCommaCount(currentCommaCount);
       }
+      var editor = inputRef.current;
+      if (!editor) return;
+      setContext(function (draftCtx) {
+        if (draftCtx.formulaCache.rangeSelectionActive !== true) return;
+        var clickedInsideManagedRange = (0, _fortuneCore.getFormulaRangeIndexAtCaret)(editor) !== null;
+        var atValidInsertionPoint = (0, _fortuneCore.isCaretAtValidFormulaRangeInsertionPoint)(editor);
+        if (clickedInsideManagedRange || !atValidInsertionPoint) {
+          (0, _fortuneCore.markRangeSelectionDirty)(draftCtx);
+        }
+      });
     },
     innerRef: function innerRef(e) {
       inputRef.current = e;
@@ -794,7 +849,7 @@ var InputBox = function InputBox() {
         backgroundColor: "rgba(0, 123, 255, 0.25)"
       }
     });
-  })))), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0 || fn) && (/*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showSearchHint && (/*#__PURE__*/_react.default.createElement(_FormulaSearch.default, {
+  })))), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0 || fn) && showCellFormulaChrome && (/*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showSearchHint && (/*#__PURE__*/_react.default.createElement(_FormulaSearch.default, {
     onMouseMove: function onMouseMove(e) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var hoveredItem = e.target.closest(".luckysheet-formula-search-item");
@@ -809,12 +864,12 @@ var InputBox = function InputBox() {
     }
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "cell-hint"
-  }, showFormulaHint && fn && (/*#__PURE__*/_react.default.createElement(_FormulaHint.default, {
+  }, showFormulaHint && fn && !showSearchHint && (/*#__PURE__*/_react.default.createElement(_FormulaHint.default, {
     handleShowFormulaHint: handleShowFormulaHint,
     showFormulaHint: showFormulaHint,
     commaCount: commaCount,
     functionName: functionName
-  })), !showFormulaHint && fn && (/*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
+  })), !showFormulaHint && fn && !showSearchHint && (/*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
     text: "Turn on formula suggestions (F10)",
     placement: "top",
     defaultOpen: true,

package/lib/components/SheetOverlay/helper.d.ts

@@ -6,6 +6,8 @@ export declare function buildFormulaSuggestionText(editableDiv: HTMLDivElement,
     caretOffset: number;
 };
 export declare function isLetterNumberPattern(str: string): boolean;
+export declare function shouldShowFormulaFunctionList(editor: HTMLDivElement | null): boolean;
+export declare function getFunctionNameFromFormulaCaretSpans(editor: HTMLDivElement | null): string | null;
 export declare function removeLastSpan(htmlString: string): string;
 export declare function numberToColumn(colNumber: number): string;
 export declare function incrementColumn(cell: string): string;

package/lib/components/SheetOverlay/helper.js

@@ -8,6 +8,7 @@ exports.countCommasBeforeCursor = countCommasBeforeCursor;
 exports.decrementColumn = decrementColumn;
 exports.decrementRow = decrementRow;
 exports.getCursorPosition = getCursorPosition;
+exports.getFunctionNameFromFormulaCaretSpans = getFunctionNameFromFormulaCaretSpans;
 exports.incrementColumn = incrementColumn;
 exports.incrementRow = incrementRow;
 exports.isLetterNumberPattern = isLetterNumberPattern;
@@ -15,6 +16,7 @@ exports.moveCursorToEnd = moveCursorToEnd;
 exports.numberToColumn = numberToColumn;
 exports.removeLastSpan = removeLastSpan;
 exports.setCursorPosition = setCursorPosition;
+exports.shouldShowFormulaFunctionList = shouldShowFormulaFunctionList;
 function moveCursorToEnd(editableDiv) {
   editableDiv.focus();
   var range = document.createRange();
@@ -91,6 +93,49 @@ function isLetterNumberPattern(str) {
   var regex = /^[a-zA-Z]+\d+$/;
   return regex.test(str);
 }
+function shouldShowFormulaFunctionList(editor) {
+  var _a, _b;
+  if (!editor) return false;
+  if (!((_a = editor.innerText) === null || _a === void 0 ? void 0 : _a.includes("="))) return false;
+  var parser = new DOMParser();
+  var doc = parser.parseFromString("<div>".concat(editor.innerHTML, "</div>"), "text/html");
+  var spans = doc.querySelectorAll("span");
+  var lastSpan = spans[spans.length - 1];
+  var lastText = (_b = lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) !== null && _b !== void 0 ? _b : "";
+  return /^=?[A-Za-z]*$/.test(lastText);
+}
+var FORMULA_FUNC_CLASS = "luckysheet-formula-text-func";
+var FORMULA_LPAR_CLASS = "luckysheet-formula-text-lpar";
+function getFunctionNameFromFormulaCaretSpans(editor) {
+  var _a, _b;
+  if (!editor) return null;
+  var sel = window.getSelection();
+  if (!(sel === null || sel === void 0 ? void 0 : sel.rangeCount)) return null;
+  var range = sel.getRangeAt(0);
+  if (!editor.contains(range.startContainer)) return null;
+  var n = range.startContainer;
+  while (n && n !== editor) {
+    if (n.nodeType === Node.ELEMENT_NODE) {
+      var elem = n;
+      if (elem.classList.contains(FORMULA_FUNC_CLASS)) {
+        var next = elem.nextElementSibling;
+        if (next === null || next === void 0 ? void 0 : next.classList.contains(FORMULA_LPAR_CLASS)) {
+          var name_1 = (_a = elem.textContent) === null || _a === void 0 ? void 0 : _a.trim();
+          return name_1 ? name_1.toUpperCase() : null;
+        }
+      }
+      if (elem.classList.contains(FORMULA_LPAR_CLASS)) {
+        var prev = elem.previousElementSibling;
+        if (prev === null || prev === void 0 ? void 0 : prev.classList.contains(FORMULA_FUNC_CLASS)) {
+          var name_2 = (_b = prev.textContent) === null || _b === void 0 ? void 0 : _b.trim();
+          return name_2 ? name_2.toUpperCase() : null;
+        }
+      }
+    }
+    n = n.parentNode;
+  }
+  return null;
+}
 function removeLastSpan(htmlString) {
   var container = document.createElement("div");
   container.innerHTML = htmlString;

package/lib/components/SheetOverlay/index.css

@@ -356,7 +356,7 @@
 }
 
 .luckysheet-formula-text-color {
-  color: black;
+  color: darkred;
 }
 
 .luckysheet-formula-text-string {

package/lib/components/Workbook/index.js

@@ -887,7 +887,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       });
     }
     var nativeEvent = e.nativeEvent;
-    if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ") {
+    if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ" && context.luckysheetCellUpdate.length === 0) {
       if (e.shiftKey) {
         handleRedo();
       } else {
@@ -896,7 +896,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       e.stopPropagation();
       return;
     }
-    if ((e.ctrlKey || e.metaKey) && e.code === "KeyY") {
+    if ((e.ctrlKey || e.metaKey) && e.code === "KeyY" && context.luckysheetCellUpdate.length === 0) {
       handleRedo();
       e.stopPropagation();
       e.preventDefault();

package/lib/hooks/useFormulaEditorHistory.d.ts

@@ -0,0 +1,24 @@
+import { type RefObject } from "react";
+import { type Context } from "@fileverse-dev/fortune-core";
+import type { SetContextOptions } from "../context";
+export type FormulaHistoryEntry = {
+    text: string;
+    caret: number;
+    spanValues: string[];
+};
+export type FormulaEditorHistoryPrimary = "cell" | "fx";
+type SetContext = (recipe: (ctx: Context) => void, options?: SetContextOptions) => void;
+export declare function useFormulaEditorHistory(primaryRef: RefObject<HTMLDivElement | null>, cellInputRef: RefObject<HTMLDivElement | null>, fxInputRef: RefObject<HTMLDivElement | null>, setContext: SetContext, primary: FormulaEditorHistoryPrimary): {
+    formulaHistoryRef: RefObject<{
+        active: boolean;
+        entries: FormulaHistoryEntry[];
+        index: number;
+    }>;
+    preTextRef: RefObject<string>;
+    preFormulaSpanValuesRef: RefObject<string[] | null>;
+    resetFormulaHistory: () => void;
+    handleFormulaHistoryUndoRedo: (isRedo: boolean) => boolean;
+    capturePreFormulaState: () => void;
+    appendFormulaHistoryFromPrimaryEditor: (getCaret: () => number) => void;
+};
+export {};

package/lib/hooks/useFormulaEditorHistory.js

@@ -0,0 +1,126 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFormulaEditorHistory = useFormulaEditorHistory;
+var _react = require("react");
+var _lodash = _interopRequireDefault(require("lodash"));
+var _fortuneCore = require("@fileverse-dev/fortune-core");
+var _helper = require("../components/SheetOverlay/helper");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+var MAX_FORMULA_HISTORY = 100;
+function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, setContext, primary) {
+  var preTextRef = (0, _react.useRef)("");
+  var preFormulaSpanValuesRef = (0, _react.useRef)(null);
+  var formulaHistoryRef = (0, _react.useRef)({
+    active: false,
+    entries: [],
+    index: -1
+  });
+  var resetFormulaHistory = (0, _react.useCallback)(function () {
+    formulaHistoryRef.current = {
+      active: false,
+      entries: [],
+      index: -1
+    };
+    preFormulaSpanValuesRef.current = null;
+  }, []);
+  var pushFormulaHistoryEntry = (0, _react.useCallback)(function (entry) {
+    var history = formulaHistoryRef.current;
+    var current = history.entries[history.index];
+    if (current && current.spanValues.length > 0 && entry.spanValues.length > 0 && _lodash.default.isEqual(current.spanValues, entry.spanValues)) {
+      return;
+    }
+    if (current && current.spanValues.length === 0 && entry.spanValues.length === 0 && current.text === entry.text && current.caret === entry.caret) {
+      return;
+    }
+    var nextEntries = history.entries.slice(0, history.index + 1);
+    nextEntries.push(entry);
+    if (nextEntries.length > MAX_FORMULA_HISTORY) {
+      nextEntries.shift();
+    }
+    history.entries = nextEntries;
+    history.index = nextEntries.length - 1;
+    history.active = true;
+  }, []);
+  var applyFormulaHistoryEntry = (0, _react.useCallback)(function (entry) {
+    var primaryEl = primaryRef.current;
+    if (!primaryEl) return;
+    var safeText = (0, _fortuneCore.escapeScriptTag)(entry.text || "");
+    var html = safeText.startsWith("=") ? (0, _fortuneCore.functionHTMLGenerate)(safeText) : (0, _fortuneCore.escapeHTMLTag)(safeText);
+    var cell = cellInputRef.current;
+    var fx = fxInputRef.current;
+    primaryEl.innerHTML = html;
+    if (primary === "cell") {
+      if (fx) fx.innerHTML = html;
+    } else if (cell) {
+      cell.innerHTML = html;
+    }
+    (0, _helper.setCursorPosition)(primaryEl, Math.min(entry.caret, entry.text.length));
+    setContext(function (draftCtx) {
+      if (primary === "cell") {
+        if (!cellInputRef.current) return;
+        (0, _fortuneCore.handleFormulaInput)(draftCtx, fxInputRef.current, cellInputRef.current, 0);
+      } else {
+        if (!fxInputRef.current) return;
+        (0, _fortuneCore.handleFormulaInput)(draftCtx, cellInputRef.current, fxInputRef.current, 0);
+      }
+    });
+  }, [cellInputRef, fxInputRef, primary, primaryRef, setContext]);
+  var handleFormulaHistoryUndoRedo = (0, _react.useCallback)(function (isRedo) {
+    var history = formulaHistoryRef.current;
+    if (!history.active || history.entries.length === 0) return false;
+    var nextIndex = isRedo ? history.index + 1 : history.index - 1;
+    if (nextIndex < 0 || nextIndex >= history.entries.length) return true;
+    history.index = nextIndex;
+    applyFormulaHistoryEntry(history.entries[nextIndex]);
+    return true;
+  }, [applyFormulaHistoryEntry]);
+  var capturePreFormulaState = (0, _react.useCallback)(function () {
+    var el = primaryRef.current;
+    if (!el) return;
+    preTextRef.current = el.innerText;
+    preFormulaSpanValuesRef.current = Array.from(el.querySelectorAll("span.fortune-formula-functionrange-cell")).map(function (node) {
+      var _a;
+      return (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+    });
+  }, [primaryRef]);
+  var appendFormulaHistoryFromPrimaryEditor = (0, _react.useCallback)(function (getCaret) {
+    var _a, _b;
+    var el = primaryRef.current;
+    if (!el) return;
+    var currentText = el.innerText || "";
+    if (currentText.startsWith("=")) {
+      var caret = getCaret();
+      var spanValues = Array.from(el.querySelectorAll("span.fortune-formula-functionrange-cell")).map(function (node) {
+        var _a;
+        return (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+      });
+      if (!formulaHistoryRef.current.active) {
+        var seedText = preTextRef.current || "";
+        pushFormulaHistoryEntry({
+          text: seedText,
+          caret: Math.min(caret, seedText.length),
+          spanValues: (_b = (_a = preFormulaSpanValuesRef.current) !== null && _a !== void 0 ? _a : spanValues) !== null && _b !== void 0 ? _b : []
+        });
+      }
+      pushFormulaHistoryEntry({
+        text: currentText,
+        caret: caret,
+        spanValues: spanValues
+      });
+    } else if (formulaHistoryRef.current.active) {
+      resetFormulaHistory();
+    }
+  }, [primaryRef, pushFormulaHistoryEntry, resetFormulaHistory]);
+  return {
+    formulaHistoryRef: formulaHistoryRef,
+    preTextRef: preTextRef,
+    preFormulaSpanValuesRef: preFormulaSpanValuesRef,
+    resetFormulaHistory: resetFormulaHistory,
+    handleFormulaHistoryUndoRedo: handleFormulaHistoryUndoRedo,
+    capturePreFormulaState: capturePreFormulaState,
+    appendFormulaHistoryFromPrimaryEditor: appendFormulaHistoryFromPrimaryEditor
+  };
+}

package/lib/hooks/useRerenderOnFormulaCaret.d.ts

@@ -0,0 +1,2 @@
+import { type RefObject } from "react";
+export declare function useRerenderOnFormulaCaret(editorRef: RefObject<HTMLDivElement | null>, editSessionActive: boolean): void;

package/lib/hooks/useRerenderOnFormulaCaret.js

@@ -0,0 +1,32 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useRerenderOnFormulaCaret = useRerenderOnFormulaCaret;
+var _react = require("react");
+function useRerenderOnFormulaCaret(editorRef, editSessionActive) {
+  var _a = (0, _react.useState)(0),
+    bump = _a[1];
+  (0, _react.useEffect)(function () {
+    if (!editSessionActive) return;
+    var onSelectionChange = function onSelectionChange() {
+      var _a, _b;
+      var el = editorRef.current;
+      if (!el) return;
+      var text = (_b = (_a = el.innerText) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : "";
+      if (!text.startsWith("=")) return;
+      var sel = window.getSelection();
+      if (!(sel === null || sel === void 0 ? void 0 : sel.rangeCount) || !el.contains(sel.getRangeAt(0).startContainer)) {
+        return;
+      }
+      bump(function (n) {
+        return n + 1;
+      });
+    };
+    document.addEventListener("selectionchange", onSelectionChange);
+    return function () {
+      return document.removeEventListener("selectionchange", onSelectionChange);
+    };
+  }, [editSessionActive, editorRef]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.11-input-ref",
+  "version": "1.3.11-input-ref-1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.11-input-ref",
+    "@fileverse-dev/fortune-core": "1.3.11-input-ref-1",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",