@fileverse-dev/fortune-react 1.3.12-mixed-a → 1.3.13-create-1

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

@@ -8,16 +8,35 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 import { useContext, useRef } from "react";
-import { fixPositionOnFrozenCells, getSheetIndex, getFlowdata, colLocation, colLocationByIndex, updateContextWithSheetData, api } from "@fileverse-dev/fortune-core";
+import { fixPositionOnFrozenCells, getSheetIndex, getFlowdata, colLocation, colLocationByIndex, updateContextWithSheetData, api, indexToColumnChar, columnCharToIndex } from "@fileverse-dev/fortune-core";
 import WorkbookContext from "../../../context";
-export function numberToColumnName(num) {
-  var columnName = "";
-  while (num >= 0) {
-    var remainder = num % 26;
-    columnName = String.fromCharCode(65 + remainder) + columnName;
-    num = Math.floor(num / 26) - 1;
+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 columnName;
+  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 = columnCharToIndex(col0);
+    var mapped0 = colMap[colIdx0];
+    var nextCol0 = mapped0 == null ? col0 : indexToColumnChar(mapped0);
+    if (!col1) {
+      return "".concat(sheetPrefix || "").concat(colAbs0).concat(nextCol0).concat(rowAbs0).concat(row0);
+    }
+    var colIdx1 = columnCharToIndex(col1);
+    var mapped1 = colMap[colIdx1];
+    var nextCol1 = mapped1 == null ? col1 : indexToColumnChar(mapped1);
+    return "".concat(sheetPrefix || "").concat(colAbs0).concat(nextCol0).concat(rowAbs0).concat(row0, ":").concat(colAbs1).concat(nextCol1).concat(rowAbs1).concat(row1);
+  });
+}
+export function numberToColumnName(num) {
+  return indexToColumnChar(num);
 }
 export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, selectedLocationRef) {
   var DOUBLE_CLICK_MS = 300;
@@ -258,62 +277,29 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
           d === null || d === void 0 ? void 0 : d.forEach(function (row) {
             row.forEach(function (cell) {
               if (cell) {
-                var otherAffectedCols_1 = [];
+                var colMap_1 = {};
                 if (sourceIndex_1 < targetIndex) {
                   var start = selectedSourceCol === null || selectedSourceCol === void 0 ? void 0 : selectedSourceCol[selectedSourceCol.length - 1];
                   var last = selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[selectedTargetCol.length - 1];
                   for (var c = start + 1; c <= last; c += 1) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(c - selectedSourceCol.length)
-                    });
+                    colMap_1[c] = c - selectedSourceCol.length;
                   }
                   selectedSourceCol.forEach(function (c, index) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(selectedTargetCol[index])
-                    });
+                    colMap_1[c] = selectedTargetCol[index];
                   });
                 } else if (sourceIndex_1 > targetIndex) {
                   var start = selectedTargetCol === null || selectedTargetCol === void 0 ? void 0 : selectedTargetCol[0];
                   var last = selectedSourceCol === null || selectedSourceCol === void 0 ? void 0 : selectedSourceCol[0];
                   for (var c = start; c < last; c += 1) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(c + selectedSourceCol.length)
-                    });
+                    colMap_1[c] = c + selectedSourceCol.length;
                   }
                   selectedSourceCol.forEach(function (c, index) {
-                    otherAffectedCols_1.push({
-                      source: numberToColumnName(c),
-                      target: numberToColumnName(selectedTargetCol[index])
-                    });
+                    colMap_1[c] = selectedTargetCol[index];
                   });
                 }
                 if (cell.f) {
-                  var formula_1 = cell.f;
-                  var replacements_1 = [];
-                  otherAffectedCols_1.forEach(function (col) {
-                    var regex = new RegExp("\\b".concat(col.source, "(\\d+)\\b"), "g");
-                    var match;
-                    while ((match = regex.exec(formula_1)) !== null) {
-                      if (/^\d+$/.test(match[1])) {
-                        replacements_1.push({
-                          start: match.index,
-                          end: match.index + match[0].length,
-                          original: match[0],
-                          replacement: "".concat(col.target).concat(match[1])
-                        });
-                      }
-                    }
-                  });
-                  replacements_1 === null || replacements_1 === void 0 ? void 0 : replacements_1.sort(function (a, b) {
-                    return b.start - a.start;
-                  });
-                  replacements_1 === null || replacements_1 === void 0 ? void 0 : replacements_1.forEach(function (rep) {
-                    formula_1 = formula_1.substring(0, rep.start) + rep.replacement + formula_1.substring(rep.end);
-                  });
-                  cell.f = formula_1;
+                  var sheetName = _sheet.name || "";
+                  cell.f = remapFormulaCols(cell.f, sheetName, sheetName, colMap_1);
                 }
               }
             });

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

@@ -10,6 +10,29 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 import { useContext, useRef } from "react";
 import { fixPositionOnFrozenCells, getSheetIndex, rowLocation, getFlowdata, rowLocationByIndex, updateContextWithSheetData, api } from "@fileverse-dev/fortune-core";
 import WorkbookContext from "../../../context";
+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);
+  });
+}
 export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selectedLocationRef) {
   var DOUBLE_MS = 300;
   var START_DRAG_THRESHOLD_PX = 6;
@@ -248,62 +271,29 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
           d === null || d === void 0 ? void 0 : d.forEach(function (row) {
             row.forEach(function (cell) {
               if (cell) {
-                var otherAffectedRows_1 = [];
+                var rowMap_1 = {};
                 if (sourceIndex_1 < targetIndex) {
                   var start = selectedSourceRow === null || selectedSourceRow === void 0 ? void 0 : selectedSourceRow[selectedSourceRow.length - 1];
                   var last = selectedTargetRow === null || selectedTargetRow === void 0 ? void 0 : selectedTargetRow[selectedTargetRow.length - 1];
                   for (var c = start + 1; c < last; c += 1) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: c - selectedSourceRow.length
-                    });
+                    rowMap_1[c] = c - selectedSourceRow.length;
                   }
                   selectedSourceRow.forEach(function (c, index) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: selectedTargetRow[index]
-                    });
+                    rowMap_1[c] = selectedTargetRow[index];
                   });
                 } else {
                   var start = selectedTargetRow === null || selectedTargetRow === void 0 ? void 0 : selectedTargetRow[0];
                   var last = selectedSourceRow === null || selectedSourceRow === void 0 ? void 0 : selectedSourceRow[0];
                   for (var c = start; c < last; c += 1) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: c + +selectedSourceRow.length
-                    });
+                    rowMap_1[c] = c + selectedSourceRow.length;
                   }
                   selectedSourceRow.forEach(function (c, index) {
-                    otherAffectedRows_1.push({
-                      source: c,
-                      target: selectedTargetRow[index]
-                    });
+                    rowMap_1[c] = selectedTargetRow[index];
                   });
                 }
                 if (cell.f) {
-                  var formula_1 = cell.f;
-                  var replacements_1 = [];
-                  otherAffectedRows_1.forEach(function (_a) {
-                    var source = _a.source,
-                      target = _a.target;
-                    var regex = new RegExp("\\b([A-Z]+)".concat(source, "\\b"), "g");
-                    var match;
-                    while ((match = regex.exec(formula_1)) !== null) {
-                      replacements_1.push({
-                        start: match.index,
-                        end: match.index + match[0].length,
-                        original: match[0],
-                        replacement: "".concat(match[1]).concat(target)
-                      });
-                    }
-                  });
-                  replacements_1.sort(function (a, b) {
-                    return b.start - a.start;
-                  });
-                  replacements_1.forEach(function (rep) {
-                    formula_1 = formula_1.substring(0, rep.start) + rep.replacement + formula_1.substring(rep.end);
-                  });
-                  cell.f = formula_1;
+                  var sheetName = _sheet.name || "";
+                  cell.f = remapFormulaRows(cell.f, sheetName, sheetName, rowMap_1);
                 }
               }
             });
@@ -355,7 +345,7 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
           }
           (_d = _sheet.calcChain) === null || _d === void 0 ? void 0 : _d.forEach(function (item) {
             if (selectedSourceRow.includes(item.r)) {
-              var index = selectedSourceRow.indexOf(item.c);
+              var index = selectedSourceRow.indexOf(item.r);
               item.r = selectedTargetRow[index];
             } else if (item.r > sourceIndex_1 && item.r < targetIndex) {
               item.r -= selectedSourceRow.length;

package/es/components/SheetOverlay/formula-segment-boundary.d.ts

@@ -0,0 +1 @@
+export declare function isFormulaSegmentBoundaryKey(key: string): boolean;

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

@@ -0,0 +1,4 @@
+var FORMULA_SEGMENT_BOUNDARY_KEYS = new Set([",", "+", "-", "*", "/", "%", "^", "&"]);
+export function isFormulaSegmentBoundaryKey(key) {
+  return FORMULA_SEGMENT_BOUNDARY_KEYS.has(key);
+}

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 setCursorPosition(editableDiv: HTMLDivElement, targetOffset: number): void;
+export declare function buildFormulaSuggestionText(editableDiv: HTMLDivElement, formulaName: string): {
+    text: string;
+    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/es/components/SheetOverlay/helper.js

@@ -18,10 +18,105 @@ export function getCursorPosition(editableDiv) {
   preRange.setEnd(range.endContainer, range.endOffset);
   return preRange.toString().length;
 }
+export function setCursorPosition(editableDiv, targetOffset) {
+  var _a, _b;
+  editableDiv.focus();
+  var selection = window.getSelection();
+  if (!selection) return;
+  var range = document.createRange();
+  var walker = document.createTreeWalker(editableDiv, NodeFilter.SHOW_TEXT);
+  var remaining = Math.max(0, targetOffset);
+  var node = walker.nextNode();
+  while (node) {
+    var textLength = (_b = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+    if (remaining <= textLength) {
+      range.setStart(node, remaining);
+      range.collapse(true);
+      selection.removeAllRanges();
+      selection.addRange(range);
+      return;
+    }
+    remaining -= textLength;
+    node = walker.nextNode();
+  }
+  range.selectNodeContents(editableDiv);
+  range.collapse(false);
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
+export function buildFormulaSuggestionText(editableDiv, formulaName) {
+  var fullText = editableDiv.innerText || "";
+  var selection = window.getSelection();
+  var selectionInEditor = !!(selection === null || selection === void 0 ? void 0 : selection.rangeCount) && editableDiv.contains(selection.getRangeAt(0).startContainer);
+  var caretOffset = selectionInEditor ? getCursorPosition(editableDiv) : fullText.length;
+  var safeCaretOffset = Math.max(0, Math.min(caretOffset, fullText.length));
+  var beforeCaret = fullText.slice(0, safeCaretOffset);
+  var afterCaret = fullText.slice(safeCaretOffset);
+  var replaceStart = safeCaretOffset;
+  var tokenMatch = beforeCaret.match(/[A-Za-z_][A-Za-z0-9_]*$/);
+  if (tokenMatch) {
+    var token = tokenMatch[0];
+    var tokenStart = safeCaretOffset - token.length;
+    var charBeforeToken = tokenStart > 0 ? beforeCaret[tokenStart - 1] : "";
+    if (tokenStart === 0 || /[\s=(,+\-*/&^<>]$/.test(charBeforeToken)) {
+      replaceStart = tokenStart;
+    }
+  }
+  var shouldAddOpeningParen = !afterCaret.startsWith("(");
+  var insertedText = "".concat(formulaName).concat(shouldAddOpeningParen ? "(" : "");
+  var nextText = fullText.slice(0, replaceStart) + insertedText + afterCaret;
+  return {
+    text: nextText,
+    caretOffset: replaceStart + insertedText.length
+  };
+}
 export function isLetterNumberPattern(str) {
   var regex = /^[a-zA-Z]+\d+$/;
   return regex.test(str);
 }
+export 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";
+export 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;
+}
 export function removeLastSpan(htmlString) {
   var container = document.createElement("div");
   container.innerHTML = htmlString;

package/es/components/SheetOverlay/index.css

@@ -336,9 +336,9 @@
   overflow: hidden;
   white-space: pre-wrap;
   outline: none;
-  -webkit-box-shadow: 0 2px 5px rgb(0 0 0 / 40%);
-  -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.4);
-  box-shadow: 0 2px 5px rgb(0 0 0 / 40%);
+  /* -webkit-box-shadow: 0 2px 5px rgb(0 0 0 / 40%);
+  -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.4); */
+  /* box-shadow: 0 2px 5px rgb(0 0 0 / 40%); */
   word-wrap: break-word;
   background-color: rgb(255, 255, 255);
   font-size: 13px;
@@ -356,7 +356,7 @@
 }
 
 .luckysheet-formula-text-color {
-  color: black;
+  color: darkred;
 }
 
 .luckysheet-formula-text-string {
@@ -801,50 +801,11 @@
 }
 
 .fortune-formula-functionrange-highlight .fortune-selection-copy-hc {
-  border: 2px solid #5e5e5e;
-  opacity: 0.03;
+  border-width: 2px;
+  border-style: dotted;
   z-index: initial;
 }
 
-.fortune-selection-highlight-lt {
-  left: -3px;
-  top: -3px;
-  cursor: se-resize;
-}
-
-.fortune-selection-highlight-rt {
-  right: -3px;
-  top: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-lb {
-  left: -3px;
-  bottom: -3px;
-  cursor: ne-resize;
-}
-
-.fortune-selection-highlight-rb {
-  right: -3px;
-  bottom: -3px;
-  cursor: se-resize;
-}
-
-/* FLV: show blue dashed border for active selection while in edit mode */
-.luckysheet-cell-selected-edit-mode .luckysheet-cs-inner-border {
-  border: 2px dashed #12a5ff;
-  border-radius: 1px;
-}
-
-.fortune-formula-functionrange-highlight .luckysheet-highlight {
-  position: absolute;
-  z-index: 19;
-  border: 1px solid #fff;
-  background: #0188fb;
-  width: 6px;
-  height: 6px;
-}
-
 .fortune-presence-username {
   position: absolute;
   padding-left: 6px;

package/es/components/SheetOverlay/index.js

@@ -10,7 +10,7 @@ var __assign = this && this.__assign || function () {
 };
 import React, { useContext, useCallback, useRef, useEffect, useLayoutEffect, useMemo } from "react";
 import "./index.css";
-import { locale, drawArrow, handleCellAreaDoubleClick, handleCellAreaMouseDown, handleContextMenu, handleOverlayMouseMove, handleOverlayMouseUp, selectAll, handleOverlayTouchEnd, handleOverlayTouchStart, createDropCellRange, getCellRowColumn, getCellHyperlink, showLinkCard, isAllowEdit, onCellsMoveStart, insertRowCol, getSheetIndex, fixRowStyleOverflowInFreeze, fixColumnStyleOverflowInFreeze, handleKeydownForZoom } from "@fileverse-dev/fortune-core";
+import { locale, drawArrow, handleCellAreaDoubleClick, handleCellAreaMouseDown, handleContextMenu, handleOverlayMouseMove, handleOverlayMouseUp, selectAll, handleOverlayTouchEnd, handleOverlayTouchStart, createDropCellRange, getCellRowColumn, getCellHyperlink, showLinkCard, isAllowEdit, israngeseleciton, onCellsMoveStart, insertRowCol, getSheetIndex, fixRowStyleOverflowInFreeze, fixColumnStyleOverflowInFreeze, handleKeydownForZoom } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import WorkbookContext from "../../context";
 import ColumnHeader from "./ColumnHeader";
@@ -28,6 +28,22 @@ import { useDialog } from "../../hooks/useDialog";
 import DropDownList from "../DataVerification/DropdownList";
 import IframeBoxs from "../IFrameBoxs/iFrameBoxs";
 import ErrorBoxes from "../ErrorState";
+function formulaRangeHighlightHcStyle(hex) {
+  var h = hex.replace("#", "");
+  if (h.length !== 6) {
+    return {
+      backgroundColor: hex,
+      borderColor: hex
+    };
+  }
+  var r = parseInt(h.slice(0, 2), 16);
+  var g = parseInt(h.slice(2, 4), 16);
+  var b = parseInt(h.slice(4, 6), 16);
+  return {
+    backgroundColor: "rgba(".concat(r, ",").concat(g, ",").concat(b, ",0.08)"),
+    borderColor: hex
+  };
+}
 var SheetOverlay = function SheetOverlay() {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var _o = useContext(WorkbookContext),
@@ -49,6 +65,7 @@ var SheetOverlay = function SheetOverlay() {
       setContext(function (draftCtx) {
         var _a;
         handleCellAreaMouseDown(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, refs.cellArea.current, refs.fxInput.current, refs.canvas.current.getContext("2d"));
+        var keepFormulaBarFocused = draftCtx.luckysheetCellUpdate.length > 0 && draftCtx.formulaCache.formulaEditorOwner === "fx" && (draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start || israngeseleciton(draftCtx));
         if (!_.isEmpty((_a = draftCtx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) && refs.cellInput.current) {
           if (!isAllowEdit(draftCtx)) {
             setTimeout(function () {
@@ -60,7 +77,13 @@ var SheetOverlay = function SheetOverlay() {
           } else {
             setTimeout(function () {
               var _a;
-              (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
+              if (keepFormulaBarFocused && refs.fxInput.current) {
+                refs.fxInput.current.focus({
+                  preventScroll: true
+                });
+              } else {
+                (_a = refs.cellInput.current) === null || _a === void 0 ? void 0 : _a.focus();
+              }
             });
           }
         }
@@ -290,18 +313,7 @@ var SheetOverlay = function SheetOverlay() {
       });
     }), /*#__PURE__*/React.createElement("div", {
       className: "fortune-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
-      }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "fortune-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
+      style: formulaRangeHighlightHcStyle(backgroundColor)
     }));
   }), /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",

package/es/components/Workbook/index.js

@@ -363,7 +363,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     var history = globalCache.current.undoList.pop();
     if (history) {
       setContext(function (ctx_) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         var isBorderUndo = history.patches.some(function (onePatch) {
           var _a;
           return (_a = onePatch.value) === null || _a === void 0 ? void 0 : _a.borderInfo;
@@ -398,18 +398,15 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
           };
           inversedOptions.addSheet.value.celldata = dataToCelldata((_e = inversedOptions.addSheet.value) === null || _e === void 0 ? void 0 : _e.data);
           delete inversedOptions.addSheet.value.data;
-          if ((_f = ctx_.hooks) === null || _f === void 0 ? void 0 : _f.afterOrderChanges) {
-            ctx_.hooks.afterOrderChanges();
-          }
         }
         emitOp(newContext, history.inversePatches, inversedOptions, true);
         emitYjsFromPatches(ctx_, newContext, history.inversePatches);
         var sheetIdxAfterUndo = getSheetIndex(newContext, newContext.currentSheetId);
-        var nw = __assign(__assign({}, newContext), sheetIdxAfterUndo != null && ((_g = newContext.luckysheetfile[sheetIdxAfterUndo]) === null || _g === void 0 ? void 0 : _g.config) != null ? {
+        var nw = __assign(__assign({}, newContext), sheetIdxAfterUndo != null && ((_f = newContext.luckysheetfile[sheetIdxAfterUndo]) === null || _f === void 0 ? void 0 : _f.config) != null ? {
           config: newContext.luckysheetfile[sheetIdxAfterUndo].config
         } : {});
         if (isBorderUndo) {
-          var nwborderlist = (_j = (_h = nw === null || nw === void 0 ? void 0 : nw.config) === null || _h === void 0 ? void 0 : _h.borderInfo) === null || _j === void 0 ? void 0 : _j.slice(0, -1);
+          var nwborderlist = (_h = (_g = nw === null || nw === void 0 ? void 0 : nw.config) === null || _g === void 0 ? void 0 : _g.borderInfo) === null || _h === void 0 ? void 0 : _h.slice(0, -1);
           nw = __assign(__assign({}, nw), {
             config: __assign(__assign({}, nw.config), {
               borderInfo: nwborderlist
@@ -887,7 +884,7 @@ var Workbook = /*#__PURE__*/React.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 +893,7 @@ var Workbook = /*#__PURE__*/React.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/es/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 {};