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

package/es/components/FxEditor/index.js

@@ -501,6 +501,13 @@ var FxEditor = function FxEditor() {
       if (editor_1) {
         setContext(function (draftCtx) {
           if (!isAllowEdit(draftCtx, draftCtx.luckysheet_select_save)) return;
+          if (getFormulaEditorOwner(draftCtx) !== "fx") return;
+          if (draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start) {
+            rangeHightlightselected(draftCtx, editor_1);
+            return;
+          }
+          draftCtx.formulaCache.selectingRangeIndex = -1;
+          createRangeHightlight(draftCtx, editor_1.innerHTML);
           rangeHightlightselected(draftCtx, editor_1);
         });
       }
@@ -523,7 +530,26 @@ var FxEditor = function FxEditor() {
       });
     });
   }, [appendEditorHistoryFromPrimaryEditor, context.isFlvReadOnly, context.luckysheetCellUpdate, refs.cellInput, refs.fxInput, setContext]);
-  useRerenderOnFormulaCaret(refs.fxInput, context.luckysheetCellUpdate.length > 0);
+  var refreshFxFormulaRangeHighlights = useCallback(function () {
+    var el = refs.fxInput.current;
+    if (!el) return;
+    setContext(function (draftCtx) {
+      var _a, _b;
+      if (draftCtx.luckysheetCellUpdate.length === 0) return;
+      if (getFormulaEditorOwner(draftCtx) !== "fx") return;
+      if (!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) {
+        rangeHightlightselected(draftCtx, el);
+        return;
+      }
+      draftCtx.formulaCache.selectingRangeIndex = -1;
+      createRangeHightlight(draftCtx, el.innerHTML);
+      rangeHightlightselected(draftCtx, el);
+    });
+  }, [refs.fxInput, setContext]);
+  useRerenderOnFormulaCaret(refs.fxInput, context.luckysheetCellUpdate.length > 0, refreshFxFormulaRangeHighlights);
   var getFunctionNameFromInput = 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) || "";
@@ -611,11 +637,16 @@ var FxEditor = function FxEditor() {
       var currentCommaCount = countCommasBeforeCursor(editor);
       setCommaCount(currentCommaCount);
       setContext(function (draftCtx) {
+        var _a;
         if (draftCtx.formulaCache.rangeSelectionActive !== true) return;
         var clickedInsideManagedRange = getFormulaRangeIndexAtCaret(editor) !== null;
         var atValidInsertionPoint = isCaretAtValidFormulaRangeInsertionPoint(editor);
         if (clickedInsideManagedRange || !atValidInsertionPoint) {
           markRangeSelectionDirty(draftCtx);
+          if ((_a = editor.innerText) === null || _a === void 0 ? void 0 : _a.trim().startsWith("=")) {
+            createRangeHightlight(draftCtx, editor.innerHTML);
+            rangeHightlightselected(draftCtx, editor);
+          }
         }
       });
     },

package/es/components/SheetOverlay/InputBox.js

@@ -22,6 +22,20 @@ import { useRerenderOnFormulaCaret } from "../../hooks/useRerenderOnFormulaCaret
 import { moveCursorToEnd, getCursorPosition, setCursorPosition, buildFormulaSuggestionText, getFunctionNameFromFormulaCaretSpans, isLetterNumberPattern, countCommasBeforeCursor, shouldShowFormulaFunctionList, isEditorUndoRedoKeyEvent } from "./helper";
 import { isFormulaSegmentBoundaryKey } from "./formula-segment-boundary";
 import { LucideIcon } from "./LucideIcon";
+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 = useContext(WorkbookContext),
@@ -71,23 +85,29 @@ var InputBox = function InputBox() {
   var _1 = useState(false),
     showSearchHint = _1[0],
     setShowSearchHint = _1[1];
+  var _2 = useState(0),
+    editorLayoutTick = _2[0],
+    setEditorLayoutTick = _2[1];
+  var _3 = 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 = useRef(false);
   var formulaAnchorCellRef = useRef(null);
   var skipNextAnchorSelectionSyncRef = useRef(false);
   var lastHandledMouseDragSignatureRef = useRef("");
-  var _2 = useFormulaEditorHistory(inputRef, refs.cellInput, refs.fxInput, setContext, "cell"),
-    preTextRef = _2.preTextRef,
-    resetFormulaHistory = _2.resetFormulaHistory,
-    handleFormulaHistoryUndoRedo = _2.handleFormulaHistoryUndoRedo,
-    capturePreEditorHistoryState = _2.capturePreEditorHistoryState,
-    appendEditorHistoryFromPrimaryEditor = _2.appendEditorHistoryFromPrimaryEditor;
+  var _4 = 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 = useRef(null);
-  var _3 = useState([]),
-    linkSelectionHighlightRects = _3[0],
-    setLinkSelectionHighlightRects = _3[1];
+  var _5 = useState([]),
+    linkSelectionHighlightRects = _5[0],
+    setLinkSelectionHighlightRects = _5[1];
   var ensureNotEmpty = function ensureNotEmpty() {
     var el = inputRef.current;
     if (!el) return;
@@ -740,6 +760,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 = 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();
+    moveCursorToEnd(editor);
+    setContext(function (draftCtx) {
+      setFormulaEditorOwner(draftCtx, "cell");
+    });
+  }, [edit, isHidenRC, context.luckysheetCellUpdate.length, refs.cellInput, setContext]);
   var getInputBoxPosition = useCallback(function () {
     var _a;
     if (!firstSelection || ((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show)) {
@@ -877,6 +910,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]);
+  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) {
@@ -884,7 +931,26 @@ var InputBox = function InputBox() {
     }
     return activeCell || cell;
   };
-  useRerenderOnFormulaCaret(inputRef, context.luckysheetCellUpdate.length > 0);
+  var refreshCellFormulaRangeHighlights = useCallback(function () {
+    var el = inputRef.current;
+    if (!el) return;
+    setContext(function (draftCtx) {
+      var _a, _b;
+      if (draftCtx.luckysheetCellUpdate.length === 0) return;
+      if (getFormulaEditorOwner(draftCtx) !== "cell") return;
+      if (!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) {
+        rangeHightlightselected(draftCtx, el);
+        return;
+      }
+      draftCtx.formulaCache.selectingRangeIndex = -1;
+      createRangeHightlight(draftCtx, el.innerHTML);
+      rangeHightlightselected(draftCtx, el);
+    });
+  }, [setContext]);
+  useRerenderOnFormulaCaret(inputRef, context.luckysheetCellUpdate.length > 0, refreshCellFormulaRangeHighlights);
   var getFunctionNameFromInput = 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) || "";
@@ -921,11 +987,14 @@ var InputBox = function InputBox() {
   }, wraperGetCell())), /*#__PURE__*/React.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.createElement(ContentEditable, {
@@ -942,6 +1011,9 @@ var InputBox = function InputBox() {
       }
       ensureNotEmpty();
       isComposingRef.current = false;
+      setEditorLayoutTick(function (t) {
+        return t + 1;
+      });
     },
     onMouseUp: function onMouseUp() {
       handleHideShowHint();
@@ -955,11 +1027,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 = getFormulaRangeIndexAtCaret(editor) !== null;
         var atValidInsertionPoint = isCaretAtValidFormulaRangeInsertionPoint(editor);
         if (clickedInsideManagedRange || !atValidInsertionPoint) {
           markRangeSelectionDirty(draftCtx);
+          if ((_a = editor.innerText) === null || _a === void 0 ? void 0 : _a.trim().startsWith("=")) {
+            createRangeHightlight(draftCtx, editor.innerHTML);
+            rangeHightlightselected(draftCtx, editor);
+          }
         }
       });
     },

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

@@ -8,33 +8,8 @@ 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, indexToColumnChar, columnCharToIndex } from "@fileverse-dev/fortune-core";
+import { fixPositionOnFrozenCells, getSheetIndex, getFlowdata, colLocation, colLocationByIndex, updateContextWithSheetData, api, indexToColumnChar, remapFormulaReferencesByMap } 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 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);
 }
@@ -299,7 +274,9 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
                 }
                 if (cell.f) {
                   var sheetName = _sheet.name || "";
-                  cell.f = remapFormulaCols(cell.f, sheetName, sheetName, colMap_1);
+                  cell.f = remapFormulaReferencesByMap(cell.f, sheetName, sheetName, {
+                    colMap: colMap_1
+                  });
                 }
               }
             });

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

@@ -8,31 +8,8 @@ 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, rowLocation, getFlowdata, rowLocationByIndex, updateContextWithSheetData, api } from "@fileverse-dev/fortune-core";
+import { fixPositionOnFrozenCells, getSheetIndex, rowLocation, getFlowdata, rowLocationByIndex, updateContextWithSheetData, api, remapFormulaReferencesByMap } 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;
@@ -293,7 +270,9 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
                 }
                 if (cell.f) {
                   var sheetName = _sheet.name || "";
-                  cell.f = remapFormulaRows(cell.f, sheetName, sheetName, rowMap_1);
+                  cell.f = remapFormulaReferencesByMap(cell.f, sheetName, sheetName, {
+                    rowMap: rowMap_1
+                  });
                 }
               }
             });

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

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

package/es/components/SheetOverlay/index.css

@@ -145,12 +145,6 @@
   margin: 0px 0 0 0px;
 }
 
-.fortune-selection-copy .fortune-copy {
-  position: absolute;
-  z-index: 18;
-  background-color: transparent;
-}
-
 .fortune-selection-copy-hc {
   position: absolute;
   top: 0;
@@ -330,7 +324,7 @@
   max-height: 9900px;
   max-width: 9900px;
   border: 2px #efc703 solid;
-  padding: 0 2px;
+  padding: 2px 2px;
   margin: 0;
   resize: none;
   overflow: hidden;
@@ -363,6 +357,14 @@
   color: forestgreen;
 }
 
+.luckysheet-formula-text-calc,
+.luckysheet-formula-text-lpar,
+.luckysheet-formula-text-comma,
+.luckysheet-formula-text-rpar {
+  padding-left: 2px;
+  padding-right: 2px;
+}
+
 .luckysheet-cell-flow {
   margin: 0;
   padding: 0;
@@ -647,50 +649,6 @@
   cursor: se-resize;
 }
 
-.fortune-selection-copy-top {
-  left: 0;
-  right: 0;
-  height: 2px;
-  top: 0;
-  background-position: bottom;
-  /* background-image: url("EwaAntH.gif"); */
-}
-
-.fortune-selection-copy-right {
-  top: 0;
-  bottom: 0;
-  width: 2px;
-  right: 0;
-  /* background-image: url("EwaAntV.gif"); */
-}
-
-.fortune-selection-copy-bottom {
-  left: 0;
-  right: 0;
-  height: 2px;
-  bottom: 0;
-  /* background-image: url("EwaAntH.gif"); */
-}
-
-.fortune-selection-copy-left {
-  top: 0;
-  bottom: 0;
-  width: 2px;
-  left: 0;
-  background-position: right;
-  /* background-image: url("EwaAntV.gif"); */
-}
-
-.fortune-selection-copy-hc {
-  position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  border: 2px dashed #12a5ff;
-  z-index: 8;
-}
-
 .luckysheet-modal-dialog-resize {
   position: absolute;
   border: 2px solid #0188fb;
@@ -765,39 +723,8 @@
   cursor: se-resize;
 }
 
-.fortune-formula-functionrange-highlight .fortune-copy {
-  background-image: none;
-  background: #0188fb;
-  position: absolute;
-  z-index: 18;
+.fortune-formula-functionrange-highlight {
   cursor: move;
-  opacity: 0.9;
-  box-sizing: content-box;
-  /*border: 1px solid #fff;*/
-}
-
-.fortune-formula-functionrange-highlight .fortune-selection-copy-top {
-  top: -2px;
-  border-top: 2px solid #fff;
-  border-bottom: 2px solid #fff;
-}
-
-.fortune-formula-functionrange-highlight .fortune-selection-copy-right {
-  right: -2px;
-  border-left: 2px solid #fff;
-  border-right: 2px solid #fff;
-}
-
-.fortune-formula-functionrange-highlight .fortune-selection-copy-bottom {
-  bottom: -2px;
-  border-top: 2px solid #fff;
-  border-bottom: 2px solid #fff;
-}
-
-.fortune-formula-functionrange-highlight .fortune-selection-copy-left {
-  left: -2px;
-  border-left: 2px solid #fff;
-  border-right: 2px solid #fff;
 }
 
 .fortune-formula-functionrange-highlight .fortune-selection-copy-hc {

package/es/components/SheetOverlay/index.js

@@ -285,14 +285,6 @@ var SheetOverlay = function SheetOverlay() {
     className: "fortune-selection-copy fortune-formula-functionrange-select",
     style: context.formulaRangeSelect
   }, /*#__PURE__*/React.createElement("div", {
-    className: "fortune-selection-copy-top fortune-copy"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "fortune-selection-copy-right fortune-copy"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "fortune-selection-copy-bottom fortune-copy"
-  }), /*#__PURE__*/React.createElement("div", {
-    className: "fortune-selection-copy-left fortune-copy"
-  }), /*#__PURE__*/React.createElement("div", {
     className: "fortune-selection-copy-hc"
   }))), context.formulaRangeHighlight.map(function (v) {
     var rangeIndex = v.rangeIndex,
@@ -302,16 +294,7 @@ var SheetOverlay = function SheetOverlay() {
       id: "fortune-formula-functionrange-highlight",
       className: "fortune-selection-highlight fortune-formula-functionrange-highlight",
       style: _.omit(v, "backgroundColor")
-    }, ["top", "right", "bottom", "left"].map(function (d) {
-      return /*#__PURE__*/React.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "fortune-selection-copy-".concat(d, " fortune-copy"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
-    }), /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement("div", {
       className: "fortune-selection-copy-hc",
       style: formulaRangeHighlightHcStyle(backgroundColor)
     }));
@@ -364,14 +347,6 @@ var SheetOverlay = function SheetOverlay() {
         height: row - row_pre - 1
       }
     }, /*#__PURE__*/React.createElement("div", {
-      className: "fortune-selection-copy-top fortune-copy"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "fortune-selection-copy-right fortune-copy"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "fortune-selection-copy-bottom fortune-copy"
-    }), /*#__PURE__*/React.createElement("div", {
-      className: "fortune-selection-copy-left fortune-copy"
-    }), /*#__PURE__*/React.createElement("div", {
       className: "fortune-selection-copy-hc"
     }));
   }))), /*#__PURE__*/React.createElement("div", {

package/es/hooks/useFormulaEditorHistory.js

@@ -9,17 +9,6 @@ function normalizeEditorHtmlSnapshot(html) {
   }
   return html !== null && html !== void 0 ? html : "";
 }
-function historyForLog(entries, index) {
-  return entries.map(function (e, i) {
-    var _a, _b;
-    return {
-      i: i,
-      active: i === index,
-      len: ((_a = e.html) !== null && _a !== void 0 ? _a : "").length,
-      preview: ((_b = e.html) !== null && _b !== void 0 ? _b : "").replace(/\s+/g, " ").slice(0, 24)
-    };
-  });
-}
 export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setContext, primary) {
   var preTextRef = useRef("");
   var preHtmlRef = useRef("");
@@ -45,11 +34,6 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     var history = formulaHistoryRef.current;
     var current = history.entries[history.index];
     if (current && current.html === entry.html) {
-      console.log("[Hist:pushSkipDuplicate]", {
-        currentHtmlLen: current.html.length,
-        entryHtmlLen: entry.html.length,
-        index: history.index
-      });
       return;
     }
     var nextEntries = history.entries.slice(0, history.index + 1);
@@ -58,16 +42,9 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     history.entries = nextEntries;
     history.index = nextEntries.length - 1;
     history.active = true;
-    console.log("[Hist:push]", {
-      htmlLen: entry.html.length,
-      caret: entry.caret,
-      entriesLen: history.entries.length,
-      index: history.index,
-      entries: historyForLog(history.entries, history.index)
-    });
   }, []);
   var applyFormulaHistoryEntry = useCallback(function (entry, preserveSelection) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     var primaryEl = primaryRef.current;
     if (!primaryEl) return;
     isApplyingHistoryRef.current = true;
@@ -88,11 +65,6 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     } else {
       setCursorPosition(primaryEl, Math.max(0, textLen));
     }
-    console.log("[Hist:apply]", {
-      entryHtmlLen: ((_d = entry.html) !== null && _d !== void 0 ? _d : "").length,
-      afterHtmlLen: ((_e = primaryEl.innerHTML) !== null && _e !== void 0 ? _e : "").length,
-      afterTextLen: textLen
-    });
     requestAnimationFrame(function () {
       requestAnimationFrame(function () {
         setTimeout(function () {
@@ -102,22 +74,13 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     });
   }, [cellInputRef, fxInputRef, primary, primaryRef]);
   var handleFormulaHistoryUndoRedo = useCallback(function (isRedo) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     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) {
-      console.log("[Hist:undoRedoBoundary]", {
-        isRedo: isRedo,
-        index: history.index,
-        entriesLen: history.entries.length,
-        nextIndex: nextIndex,
-        startedFromEmpty: startedFromEmptyRef.current,
-        liveHtmlLen: normalizeEditorHtmlSnapshot((_b = (_a = primaryRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "").length,
-        entries: historyForLog(history.entries, history.index)
-      });
       if (!isRedo && nextIndex < 0 && startedFromEmptyRef.current) {
-        var liveHtml = normalizeEditorHtmlSnapshot((_d = (_c = primaryRef.current) === null || _c === void 0 ? void 0 : _c.innerHTML) !== null && _d !== void 0 ? _d : "");
+        var liveHtml = normalizeEditorHtmlSnapshot((_b = (_a = primaryRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "");
         if (liveHtml !== "") {
           history.entries[0] = {
             html: "",
@@ -126,11 +89,6 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
           history.index = 0;
           var currentSelection_1 = primaryRef.current ? getSelectionOffsets(primaryRef.current) : undefined;
           applyFormulaHistoryEntry(history.entries[0], currentSelection_1);
-          console.log("[Hist:undoRedoForcedEmpty]", {
-            entriesLen: history.entries.length,
-            index: history.index,
-            entries: historyForLog(history.entries, history.index)
-          });
           return true;
         }
       }
@@ -140,17 +98,10 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     var entry = history.entries[nextIndex];
     var currentSelection = primaryRef.current ? getSelectionOffsets(primaryRef.current) : undefined;
     applyFormulaHistoryEntry(entry, currentSelection);
-    console.log("[Hist:undoRedoApplied]", {
-      isRedo: isRedo,
-      nextIndex: nextIndex,
-      entriesLen: history.entries.length,
-      entryHtmlLen: entry.html.length,
-      entries: historyForLog(history.entries, history.index)
-    });
     return true;
   }, [applyFormulaHistoryEntry, primaryRef]);
   var capturePreEditorHistoryState = useCallback(function () {
-    var _a, _b, _c;
+    var _a;
     var el = primaryRef.current;
     if (!el) return;
     preTextRef.current = el.innerText;
@@ -159,15 +110,6 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     if (!formulaHistoryRef.current.active) {
       startedFromEmptyRef.current = normalizeEditorHtmlSnapshot((_a = preHtmlRef.current) !== null && _a !== void 0 ? _a : "") === "";
     }
-    console.log("[Hist:capturePre]", {
-      preHtmlLen: ((_b = preHtmlRef.current) !== null && _b !== void 0 ? _b : "").length,
-      preTextLen: ((_c = preTextRef.current) !== null && _c !== void 0 ? _c : "").length,
-      preCaret: preCaretRef.current,
-      startedFromEmpty: startedFromEmptyRef.current,
-      historyActive: formulaHistoryRef.current.active,
-      entriesLen: formulaHistoryRef.current.entries.length,
-      index: formulaHistoryRef.current.index
-    });
   }, [primaryRef]);
   var appendEditorHistoryFromPrimaryEditor = useCallback(function (getCaret) {
     var _a, _b;
@@ -179,16 +121,6 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
     var caret = getCaret();
     var history = formulaHistoryRef.current;
     var wasInactive = !history.active || history.entries.length === 0;
-    console.log("[Hist:appendStart]", {
-      preHtmlLen: preHtmlSnapshot.length,
-      currentHtmlLen: snapshotHtml.length,
-      caret: caret,
-      wasInactive: wasInactive,
-      historyActive: history.active,
-      entriesLen: history.entries.length,
-      index: history.index,
-      entries: historyForLog(history.entries, history.index)
-    });
     if (wasInactive) {
       startedFromEmptyRef.current = preHtmlSnapshot === "";
       var seedHtml = preHtmlSnapshot === snapshotHtml ? "" : preHtmlSnapshot !== null && preHtmlSnapshot !== void 0 ? preHtmlSnapshot : "";
@@ -196,12 +128,6 @@ export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _s
         html: seedHtml,
         caret: preCaretRef.current
       });
-    } else {
-      console.log("[Hist:seedSkippedAlreadyActive]", {
-        index: history.index,
-        entriesLen: history.entries.length,
-        entries: historyForLog(history.entries, history.index)
-      });
     }
     pushFormulaHistoryEntry({
       html: snapshotHtml,

package/es/hooks/useRerenderOnFormulaCaret.d.ts

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