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

package/es/components/FxEditor/index.js

@@ -12,7 +12,7 @@ import usePrevious from "../../hooks/usePrevious";
 import { useFormulaEditorHistory } from "../../hooks/useFormulaEditorHistory";
 import { useRerenderOnFormulaCaret } from "../../hooks/useRerenderOnFormulaCaret";
 import { LucideIcon } from "../SheetOverlay/LucideIcon";
-import { countCommasBeforeCursor, getCursorPosition, getFunctionNameFromFormulaCaretSpans, isLetterNumberPattern, setCursorPosition, buildFormulaSuggestionText, shouldShowFormulaFunctionList } from "../SheetOverlay/helper";
+import { countCommasBeforeCursor, getCursorPosition, getFunctionNameFromFormulaCaretSpans, isEditorUndoRedoKeyEvent, isLetterNumberPattern, setCursorPosition, buildFormulaSuggestionText, shouldShowFormulaFunctionList } from "../SheetOverlay/helper";
 import { isFormulaSegmentBoundaryKey } from "../SheetOverlay/formula-segment-boundary";
 var FxEditor = function FxEditor() {
   var _a, _b, _c;
@@ -32,12 +32,11 @@ var FxEditor = function FxEditor() {
     refs = _g.refs;
   var lastKeyDownEventRef = useRef(null);
   var _h = 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 = useRef(null);
   var _j = useState(false),
     isHidenRC = _j[0],
@@ -279,7 +278,20 @@ var FxEditor = function FxEditor() {
     var currentCommaCount = countCommasBeforeCursor((_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current);
     setCommaCount(currentCommaCount);
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
-    capturePreFormulaState();
+    if (!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 (getFormulaEditorOwner(context) !== "fx") return;
+          appendEditorHistoryFromPrimaryEditor(function () {
+            return 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()) || "";
@@ -331,14 +343,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;
       }
     }
@@ -431,7 +449,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];
@@ -488,17 +506,23 @@ var FxEditor = function FxEditor() {
       }
       return;
     }
+    if (isEditorUndoRedoKeyEvent(e)) {
+      return;
+    }
     var kcode = e.keyCode;
     if (!kcode) return;
-    appendFormulaHistoryFromPrimaryEditor(function () {
-      return 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) {
         handleFormulaInput(draftCtx, refs.cellInput.current, refs.fxInput.current, kcode, recentText.current);
       });
     }
-  }, [appendFormulaHistoryFromPrimaryEditor, context.isFlvReadOnly, context.luckysheetCellUpdate, refs.cellInput, refs.fxInput, setContext]);
+    requestAnimationFrame(function () {
+      if (getFormulaEditorOwner(context) !== "fx") return;
+      appendEditorHistoryFromPrimaryEditor(function () {
+        return getCursorPosition(refs.fxInput.current);
+      });
+    });
+  }, [appendEditorHistoryFromPrimaryEditor, context.isFlvReadOnly, context.luckysheetCellUpdate, refs.cellInput, refs.fxInput, setContext]);
   useRerenderOnFormulaCaret(refs.fxInput, context.luckysheetCellUpdate.length > 0);
   var getFunctionNameFromInput = useCallback(function () {
     var _a, _b, _c, _d;

package/es/components/SheetOverlay/ContentEditable.js

@@ -41,10 +41,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/es/components/SheetOverlay/InputBox.js

@@ -19,7 +19,7 @@ import FormulaHint from "./FormulaHint";
 import usePrevious from "../../hooks/usePrevious";
 import { useFormulaEditorHistory } from "../../hooks/useFormulaEditorHistory";
 import { useRerenderOnFormulaCaret } from "../../hooks/useRerenderOnFormulaCaret";
-import { moveCursorToEnd, getCursorPosition, setCursorPosition, buildFormulaSuggestionText, getFunctionNameFromFormulaCaretSpans, isLetterNumberPattern, countCommasBeforeCursor, shouldShowFormulaFunctionList } from "./helper";
+import { moveCursorToEnd, getCursorPosition, setCursorPosition, buildFormulaSuggestionText, getFunctionNameFromFormulaCaretSpans, isLetterNumberPattern, countCommasBeforeCursor, shouldShowFormulaFunctionList, isEditorUndoRedoKeyEvent } from "./helper";
 import { isFormulaSegmentBoundaryKey } from "./formula-segment-boundary";
 import { LucideIcon } from "./LucideIcon";
 var InputBox = function InputBox() {
@@ -78,12 +78,11 @@ var InputBox = function InputBox() {
   var skipNextAnchorSelectionSyncRef = useRef(false);
   var lastHandledMouseDragSignatureRef = useRef("");
   var _2 = 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;
+    capturePreEditorHistoryState = _2.capturePreEditorHistoryState,
+    appendEditorHistoryFromPrimaryEditor = _2.appendEditorHistoryFromPrimaryEditor;
   var ZWSP = "\u200B";
   var inputBoxInnerRef = useRef(null);
   var _3 = useState([]),
@@ -405,12 +404,25 @@ var InputBox = function InputBox() {
     });
   }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = useCallback(function (e) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
     setContext(function (draftCtx) {
       setFormulaEditorOwner(draftCtx, "cell");
     });
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
-    capturePreFormulaState();
+    if (!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 (getFormulaEditorOwner(context) !== "cell") return;
+          appendEditorHistoryFromPrimaryEditor(function () {
+            return 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) {
@@ -427,9 +439,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) {
@@ -455,39 +467,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 : "";
         handleBold(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return 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 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 : "";
         handleItalic(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return 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 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 : "";
         handleUnderline(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return 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 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 : "";
         handleStrikeThrough(context, inputRef.current);
-        appendFormulaHistoryFromPrimaryEditor(function () {
-          return 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 getCursorPosition(inputRef.current);
+              });
+              return;
+            }
+            _pushFormattingSnapshot_4(triesLeft - 1);
+          });
+        };
+        _pushFormattingSnapshot_4(2);
         stopPropagation(e);
       }
     }
@@ -497,7 +563,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) {
@@ -586,7 +652,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];
@@ -628,11 +694,11 @@ var InputBox = function InputBox() {
       }
       return;
     }
+    if (isEditorUndoRedoKeyEvent(e)) {
+      return;
+    }
     var kcode = e.keyCode;
     if (!kcode) return;
-    appendFormulaHistoryFromPrimaryEditor(function () {
-      return 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;
@@ -647,7 +713,13 @@ var InputBox = function InputBox() {
         }
       });
     }
-  }, [refs.cellInput, refs.fxInput, setContext, appendFormulaHistoryFromPrimaryEditor]);
+    requestAnimationFrame(function () {
+      if (getFormulaEditorOwner(context) !== "cell") return;
+      appendEditorHistoryFromPrimaryEditor(function () {
+        return getCursorPosition(inputRef.current);
+      });
+    });
+  }, [refs.cellInput, refs.fxInput, setContext, appendEditorHistoryFromPrimaryEditor]);
   var onPaste = useCallback(function (e) {
     var plainText = e.clipboardData.getData("text/plain");
     e.preventDefault();

package/es/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;

package/es/components/SheetOverlay/helper.js

@@ -18,6 +18,44 @@ export function getCursorPosition(editableDiv) {
   preRange.setEnd(range.endContainer, range.endOffset);
   return preRange.toString().length;
 }
+export function getSelectionOffsets(editableDiv) {
+  var selection = window.getSelection();
+  if (!selection || selection.rangeCount === 0) {
+    var caret = getCursorPosition(editableDiv);
+    return {
+      start: caret,
+      end: caret
+    };
+  }
+  var range = selection.getRangeAt(0);
+  if (!editableDiv.contains(range.startContainer) || !editableDiv.contains(range.endContainer)) {
+    var caret = getCursorPosition(editableDiv);
+    return {
+      start: caret,
+      end: caret
+    };
+  }
+  var startRange = range.cloneRange();
+  startRange.selectNodeContents(editableDiv);
+  startRange.setEnd(range.startContainer, range.startOffset);
+  var start = startRange.toString().length;
+  var endRange = range.cloneRange();
+  endRange.selectNodeContents(editableDiv);
+  endRange.setEnd(range.endContainer, range.endOffset);
+  var end = endRange.toString().length;
+  return {
+    start: Math.max(0, Math.min(start, end)),
+    end: Math.max(start, end)
+  };
+}
+export function isEditorUndoRedoKeyEvent(e) {
+  if (!e.metaKey && !e.ctrlKey) return false;
+  if (e.code === "KeyZ" || e.code === "KeyY") return true;
+  return e.keyCode === 90 || e.keyCode === 89;
+}
+export function shouldUseCustomEditorHistory(editorInnerTextTrimmed, historyActive) {
+  return historyActive || editorInnerTextTrimmed.length > 0;
+}
 export function setCursorPosition(editableDiv, targetOffset) {
   var _a, _b;
   editableDiv.focus();
@@ -44,6 +82,43 @@ export function setCursorPosition(editableDiv, targetOffset) {
   selection.removeAllRanges();
   selection.addRange(range);
 }
+export function setSelectionOffsets(editableDiv, startOffset, endOffset) {
+  editableDiv.focus();
+  var selection = window.getSelection();
+  if (!selection) return;
+  var startTarget = Math.max(0, Math.min(startOffset, endOffset));
+  var endTarget = Math.max(startTarget, endOffset);
+  var walker = document.createTreeWalker(editableDiv, NodeFilter.SHOW_TEXT);
+  var resolve = function resolve(target) {
+    var _a, _b;
+    var remaining = target;
+    var node = walker.nextNode();
+    while (node) {
+      var len = (_b = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+      if (remaining <= len) return {
+        node: node,
+        offset: remaining
+      };
+      remaining -= len;
+      node = walker.nextNode();
+    }
+    return null;
+  };
+  walker.currentNode = editableDiv;
+  var startPos = resolve(startTarget);
+  walker.currentNode = editableDiv;
+  var endPos = resolve(endTarget);
+  var range = document.createRange();
+  if (startPos && endPos) {
+    range.setStart(startPos.node, startPos.offset);
+    range.setEnd(endPos.node, endPos.offset);
+  } else {
+    range.selectNodeContents(editableDiv);
+    range.collapse(false);
+  }
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
 export function buildFormulaSuggestionText(editableDiv, formulaName) {
   var fullText = editableDiv.innerText || "";
   var selection = window.getSelection();

package/es/components/Toolbar/ColorPicker.js

@@ -12,8 +12,9 @@ var ColorPicker = function ColorPicker(_a) {
       return /*#__PURE__*/React.createElement("div", {
         key: c,
         className: "fortune-toolbar-color-picker-item",
-        onClick: function onClick() {
-          return onPick(c);
+        onMouseDown: function onMouseDown(e) {
+          e.preventDefault();
+          onPick(c);
         },
         tabIndex: 0,
         style: {

package/es/components/Toolbar/CustomColor.js

@@ -6,11 +6,15 @@ export var CustomColor = function CustomColor(_a) {
   var onCustomPick = _a.onCustomPick,
     onColorPick = _a.onColorPick;
   return /*#__PURE__*/React.createElement("div", {
-    id: "fortune-custom-color"
+    id: "fortune-custom-color",
+    onMouseDown: function onMouseDown(e) {
+      e.preventDefault();
+    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "color-reset",
-    onClick: function onClick() {
-      return onCustomPick(undefined);
+    onMouseDown: function onMouseDown(e) {
+      e.preventDefault();
+      onCustomPick(undefined);
     },
     tabIndex: 0
   }, /*#__PURE__*/React.createElement(SVGIcon, {

package/es/components/Toolbar/index.js

@@ -123,7 +123,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 import React, { useContext, useCallback, useRef, useEffect, useState } from "react";
-import { toolbarItemClickHandler, handleTextBackground, handleTextColor, handleTextSize, normalizedCellAttr, getFlowdata, newComment, editComment, deleteComment, showHideComment, showHideAllComments, autoSelectionFormula, handleSum, locale, handleMerge, handleBorder, toolbarItemSelectedFunc, handleFreeze, insertImage, showImgChooser, updateFormat, handleSort, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, createFilter, clearFilter, applyLocation, insertDuneChart, api, getSheetIndex, is_date } from "@fileverse-dev/fortune-core";
+import { toolbarItemClickHandler, handleTextBackground, handleTextColor, handleTextSize, normalizedCellAttr, getFlowdata, newComment, editComment, deleteComment, showHideComment, showHideAllComments, autoSelectionFormula, handleSum, locale, handleMerge, handleBorder, toolbarItemSelectedFunc, handleFreeze, insertImage, showImgChooser, updateFormat, handleSort, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, createFilter, clearFilter, applyLocation, insertDuneChart, getFormulaEditorOwner, api, getSheetIndex, is_date } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import { IconButton, LucideIcon, Tooltip, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from "@fileverse/ui";
 import DataVerificationPortal from "./dataVerificationPortal";
@@ -463,6 +463,14 @@ var Toolbar = function Toolbar(_a) {
     settings = _f.settings,
     handleUndo = _f.handleUndo,
     handleRedo = _f.handleRedo;
+  var restoreEditorFocusAfterToolbarAction = useCallback(function () {
+    if (context.luckysheetCellUpdate.length === 0) return;
+    requestAnimationFrame(function () {
+      var owner = getFormulaEditorOwner(context);
+      var target = owner === "fx" ? refs.fxInput.current : refs.cellInput.current;
+      target === null || target === void 0 ? void 0 : target.focus();
+    });
+  }, [context, refs.cellInput, refs.fxInput]);
   var contextRef = useRef(context);
   var containerRef = useRef(null);
   var _g = useState(-1),
@@ -1712,7 +1720,8 @@ var Toolbar = function Toolbar(_a) {
   return /*#__PURE__*/React.createElement("div", {
     ref: containerRef,
     className: "fortune-toolbar",
-    "aria-label": toolbar.toolbar
+    "aria-label": toolbar.toolbar,
+    onMouseUpCapture: restoreEditorFocusAfterToolbarAction
   }, /*#__PURE__*/React.createElement(DataVerificationPortal, {
     visible: showDataValidation
   }), /*#__PURE__*/React.createElement(ConditionalFormatPortal, {

package/es/hooks/useFormulaEditorHistory.d.ts

@@ -2,22 +2,22 @@ import { type RefObject } from "react";
 import { type Context } from "@fileverse-dev/fortune-core";
 import type { SetContextOptions } from "../context";
 export type FormulaHistoryEntry = {
-    text: string;
+    html: 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): {
+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;
+    capturePreEditorHistoryState: () => void;
+    appendEditorHistoryFromPrimaryEditor: (getCaret: () => number) => void;
     capturePreFormulaState: () => void;
     appendFormulaHistoryFromPrimaryEditor: (getCaret: () => number) => void;
 };