@fileverse-dev/fortune-react 1.3.13-create-3 → 1.3.13-create-5

package/lib/components/FxEditor/index.js

@@ -41,12 +41,11 @@ var FxEditor = function FxEditor() {
     refs = _g.refs;
   var lastKeyDownEventRef = (0, _react.useRef)(null);
   var _h = (0, _useFormulaEditorHistory.useFormulaEditorHistory)(refs.fxInput, refs.cellInput, refs.fxInput, setContext, "fx"),
-    formulaHistoryRef = _h.formulaHistoryRef,
     preTextRef = _h.preTextRef,
     resetFormulaHistory = _h.resetFormulaHistory,
     handleFormulaHistoryUndoRedo = _h.handleFormulaHistoryUndoRedo,
-    capturePreFormulaState = _h.capturePreFormulaState,
-    appendFormulaHistoryFromPrimaryEditor = _h.appendFormulaHistoryFromPrimaryEditor;
+    capturePreEditorHistoryState = _h.capturePreEditorHistoryState,
+    appendEditorHistoryFromPrimaryEditor = _h.appendEditorHistoryFromPrimaryEditor;
   var inputContainerRef = (0, _react.useRef)(null);
   var _j = (0, _react.useState)(false),
     isHidenRC = _j[0],
@@ -288,7 +287,20 @@ var FxEditor = function FxEditor() {
     var currentCommaCount = (0, _helper.countCommasBeforeCursor)((_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current);
     setCommaCount(currentCommaCount);
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
-    capturePreFormulaState();
+    if (!(0, _helper.isEditorUndoRedoKeyEvent)(e.nativeEvent)) {
+      capturePreEditorHistoryState();
+    }
+    var isPotentialContentKey = !e.metaKey && !e.ctrlKey && !e.altKey && (e.key.length === 1 || e.key === "Backspace" || e.key === "Delete" || e.key === "Enter" || e.key === "Tab");
+    if (isPotentialContentKey) {
+      requestAnimationFrame(function () {
+        requestAnimationFrame(function () {
+          if ((0, _fortuneCore.getFormulaEditorOwner)(context) !== "fx") return;
+          appendEditorHistoryFromPrimaryEditor(function () {
+            return (0, _helper.getCursorPosition)(refs.fxInput.current);
+          });
+        });
+      });
+    }
     recentText.current = refs.fxInput.current.innerText;
     var key = e.key;
     var currentInputText = ((_c = (_b = refs.fxInput.current) === null || _b === void 0 ? void 0 : _b.innerText) === null || _c === void 0 ? void 0 : _c.trim()) || "";
@@ -340,14 +352,20 @@ var FxEditor = function FxEditor() {
     }
     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();
-          }
-        }
+        var isRedo_1 = e.code === "KeyY" || e.code === "KeyZ" && e.shiftKey;
+        e.preventDefault();
         e.stopPropagation();
+        var _attempt_ = function attempt_1(triesLeft) {
+          var handled = handleFormulaHistoryUndoRedo(isRedo_1);
+          if (handled) return;
+          if (triesLeft <= 0) return;
+          requestAnimationFrame(function () {
+            requestAnimationFrame(function () {
+              return _attempt_(triesLeft - 1);
+            });
+          });
+        };
+        _attempt_(2);
         return;
       }
     }
@@ -440,7 +458,7 @@ var FxEditor = function FxEditor() {
         }
       }
     });
-  }, [capturePreFormulaState, context.allowEdit, context.luckysheetCellUpdate, handleFormulaHistoryUndoRedo, refs.cellInput, refs.fxInput, setContext]);
+  }, [capturePreEditorHistoryState, context.allowEdit, context.luckysheetCellUpdate, handleFormulaHistoryUndoRedo, refs.cellInput, refs.fxInput, setContext]);
   var handleHideShowHint = function handleHideShowHint() {
     var _a, _b, _c, _d;
     var el = (_a = document.getElementsByClassName("cell-hint")) === null || _a === void 0 ? void 0 : _a[0];
@@ -492,23 +510,55 @@ var FxEditor = function FxEditor() {
       if (editor_1) {
         setContext(function (draftCtx) {
           if (!(0, _fortuneCore.isAllowEdit)(draftCtx, draftCtx.luckysheet_select_save)) return;
+          if ((0, _fortuneCore.getFormulaEditorOwner)(draftCtx) !== "fx") return;
+          if (draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start) {
+            (0, _fortuneCore.rangeHightlightselected)(draftCtx, editor_1);
+            return;
+          }
+          draftCtx.formulaCache.selectingRangeIndex = -1;
+          (0, _fortuneCore.createRangeHightlight)(draftCtx, editor_1.innerHTML);
           (0, _fortuneCore.rangeHightlightselected)(draftCtx, editor_1);
         });
       }
       return;
     }
+    if ((0, _helper.isEditorUndoRedoKeyEvent)(e)) {
+      return;
+    }
     var kcode = e.keyCode;
     if (!kcode) return;
-    appendFormulaHistoryFromPrimaryEditor(function () {
-      return (0, _helper.getCursorPosition)(refs.fxInput.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) {
         (0, _fortuneCore.handleFormulaInput)(draftCtx, refs.cellInput.current, refs.fxInput.current, kcode, recentText.current);
       });
     }
-  }, [appendFormulaHistoryFromPrimaryEditor, context.isFlvReadOnly, context.luckysheetCellUpdate, refs.cellInput, refs.fxInput, setContext]);
-  (0, _useRerenderOnFormulaCaret.useRerenderOnFormulaCaret)(refs.fxInput, context.luckysheetCellUpdate.length > 0);
+    requestAnimationFrame(function () {
+      if ((0, _fortuneCore.getFormulaEditorOwner)(context) !== "fx") return;
+      appendEditorHistoryFromPrimaryEditor(function () {
+        return (0, _helper.getCursorPosition)(refs.fxInput.current);
+      });
+    });
+  }, [appendEditorHistoryFromPrimaryEditor, context.isFlvReadOnly, context.luckysheetCellUpdate, refs.cellInput, refs.fxInput, setContext]);
+  var refreshFxFormulaRangeHighlights = (0, _react.useCallback)(function () {
+    var el = refs.fxInput.current;
+    if (!el) return;
+    setContext(function (draftCtx) {
+      var _a, _b;
+      if (draftCtx.luckysheetCellUpdate.length === 0) return;
+      if ((0, _fortuneCore.getFormulaEditorOwner)(draftCtx) !== "fx") return;
+      if (!(0, _fortuneCore.isAllowEdit)(draftCtx, draftCtx.luckysheet_select_save)) return;
+      var t = (_b = (_a = el.innerText) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : "";
+      if (!t.startsWith("=")) return;
+      if (draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start) {
+        (0, _fortuneCore.rangeHightlightselected)(draftCtx, el);
+        return;
+      }
+      draftCtx.formulaCache.selectingRangeIndex = -1;
+      (0, _fortuneCore.createRangeHightlight)(draftCtx, el.innerHTML);
+      (0, _fortuneCore.rangeHightlightselected)(draftCtx, el);
+    });
+  }, [refs.fxInput, setContext]);
+  (0, _useRerenderOnFormulaCaret.useRerenderOnFormulaCaret)(refs.fxInput, context.luckysheetCellUpdate.length > 0, refreshFxFormulaRangeHighlights);
   var getFunctionNameFromInput = (0, _react.useCallback)(function () {
     var _a, _b, _c, _d;
     var inputText = ((_b = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.innerText) || "";
@@ -596,11 +646,16 @@ var FxEditor = function FxEditor() {
       var currentCommaCount = (0, _helper.countCommasBeforeCursor)(editor);
       setCommaCount(currentCommaCount);
       setContext(function (draftCtx) {
+        var _a;
         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);
+          if ((_a = editor.innerText) === null || _a === void 0 ? void 0 : _a.trim().startsWith("=")) {
+            (0, _fortuneCore.createRangeHightlight)(draftCtx, editor.innerHTML);
+            (0, _fortuneCore.rangeHightlightselected)(draftCtx, editor);
+          }
         }
       });
     },

package/lib/components/SheetOverlay/ContentEditable.js

@@ -50,10 +50,11 @@ var ContentEditable = function ContentEditable(_a) {
     if (root.current != null) {
       html = root.current.innerHTML;
     }
-    if (onChange && html !== lastHtml.current) {
-      onChange(html || "", isBlur);
+    var htmlStr = html || "";
+    if (onChange && htmlStr !== lastHtml.current) {
+      onChange(htmlStr, isBlur);
     }
-    lastHtml.current = html || "";
+    lastHtml.current = htmlStr;
   }, [root, onChange]);
   var innerRef = props.innerRef,
     _onBlur = props.onBlur;

package/lib/components/SheetOverlay/InputBox.js

@@ -31,6 +31,20 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var CELL_EDIT_INPUT_EXTRA_RIGHT_PX = 10;
+function measureCellEditorContentWidth(el) {
+  var _a;
+  if (!el) return 0;
+  try {
+    var range = document.createRange();
+    range.selectNodeContents(el);
+    var w = range.getBoundingClientRect().width;
+    (_a = range.detach) === null || _a === void 0 ? void 0 : _a.call(range);
+    return w;
+  } catch (_b) {
+    return el.scrollWidth;
+  }
+}
 var InputBox = function InputBox() {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
   var _q = (0, _react.useContext)(_context.default),
@@ -80,24 +94,29 @@ var InputBox = function InputBox() {
   var _1 = (0, _react.useState)(false),
     showSearchHint = _1[0],
     setShowSearchHint = _1[1];
+  var _2 = (0, _react.useState)(0),
+    editorLayoutTick = _2[0],
+    setEditorLayoutTick = _2[1];
+  var _3 = (0, _react.useState)(false),
+    cellEditorExtendRight = _3[0],
+    setCellEditorExtendRight = _3[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 isComposingRef = (0, _react.useRef)(false);
   var formulaAnchorCellRef = (0, _react.useRef)(null);
   var skipNextAnchorSelectionSyncRef = (0, _react.useRef)(false);
   var lastHandledMouseDragSignatureRef = (0, _react.useRef)("");
-  var _2 = (0, _useFormulaEditorHistory.useFormulaEditorHistory)(inputRef, refs.cellInput, refs.fxInput, setContext, "cell"),
-    formulaHistoryRef = _2.formulaHistoryRef,
-    preTextRef = _2.preTextRef,
-    resetFormulaHistory = _2.resetFormulaHistory,
-    handleFormulaHistoryUndoRedo = _2.handleFormulaHistoryUndoRedo,
-    capturePreFormulaState = _2.capturePreFormulaState,
-    appendFormulaHistoryFromPrimaryEditor = _2.appendFormulaHistoryFromPrimaryEditor;
+  var _4 = (0, _useFormulaEditorHistory.useFormulaEditorHistory)(inputRef, refs.cellInput, refs.fxInput, setContext, "cell"),
+    preTextRef = _4.preTextRef,
+    resetFormulaHistory = _4.resetFormulaHistory,
+    handleFormulaHistoryUndoRedo = _4.handleFormulaHistoryUndoRedo,
+    capturePreEditorHistoryState = _4.capturePreEditorHistoryState,
+    appendEditorHistoryFromPrimaryEditor = _4.appendEditorHistoryFromPrimaryEditor;
   var ZWSP = "\u200B";
   var inputBoxInnerRef = (0, _react.useRef)(null);
-  var _3 = (0, _react.useState)([]),
-    linkSelectionHighlightRects = _3[0],
-    setLinkSelectionHighlightRects = _3[1];
+  var _5 = (0, _react.useState)([]),
+    linkSelectionHighlightRects = _5[0],
+    setLinkSelectionHighlightRects = _5[1];
   var ensureNotEmpty = function ensureNotEmpty() {
     var el = inputRef.current;
     if (!el) return;
@@ -414,12 +433,25 @@ var InputBox = function InputBox() {
     });
   }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = (0, _react.useCallback)(function (e) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     setContext(function (draftCtx) {
       (0, _fortuneCore.setFormulaEditorOwner)(draftCtx, "cell");
     });
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
-    capturePreFormulaState();
+    if (!(0, _helper.isEditorUndoRedoKeyEvent)(e.nativeEvent)) {
+      capturePreEditorHistoryState();
+    }
+    var isPotentialContentKey = !e.metaKey && !e.ctrlKey && !e.altKey && (e.key.length === 1 || e.key === "Backspace" || e.key === "Delete" || e.key === "Enter" || e.key === "Tab");
+    if (isPotentialContentKey) {
+      requestAnimationFrame(function () {
+        requestAnimationFrame(function () {
+          if ((0, _fortuneCore.getFormulaEditorOwner)(context) !== "cell") return;
+          appendEditorHistoryFromPrimaryEditor(function () {
+            return (0, _helper.getCursorPosition)(inputRef.current);
+          });
+        });
+      });
+    }
     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) {
@@ -436,9 +468,9 @@ var InputBox = function InputBox() {
       setContext(function (draftCtx) {
         draftCtx.formulaCache.rangeSelectionActive = null;
       });
-      var _d = formulaAnchorCellRef.current,
-        anchorRow_1 = _d[0],
-        anchorCol_1 = _d[1];
+      var _m = formulaAnchorCellRef.current,
+        anchorRow_1 = _m[0],
+        anchorCol_1 = _m[1];
       skipNextAnchorSelectionSyncRef.current = true;
       setTimeout(function () {
         setContext(function (draftCtx) {
@@ -464,39 +496,93 @@ var InputBox = function InputBox() {
     }
     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();
-          }
-        }
+        var isRedo_1 = e.code === "KeyY" || e.code === "KeyZ" && e.shiftKey;
+        e.preventDefault();
         e.stopPropagation();
+        var _attempt_ = function attempt_1(triesLeft) {
+          var handled = handleFormulaHistoryUndoRedo(isRedo_1);
+          if (handled) return;
+          if (triesLeft <= 0) return;
+          requestAnimationFrame(function () {
+            requestAnimationFrame(function () {
+              return _attempt_(triesLeft - 1);
+            });
+          });
+        };
+        _attempt_(2);
         return;
       }
       if (e.code === "KeyB") {
+        var beforeHtml_1 = (_d = (_c = inputRef.current) === null || _c === void 0 ? void 0 : _c.innerHTML) !== null && _d !== void 0 ? _d : "";
         (0, _fortuneCore.handleBold)(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return (0, _helper.getCursorPosition)(inputRef.current);
-        });
+        var _pushFormattingSnapshot_ = function pushFormattingSnapshot_1(triesLeft) {
+          requestAnimationFrame(function () {
+            var _a, _b;
+            var afterHtml = (_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "";
+            if (afterHtml !== beforeHtml_1 || triesLeft <= 0) {
+              appendEditorHistoryFromPrimaryEditor(function () {
+                return (0, _helper.getCursorPosition)(inputRef.current);
+              });
+              return;
+            }
+            _pushFormattingSnapshot_(triesLeft - 1);
+          });
+        };
+        _pushFormattingSnapshot_(2);
         stopPropagation(e);
       } else if (e.code === "KeyI") {
+        var beforeHtml_2 = (_f = (_e = inputRef.current) === null || _e === void 0 ? void 0 : _e.innerHTML) !== null && _f !== void 0 ? _f : "";
         (0, _fortuneCore.handleItalic)(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return (0, _helper.getCursorPosition)(inputRef.current);
-        });
+        var _pushFormattingSnapshot_2 = function pushFormattingSnapshot_2(triesLeft) {
+          requestAnimationFrame(function () {
+            var _a, _b;
+            var afterHtml = (_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "";
+            if (afterHtml !== beforeHtml_2 || triesLeft <= 0) {
+              appendEditorHistoryFromPrimaryEditor(function () {
+                return (0, _helper.getCursorPosition)(inputRef.current);
+              });
+              return;
+            }
+            _pushFormattingSnapshot_2(triesLeft - 1);
+          });
+        };
+        _pushFormattingSnapshot_2(2);
         stopPropagation(e);
       } else if (e.code === "KeyU") {
+        var beforeHtml_3 = (_h = (_g = inputRef.current) === null || _g === void 0 ? void 0 : _g.innerHTML) !== null && _h !== void 0 ? _h : "";
         (0, _fortuneCore.handleUnderline)(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return (0, _helper.getCursorPosition)(inputRef.current);
-        });
+        var _pushFormattingSnapshot_3 = function pushFormattingSnapshot_3(triesLeft) {
+          requestAnimationFrame(function () {
+            var _a, _b;
+            var afterHtml = (_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "";
+            if (afterHtml !== beforeHtml_3 || triesLeft <= 0) {
+              appendEditorHistoryFromPrimaryEditor(function () {
+                return (0, _helper.getCursorPosition)(inputRef.current);
+              });
+              return;
+            }
+            _pushFormattingSnapshot_3(triesLeft - 1);
+          });
+        };
+        _pushFormattingSnapshot_3(2);
         stopPropagation(e);
       } else if (e.code === "KeyS") {
+        var beforeHtml_4 = (_k = (_j = inputRef.current) === null || _j === void 0 ? void 0 : _j.innerHTML) !== null && _k !== void 0 ? _k : "";
         (0, _fortuneCore.handleStrikeThrough)(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return (0, _helper.getCursorPosition)(inputRef.current);
-        });
+        var _pushFormattingSnapshot_4 = function pushFormattingSnapshot_4(triesLeft) {
+          requestAnimationFrame(function () {
+            var _a, _b;
+            var afterHtml = (_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "";
+            if (afterHtml !== beforeHtml_4 || triesLeft <= 0) {
+              appendEditorHistoryFromPrimaryEditor(function () {
+                return (0, _helper.getCursorPosition)(inputRef.current);
+              });
+              return;
+            }
+            _pushFormattingSnapshot_4(triesLeft - 1);
+          });
+        };
+        _pushFormattingSnapshot_4(2);
         stopPropagation(e);
       }
     }
@@ -506,7 +592,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
-    var isInPlaceEditMode = ((_c = refs.globalCache) === null || _c === void 0 ? void 0 : _c.enteredEditByTyping) !== true;
+    var isInPlaceEditMode = ((_l = refs.globalCache) === null || _l === void 0 ? void 0 : _l.enteredEditByTyping) !== true;
     if (e.key === "Delete" || e.key === "Backspace") {
       var anchor = formulaAnchorCellRef.current;
       if (anchor != null) {
@@ -595,7 +681,7 @@ var InputBox = function InputBox() {
       }
       e.preventDefault();
     }
-  }, [capturePreFormulaState, clearSearchItemActiveClass, context.luckysheetCellUpdate.length, handleFormulaHistoryUndoRedo, selectActiveFormula, setContext, firstSelection, refs.cellInput]);
+  }, [capturePreEditorHistoryState, clearSearchItemActiveClass, context.luckysheetCellUpdate.length, handleFormulaHistoryUndoRedo, selectActiveFormula, setContext, firstSelection, refs.cellInput]);
   var handleHideShowHint = function handleHideShowHint() {
     var _a, _b, _c, _d;
     var searchElFx = (_a = document.getElementsByClassName("fx-search")) === null || _a === void 0 ? void 0 : _a[0];
@@ -637,11 +723,11 @@ var InputBox = function InputBox() {
       }
       return;
     }
+    if ((0, _helper.isEditorUndoRedoKeyEvent)(e)) {
+      return;
+    }
     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) {
         var _a, _b;
@@ -656,7 +742,13 @@ var InputBox = function InputBox() {
         }
       });
     }
-  }, [refs.cellInput, refs.fxInput, setContext, appendFormulaHistoryFromPrimaryEditor]);
+    requestAnimationFrame(function () {
+      if ((0, _fortuneCore.getFormulaEditorOwner)(context) !== "cell") return;
+      appendEditorHistoryFromPrimaryEditor(function () {
+        return (0, _helper.getCursorPosition)(inputRef.current);
+      });
+    });
+  }, [refs.cellInput, refs.fxInput, setContext, appendEditorHistoryFromPrimaryEditor]);
   var onPaste = (0, _react.useCallback)(function (e) {
     var plainText = e.clipboardData.getData("text/plain");
     e.preventDefault();
@@ -677,6 +769,19 @@ var InputBox = function InputBox() {
   var rowReadOnly = cfg.rowReadOnly || {};
   var colReadOnly = cfg.colReadOnly || {};
   var edit = !((colReadOnly[col_index] || rowReadOnly[row_index]) && context.allowEdit === true);
+  var onInputBoxInnerMouseDown = (0, _react.useCallback)(function (e) {
+    if (!edit || isHidenRC || context.luckysheetCellUpdate.length === 0) {
+      return;
+    }
+    var editor = refs.cellInput.current;
+    if (!editor) return;
+    if (editor.contains(e.target)) return;
+    e.preventDefault();
+    (0, _helper.moveCursorToEnd)(editor);
+    setContext(function (draftCtx) {
+      (0, _fortuneCore.setFormulaEditorOwner)(draftCtx, "cell");
+    });
+  }, [edit, isHidenRC, context.luckysheetCellUpdate.length, refs.cellInput, setContext]);
   var getInputBoxPosition = (0, _react.useCallback)(function () {
     var _a;
     if (!firstSelection || ((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show)) {
@@ -814,6 +919,20 @@ var InputBox = function InputBox() {
     });
     setLinkSelectionHighlightRects(relative);
   }, [(_h = context.linkCard) === null || _h === void 0 ? void 0 : _h.applyToSelection, (_j = context.linkCard) === null || _j === void 0 ? void 0 : _j.selectionOffsets, (_k = context.linkCard) === null || _k === void 0 ? void 0 : _k.r, (_l = context.linkCard) === null || _l === void 0 ? void 0 : _l.c, context.luckysheetCellUpdate]);
+  (0, _react.useLayoutEffect)(function () {
+    if (context.luckysheetCellUpdate.length === 0) {
+      setCellEditorExtendRight(false);
+      return;
+    }
+    var baseSel = isInputBoxActive && firstSelectionActiveCell ? firstSelectionActiveCell : firstSelection;
+    var cellW = baseSel === null || baseSel === void 0 ? void 0 : baseSel.width;
+    if (cellW == null || !inputRef.current) {
+      setCellEditorExtendRight(false);
+      return;
+    }
+    var contentW = measureCellEditorContentWidth(inputRef.current);
+    setCellEditorExtendRight(contentW + CELL_EDIT_INPUT_EXTRA_RIGHT_PX > cellW);
+  }, [editorLayoutTick, context.luckysheetCellUpdate.length, isInputBoxActive, firstSelectionActiveCell, firstSelection, context.zoomRatio]);
   var wraperGetCell = function wraperGetCell() {
     var cell = getCellAddress();
     if (activeRefCell !== cell) {
@@ -821,7 +940,26 @@ var InputBox = function InputBox() {
     }
     return activeCell || cell;
   };
-  (0, _useRerenderOnFormulaCaret.useRerenderOnFormulaCaret)(inputRef, context.luckysheetCellUpdate.length > 0);
+  var refreshCellFormulaRangeHighlights = (0, _react.useCallback)(function () {
+    var el = inputRef.current;
+    if (!el) return;
+    setContext(function (draftCtx) {
+      var _a, _b;
+      if (draftCtx.luckysheetCellUpdate.length === 0) return;
+      if ((0, _fortuneCore.getFormulaEditorOwner)(draftCtx) !== "cell") return;
+      if (!(0, _fortuneCore.isAllowEdit)(draftCtx, draftCtx.luckysheet_select_save)) return;
+      var t = (_b = (_a = el.innerText) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : "";
+      if (!t.startsWith("=")) return;
+      if (draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start) {
+        (0, _fortuneCore.rangeHightlightselected)(draftCtx, el);
+        return;
+      }
+      draftCtx.formulaCache.selectingRangeIndex = -1;
+      (0, _fortuneCore.createRangeHightlight)(draftCtx, el.innerHTML);
+      (0, _fortuneCore.rangeHightlightselected)(draftCtx, el);
+    });
+  }, [setContext]);
+  (0, _useRerenderOnFormulaCaret.useRerenderOnFormulaCaret)(inputRef, context.luckysheetCellUpdate.length > 0, refreshCellFormulaRangeHighlights);
   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) || "";
@@ -858,11 +996,14 @@ var InputBox = function InputBox() {
   }, wraperGetCell())), /*#__PURE__*/_react.default.createElement("div", {
     ref: inputBoxInnerRef,
     className: "luckysheet-input-box-inner",
-    style: inputBoxBaseSelection ? __assign({
+    onMouseDown: onInputBoxInnerMouseDown,
+    style: inputBoxBaseSelection ? __assign(__assign({
       position: "relative",
       minWidth: inputBoxBaseSelection.width,
       minHeight: inputBoxBaseSelection.height
-    }, inputBoxStyle) : {
+    }, inputBoxStyle), cellEditorExtendRight ? {
+      paddingRight: 2 + CELL_EDIT_INPUT_EXTRA_RIGHT_PX
+    } : {}) : {
       position: "relative"
     }
   }, /*#__PURE__*/_react.default.createElement(_ContentEditable.default, {
@@ -879,6 +1020,9 @@ var InputBox = function InputBox() {
       }
       ensureNotEmpty();
       isComposingRef.current = false;
+      setEditorLayoutTick(function (t) {
+        return t + 1;
+      });
     },
     onMouseUp: function onMouseUp() {
       handleHideShowHint();
@@ -892,11 +1036,16 @@ var InputBox = function InputBox() {
       var editor = inputRef.current;
       if (!editor) return;
       setContext(function (draftCtx) {
+        var _a;
         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);
+          if ((_a = editor.innerText) === null || _a === void 0 ? void 0 : _a.trim().startsWith("=")) {
+            (0, _fortuneCore.createRangeHightlight)(draftCtx, editor.innerHTML);
+            (0, _fortuneCore.rangeHightlightselected)(draftCtx, editor);
+          }
         }
       });
     },

package/lib/components/SheetOverlay/drag_and_drop/column-helpers.js

@@ -18,31 +18,6 @@ var __spreadArray = void 0 && (void 0).__spreadArray || function (to, from, pack
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-var REF_TOKEN_REGEX = /((?:'(?:[^']|'')+'|[A-Za-z_][A-Za-z0-9_.]*)!)?(\$?)([A-Za-z]+)(\$?)(\d+)(?::(\$?)([A-Za-z]+)(\$?)(\d+))?/g;
-function normalizeSheetName(raw) {
-  if (!raw) return "";
-  var noBang = raw.endsWith("!") ? raw.slice(0, -1) : raw;
-  if (noBang.startsWith("'") && noBang.endsWith("'")) {
-    return noBang.slice(1, -1).replace(/''/g, "'");
-  }
-  return noBang;
-}
-function remapFormulaCols(formula, formulaSheetName, movedSheetName, colMap) {
-  return formula.replace(REF_TOKEN_REGEX, function (token, sheetPrefix, colAbs0, col0, rowAbs0, row0, colAbs1, col1, rowAbs1, row1) {
-    var refSheet = normalizeSheetName(sheetPrefix) || formulaSheetName;
-    if (refSheet !== movedSheetName) return token;
-    var colIdx0 = (0, _fortuneCore.columnCharToIndex)(col0);
-    var mapped0 = colMap[colIdx0];
-    var nextCol0 = mapped0 == null ? col0 : (0, _fortuneCore.indexToColumnChar)(mapped0);
-    if (!col1) {
-      return "".concat(sheetPrefix || "").concat(colAbs0).concat(nextCol0).concat(rowAbs0).concat(row0);
-    }
-    var colIdx1 = (0, _fortuneCore.columnCharToIndex)(col1);
-    var mapped1 = colMap[colIdx1];
-    var nextCol1 = mapped1 == null ? col1 : (0, _fortuneCore.indexToColumnChar)(mapped1);
-    return "".concat(sheetPrefix || "").concat(colAbs0).concat(nextCol0).concat(rowAbs0).concat(row0, ":").concat(colAbs1).concat(nextCol1).concat(rowAbs1).concat(row1);
-  });
-}
 function numberToColumnName(num) {
   return (0, _fortuneCore.indexToColumnChar)(num);
 }
@@ -307,7 +282,9 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
                 }
                 if (cell.f) {
                   var sheetName = _sheet.name || "";
-                  cell.f = remapFormulaCols(cell.f, sheetName, sheetName, colMap_1);
+                  cell.f = (0, _fortuneCore.remapFormulaReferencesByMap)(cell.f, sheetName, sheetName, {
+                    colMap: colMap_1
+                  });
                 }
               }
             });

package/lib/components/SheetOverlay/drag_and_drop/row-helpers.js

@@ -17,29 +17,6 @@ var __spreadArray = void 0 && (void 0).__spreadArray || function (to, from, pack
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-var REF_TOKEN_REGEX = /((?:'(?:[^']|'')+'|[A-Za-z_][A-Za-z0-9_.]*)!)?(\$?)([A-Za-z]+)(\$?)(\d+)(?::(\$?)([A-Za-z]+)(\$?)(\d+))?/g;
-function normalizeSheetName(raw) {
-  if (!raw) return "";
-  var noBang = raw.endsWith("!") ? raw.slice(0, -1) : raw;
-  if (noBang.startsWith("'") && noBang.endsWith("'")) {
-    return noBang.slice(1, -1).replace(/''/g, "'");
-  }
-  return noBang;
-}
-function remapFormulaRows(formula, formulaSheetName, movedSheetName, rowMap) {
-  return formula.replace(REF_TOKEN_REGEX, function (token, sheetPrefix, colAbs0, col0, rowAbs0, row0, colAbs1, col1, rowAbs1, row1) {
-    var refSheet = normalizeSheetName(sheetPrefix) || formulaSheetName;
-    if (refSheet !== movedSheetName) return token;
-    var mapped0 = rowMap[parseInt(row0, 10) - 1];
-    var nextRow0 = mapped0 == null ? parseInt(row0, 10) : mapped0 + 1;
-    if (!row1) {
-      return "".concat(sheetPrefix || "").concat(colAbs0).concat(col0).concat(rowAbs0).concat(nextRow0);
-    }
-    var mapped1 = rowMap[parseInt(row1, 10) - 1];
-    var nextRow1 = mapped1 == null ? parseInt(row1, 10) : mapped1 + 1;
-    return "".concat(sheetPrefix || "").concat(colAbs0).concat(col0).concat(rowAbs0).concat(nextRow0, ":").concat(colAbs1).concat(col1).concat(rowAbs1).concat(nextRow1);
-  });
-}
 var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(containerRef, selectedLocationRef) {
   var DOUBLE_MS = 300;
   var START_DRAG_THRESHOLD_PX = 6;
@@ -300,7 +277,9 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
                 }
                 if (cell.f) {
                   var sheetName = _sheet.name || "";
-                  cell.f = remapFormulaRows(cell.f, sheetName, sheetName, rowMap_1);
+                  cell.f = (0, _fortuneCore.remapFormulaReferencesByMap)(cell.f, sheetName, sheetName, {
+                    rowMap: rowMap_1
+                  });
                 }
               }
             });

package/lib/components/SheetOverlay/formula-segment-boundary.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isFormulaSegmentBoundaryKey = isFormulaSegmentBoundaryKey;
-var FORMULA_SEGMENT_BOUNDARY_KEYS = new Set([",", "+", "-", "*", "/", "%", "^", "&"]);
+var FORMULA_SEGMENT_BOUNDARY_KEYS = new Set([",", "+", "-", "*", "/", "%", "^", "&", ">", "<", ")"]);
 function isFormulaSegmentBoundaryKey(key) {
   return FORMULA_SEGMENT_BOUNDARY_KEYS.has(key);
 }

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

@@ -1,6 +1,13 @@
 export declare function moveCursorToEnd(editableDiv: HTMLDivElement): void;
 export declare function getCursorPosition(editableDiv: HTMLDivElement): number;
+export declare function getSelectionOffsets(editableDiv: HTMLDivElement): {
+    start: number;
+    end: number;
+};
+export declare function isEditorUndoRedoKeyEvent(e: KeyboardEvent): boolean;
+export declare function shouldUseCustomEditorHistory(editorInnerTextTrimmed: string, historyActive: boolean): boolean;
 export declare function setCursorPosition(editableDiv: HTMLDivElement, targetOffset: number): void;
+export declare function setSelectionOffsets(editableDiv: HTMLDivElement, startOffset: number, endOffset: number): void;
 export declare function buildFormulaSuggestionText(editableDiv: HTMLDivElement, formulaName: string): {
     text: string;
     caretOffset: number;