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

package/es/components/FxEditor/index.js

@@ -1,4 +1,4 @@
-import { getFlowdata, cancelNormalSelected, getCellValue, updateCell, getInlineStringNoStyle, isInlineStringCell, escapeScriptTag, moveHighlightCell, handleFormulaInput, rangeHightlightselected, valueShowEs, isShowHidenCR, escapeHTMLTag, isAllowEdit } from "@fileverse-dev/fortune-core";
+import { getFlowdata, cancelNormalSelected, getCellValue, updateCell, getInlineStringNoStyle, isInlineStringCell, escapeScriptTag, moveHighlightCell, handleFormulaInput, rangeHightlightselected, valueShowEs, isShowHidenCR, escapeHTMLTag, functionHTMLGenerate, isAllowEdit } from "@fileverse-dev/fortune-core";
 import React, { useContext, useState, useCallback, useEffect, useRef, useMemo } from "react";
 import "./index.css";
 import _ from "lodash";
@@ -9,7 +9,7 @@ import FormulaSearch from "../../components/SheetOverlay/FormulaSearch";
 import FormulaHint from "../../components/SheetOverlay/FormulaHint";
 import usePrevious from "../../hooks/usePrevious";
 import { LucideIcon } from "../../components/SheetOverlay/LucideIcon";
-import { countCommasBeforeCursor, isLetterNumberPattern, moveCursorToEnd } from "../../components/SheetOverlay/helper";
+import { countCommasBeforeCursor, isLetterNumberPattern, setCursorPosition, buildFormulaSuggestionText } from "../../components/SheetOverlay/helper";
 var FxEditor = function FxEditor() {
   var _a;
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
@@ -85,13 +85,19 @@ var FxEditor = function FxEditor() {
     return document.querySelector(".luckysheet-formula-search-item-active");
   }, []);
   var insertSelectedFormula = useCallback(function (formulaName) {
-    var ht = "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">=</span><span dir=\"auto\" class=\"luckysheet-formula-text-func\">".concat(formulaName, "</span><span dir=\"auto\" class=\"luckysheet-formula-text-lpar\">(</span>");
-    refs.fxInput.current.innerHTML = ht;
+    var fxEditor = refs.fxInput.current;
+    if (!fxEditor) return;
     var cellEditor = document.getElementById("luckysheet-rich-text-editor");
+    var _a = buildFormulaSuggestionText(fxEditor, formulaName),
+      text = _a.text,
+      caretOffset = _a.caretOffset;
+    var safeText = escapeScriptTag(text);
+    var html = safeText.startsWith("=") ? functionHTMLGenerate(safeText) : escapeHTMLTag(safeText);
+    fxEditor.innerHTML = html;
     if (cellEditor) {
-      cellEditor.innerHTML = ht;
+      cellEditor.innerHTML = html;
     }
-    moveCursorToEnd(refs.fxInput.current);
+    setCursorPosition(fxEditor, caretOffset);
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];

package/es/components/SheetOverlay/InputBox.js

@@ -8,7 +8,7 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-import { cancelNormalSelected, getCellValue, getInlineStringHTML, getStyleByCell, isInlineStringCell, moveToEnd, getFlowdata, handleFormulaInput, moveHighlightCell, escapeScriptTag, valueShowEs, createRangeHightlight, isShowHidenCR, israngeseleciton, escapeHTMLTag, isAllowEdit, getrangeseleciton, indexToColumnChar, handleBold, handleItalic, handleUnderline, handleStrikeThrough, getRangeRectsByCharacterOffset } from "@fileverse-dev/fortune-core";
+import { cancelNormalSelected, getCellValue, getInlineStringHTML, getStyleByCell, isInlineStringCell, moveToEnd, getFlowdata, handleFormulaInput, moveHighlightCell, escapeScriptTag, valueShowEs, createRangeHightlight, isShowHidenCR, israngeseleciton, escapeHTMLTag, isAllowEdit, indexToColumnChar, functionHTMLGenerate, handleBold, handleItalic, handleUnderline, handleStrikeThrough, getRangeRectsByCharacterOffset, rangeSetValue, getFormulaRangeIndexForKeyboardSync, createFormulaRangeSelect, seletedHighlistByindex, isFormulaReferenceInputMode, rangeHightlightselected } from "@fileverse-dev/fortune-core";
 import React, { useContext, useEffect, useMemo, useRef, useCallback, useLayoutEffect, useState } from "react";
 import _ from "lodash";
 import { Tooltip } from "@fileverse/ui";
@@ -17,60 +17,62 @@ import ContentEditable from "./ContentEditable";
 import FormulaSearch from "./FormulaSearch";
 import FormulaHint from "./FormulaHint";
 import usePrevious from "../../hooks/usePrevious";
-import { moveCursorToEnd, getCursorPosition, isLetterNumberPattern, removeLastSpan, incrementColumn, decrementColumn, incrementRow, decrementRow, countCommasBeforeCursor } from "./helper";
+import { moveCursorToEnd, getCursorPosition, setCursorPosition, buildFormulaSuggestionText, isLetterNumberPattern, countCommasBeforeCursor } from "./helper";
 import { LucideIcon } from "./LucideIcon";
 var InputBox = function InputBox() {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-  var _m = useContext(WorkbookContext),
-    context = _m.context,
-    setContext = _m.setContext,
-    refs = _m.refs;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+  var _o = useContext(WorkbookContext),
+    context = _o.context,
+    setContext = _o.setContext,
+    refs = _o.refs;
   var inputRef = useRef(null);
   var lastKeyDownEventRef = useRef(null);
   var prevCellUpdate = usePrevious(context.luckysheetCellUpdate);
   var prevSheetId = usePrevious(context.currentSheetId);
-  var _o = useState(false),
-    isHidenRC = _o[0],
-    setIsHidenRC = _o[1];
   var _p = useState(false),
-    isInputBoxActive = _p[0],
-    setIsInputBoxActive = _p[1];
-  var _q = useState(""),
-    activeCell = _q[0],
-    setActiveCell = _q[1];
+    isHidenRC = _p[0],
+    setIsHidenRC = _p[1];
+  var _q = useState(false),
+    isInputBoxActive = _q[0],
+    setIsInputBoxActive = _q[1];
   var _r = useState(""),
-    activeRefCell = _r[0],
-    setActiveRefCell = _r[1];
-  var _s = useState({
+    activeCell = _r[0],
+    setActiveCell = _r[1];
+  var _s = useState(""),
+    activeRefCell = _s[0],
+    setActiveRefCell = _s[1];
+  var _t = useState({
       left: 0,
       top: 0
     }),
-    frozenPosition = _s[0],
-    setFrozenPosition = _s[1];
+    frozenPosition = _t[0],
+    setFrozenPosition = _t[1];
   var firstSelection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
-  var _t = useState({}),
-    firstSelectionActiveCell = _t[0],
-    setFirstSelectionActiveCell = _t[1];
-  var _u = useState(0),
-    commaCount = _u[0],
-    setCommaCount = _u[1];
+  var _u = useState({}),
+    firstSelectionActiveCell = _u[0],
+    setFirstSelectionActiveCell = _u[1];
+  var _v = useState(0),
+    commaCount = _v[0],
+    setCommaCount = _v[1];
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
-  var _v = useState(!hideFormulaHintLocal),
-    showFormulaHint = _v[0],
-    setShowFormulaHint = _v[1];
-  var _w = useState(false),
-    showSearchHint = _w[0],
-    setShowSearchHint = _w[1];
+  var _w = useState(!hideFormulaHintLocal),
+    showFormulaHint = _w[0],
+    setShowFormulaHint = _w[1];
+  var _x = useState(false),
+    showSearchHint = _x[0],
+    setShowSearchHint = _x[1];
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = useRef("");
-  var placeRef = useRef("");
   var isComposingRef = useRef(false);
+  var formulaAnchorCellRef = useRef(null);
+  var skipNextAnchorSelectionSyncRef = useRef(false);
+  var lastHandledMouseDragSignatureRef = useRef("");
   var ZWSP = "\u200B";
   var inputBoxInnerRef = useRef(null);
-  var _x = useState([]),
-    linkSelectionHighlightRects = _x[0],
-    setLinkSelectionHighlightRects = _x[1];
+  var _y = useState([]),
+    linkSelectionHighlightRects = _y[0],
+    setLinkSelectionHighlightRects = _y[1];
   var ensureNotEmpty = function ensureNotEmpty() {
     var el = inputRef.current;
     if (!el) return;
@@ -167,6 +169,34 @@ var InputBox = function InputBox() {
       }
     }
   }, [context.luckysheetCellUpdate]);
+  useEffect(function () {
+    var _a;
+    if (_.isEmpty(context.luckysheetCellUpdate) || !refs.cellInput.current) {
+      formulaAnchorCellRef.current = null;
+      lastHandledMouseDragSignatureRef.current = "";
+      return;
+    }
+    var inputText = ((_a = refs.cellInput.current.innerText) === null || _a === void 0 ? void 0 : _a.trim()) || "";
+    if (!inputText.startsWith("=")) {
+      formulaAnchorCellRef.current = null;
+      lastHandledMouseDragSignatureRef.current = "";
+    }
+  }, [context.luckysheetCellUpdate, refs.cellInput]);
+  useEffect(function () {
+    if (_.isEmpty(context.luckysheetCellUpdate) || _.isEmpty(prevCellUpdate) || _.isEqual(prevCellUpdate, context.luckysheetCellUpdate)) {
+      return;
+    }
+    setContext(function (ctx) {
+      ctx.formulaRangeHighlight = [];
+      ctx.formulaRangeSelect = undefined;
+      ctx.formulaCache.selectingRangeIndex = -1;
+      ctx.formulaCache.func_selectedrange = undefined;
+      ctx.formulaCache.rangestart = false;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangechangeindex = undefined;
+    });
+  }, [context.luckysheetCellUpdate, prevCellUpdate, setContext]);
   useEffect(function () {
     setIsHidenRC(isShowHidenCR(context));
   }, [context.luckysheet_select_save]);
@@ -176,61 +206,40 @@ var InputBox = function InputBox() {
       setIsInputBoxActive(false);
     }
   }, [firstSelection, (_c = context.rangeDialog) === null || _c === void 0 ? void 0 : _c.show, context.luckysheetCellUpdate]);
+  useEffect(function () {
+    if (isInputBoxActive) return;
+    setContext(function (ctx) {
+      if (_.isEmpty(ctx.formulaRangeHighlight) && !ctx.formulaRangeSelect && ctx.formulaCache.selectingRangeIndex === -1 && !ctx.formulaCache.func_selectedrange) {
+        return;
+      }
+      ctx.formulaRangeHighlight = [];
+      ctx.formulaRangeSelect = undefined;
+      ctx.formulaCache.selectingRangeIndex = -1;
+      ctx.formulaCache.func_selectedrange = undefined;
+      ctx.formulaCache.rangestart = false;
+      ctx.formulaCache.rangedrag_column_start = false;
+      ctx.formulaCache.rangedrag_row_start = false;
+      ctx.formulaCache.rangechangeindex = undefined;
+      ctx.formulaCache.rangeSelectionActive = null;
+    });
+  }, [isInputBoxActive, setContext]);
   var getActiveFormula = useCallback(function () {
     return document.querySelector(".luckysheet-formula-search-item-active");
   }, []);
   var insertSelectedFormula = useCallback(function (formulaName) {
-    var _a;
-    if (/^=[a-zA-Z]+$/.test(inputRef.current.innerText)) {
-      var ht = "<span dir=\"auto\" class=\"luckysheet-formula-text-color\">=</span><span dir=\"auto\" class=\"luckysheet-formula-text-func\">".concat(formulaName, "</span><span dir=\"auto\" class=\"luckysheet-formula-text-lpar\">(</span>");
-      inputRef.current.innerHTML = ht;
-      var fxEditor = document.getElementById("luckysheet-functionbox-cell");
-      if (fxEditor) {
-        fxEditor.innerHTML = ht;
-      }
-      moveCursorToEnd(inputRef.current);
-      setContext(function (draftCtx) {
-        draftCtx.functionCandidates = [];
-        draftCtx.defaultCandidates = [];
-        draftCtx.functionHint = formulaName;
-      });
-      return;
-    }
-    var textEditor = document.getElementById("luckysheet-rich-text-editor");
+    var textEditor = inputRef.current;
     if (!textEditor) return;
-    textEditor.focus();
-    var selection = window.getSelection();
-    var range = (selection === null || selection === void 0 ? void 0 : selection.rangeCount) ? selection.getRangeAt(0) : null;
-    if (!selection || !range || !textEditor.contains(range.startContainer)) {
-      range = document.createRange();
-      range.selectNodeContents(textEditor);
-      range.collapse(false);
-      selection = window.getSelection();
-      selection === null || selection === void 0 ? void 0 : selection.removeAllRanges();
-      selection === null || selection === void 0 ? void 0 : selection.addRange(range);
-    }
-    var searchTxt = ((_a = getrangeseleciton()) === null || _a === void 0 ? void 0 : _a.textContent) || "";
-    var deleteCount = searchTxt === "=" ? 0 : searchTxt.length;
-    if (deleteCount > 0 && range.startContainer.nodeType === Node.TEXT_NODE && textEditor.contains(range.startContainer)) {
-      var startOffset = Math.max(range.startOffset - deleteCount, 0);
-      var endOffset = range.startOffset;
-      range.setStart(range.startContainer, startOffset);
-      range.setEnd(range.startContainer, endOffset);
-      range.deleteContents();
-    }
-    textEditor.querySelectorAll(".luckysheet-formula-text-func, .luckysheet-formula-text-lpar").forEach(function (el) {
-      return el.remove();
-    });
-    var funcNode = new DOMParser().parseFromString("<span dir=\"auto\" class=\"luckysheet-formula-text-func\">".concat(formulaName, "</span>"), "text/html").body.firstChild;
-    var parNode = new DOMParser().parseFromString("<span dir=\"auto\" class=\"luckysheet-formula-text-lpar\">(</span>", "text/html").body.firstChild;
-    if (range && parNode && funcNode) {
-      range.insertNode(funcNode);
-      range.collapse(false);
-      range.insertNode(parNode);
-      range.collapse(false);
-      selection === null || selection === void 0 ? void 0 : selection.removeAllRanges();
-      selection === null || selection === void 0 ? void 0 : selection.addRange(range);
-    }
+    var fxEditor = document.getElementById("luckysheet-functionbox-cell");
+    var _a = buildFormulaSuggestionText(textEditor, formulaName),
+      text = _a.text,
+      caretOffset = _a.caretOffset;
+    var safeText = escapeScriptTag(text);
+    var html = safeText.startsWith("=") ? functionHTMLGenerate(safeText) : escapeHTMLTag(safeText);
+    textEditor.innerHTML = html;
+    if (fxEditor) {
+      fxEditor.innerHTML = html;
+    }
+    setCursorPosition(textEditor, caretOffset);
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];
@@ -270,10 +279,135 @@ var InputBox = function InputBox() {
     event.stopPropagation();
     event.preventDefault();
   };
+  useEffect(function () {
+    var _a;
+    var cellInputEl = refs.cellInput.current;
+    if (!((_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) || !cellInputEl) return;
+    setContext(function (ctx) {
+      var _a;
+      var currentSelection = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[ctx.luckysheet_select_save.length - 1];
+      if (!currentSelection) return;
+      var isMouseFormulaRangeDrag = !!ctx.formulaCache.func_selectedrange && (ctx.formulaCache.rangestart || ctx.formulaCache.rangedrag_column_start || ctx.formulaCache.rangedrag_row_start);
+      if (isMouseFormulaRangeDrag) {
+        return;
+      }
+      israngeseleciton(ctx);
+      var keyboardSyncRangeIndex = getFormulaRangeIndexForKeyboardSync(cellInputEl);
+      if (skipNextAnchorSelectionSyncRef.current && formulaAnchorCellRef.current) {
+        var _b = formulaAnchorCellRef.current,
+          anchorRow = _b[0],
+          anchorCol = _b[1];
+        var isAnchorSelection = currentSelection.row_focus === anchorRow && currentSelection.column_focus === anchorCol;
+        if (isAnchorSelection) {
+          skipNextAnchorSelectionSyncRef.current = false;
+          return;
+        }
+      }
+      var isFormulaMode = isFormulaReferenceInputMode(ctx);
+      if (!isFormulaMode) return;
+      if (keyboardSyncRangeIndex !== null) {
+        ctx.formulaCache.rangechangeindex = keyboardSyncRangeIndex;
+        ctx.formulaCache.rangestart = true;
+        ctx.formulaCache.rangedrag_column_start = false;
+        ctx.formulaCache.rangedrag_row_start = false;
+      } else {
+        ctx.formulaCache.rangechangeindex = undefined;
+        ctx.formulaCache.rangestart = false;
+      }
+      ctx.formulaCache.rangeSelectionActive = true;
+      rangeSetValue === null || rangeSetValue === void 0 ? void 0 : rangeSetValue(ctx, cellInputEl, {
+        row: currentSelection.row,
+        column: currentSelection.column
+      }, refs.fxInput.current);
+      rangeHightlightselected(ctx, cellInputEl);
+      if (!_.isNil(ctx.formulaCache.rangechangeindex)) {
+        ctx.formulaCache.selectingRangeIndex = ctx.formulaCache.rangechangeindex;
+        createRangeHightlight(ctx, cellInputEl.innerHTML, ctx.formulaCache.rangechangeindex);
+        var rectFromSelection = seletedHighlistByindex(ctx, currentSelection.row[0], currentSelection.row[1], currentSelection.column[0], currentSelection.column[1]);
+        if (rectFromSelection) {
+          createFormulaRangeSelect(ctx, {
+            rangeIndex: ctx.formulaCache.rangechangeindex || 0,
+            left: rectFromSelection.left,
+            top: rectFromSelection.top,
+            width: rectFromSelection.width,
+            height: rectFromSelection.height
+          });
+        }
+      }
+    });
+  }, [context.luckysheet_select_save, (_d = context.rangeDialog) === null || _d === void 0 ? void 0 : _d.show]);
+  var formulaMouseDragSignature = function () {
+    var _a, _b, _c, _d;
+    var r = context.formulaCache.func_selectedrange;
+    if (!r) return "";
+    return [(_a = r.row) === null || _a === void 0 ? void 0 : _a[0], (_b = r.row) === null || _b === void 0 ? void 0 : _b[1], (_c = r.column) === null || _c === void 0 ? void 0 : _c[0], (_d = r.column) === null || _d === void 0 ? void 0 : _d[1], r.left_move, r.top_move, r.width_move, r.height_move].join(":");
+  }();
+  useEffect(function () {
+    var _a;
+    if (!formulaMouseDragSignature) return;
+    if (lastHandledMouseDragSignatureRef.current === formulaMouseDragSignature) {
+      return;
+    }
+    if (!refs.cellInput.current) return;
+    var inputText = ((_a = refs.cellInput.current.innerText) === null || _a === void 0 ? void 0 : _a.trim()) || "";
+    if (!inputText.startsWith("=")) return;
+    var dragRange = context.formulaCache.func_selectedrange;
+    if (!dragRange) return;
+    lastHandledMouseDragSignatureRef.current = formulaMouseDragSignature;
+    setContext(function (ctx) {
+      ctx.luckysheet_select_save = [{
+        row: [dragRange.row[0], dragRange.row[1]],
+        column: [dragRange.column[0], dragRange.column[1]],
+        row_focus: _.isNil(dragRange.row_focus) ? dragRange.row[0] : dragRange.row_focus,
+        column_focus: _.isNil(dragRange.column_focus) ? dragRange.column[0] : dragRange.column_focus
+      }];
+    });
+  }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
+    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) {
+        draftCtx.formulaCache.rangeSelectionActive = null;
+      });
+      formulaAnchorCellRef.current = [context.luckysheetCellUpdate[0], context.luckysheetCellUpdate[1]];
+    }
+    if (e.key === "(" && currentInputText.startsWith("=")) {
+      setContext(function (draftCtx) {
+        draftCtx.formulaCache.rangeSelectionActive = null;
+      });
+    }
+    if (e.key === "," && context.luckysheetCellUpdate.length > 0 && currentInputText.startsWith("=") && formulaAnchorCellRef.current) {
+      setContext(function (draftCtx) {
+        draftCtx.formulaCache.rangeSelectionActive = null;
+      });
+      var _c = formulaAnchorCellRef.current,
+        anchorRow_1 = _c[0],
+        anchorCol_1 = _c[1];
+      skipNextAnchorSelectionSyncRef.current = true;
+      setTimeout(function () {
+        setContext(function (draftCtx) {
+          draftCtx.luckysheetCellUpdate = [anchorRow_1, anchorCol_1];
+          draftCtx.luckysheet_select_save = [{
+            row: [anchorRow_1, anchorRow_1],
+            column: [anchorCol_1, anchorCol_1],
+            row_focus: anchorRow_1,
+            column_focus: anchorCol_1
+          }];
+          draftCtx.formulaRangeHighlight = [];
+          draftCtx.formulaRangeSelect = undefined;
+          draftCtx.formulaCache.selectingRangeIndex = -1;
+          draftCtx.formulaCache.func_selectedrange = undefined;
+          draftCtx.formulaCache.rangechangeindex = undefined;
+          draftCtx.formulaCache.rangestart = false;
+          draftCtx.formulaCache.rangedrag_column_start = false;
+          draftCtx.formulaCache.rangedrag_row_start = false;
+          moveHighlightCell(draftCtx, "down", 0, "rangeOfSelect");
+        });
+      }, 0);
+    }
     if (e.metaKey && context.luckysheetCellUpdate.length > 0) {
       if (e.code === "KeyB") {
         handleBold(context, inputRef.current);
@@ -294,6 +428,7 @@ var InputBox = function InputBox() {
       setCommaCount(currentCommaCount);
     }
     var allowListNavigation = true;
+    var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
     if (e.key === "Delete" || e.key === "Backspace") {
       if (isComposingRef.current) requestAnimationFrame(ensureNotEmpty);
       if (getCursorPosition(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
@@ -302,39 +437,8 @@ var InputBox = function InputBox() {
         }, 5);
       }
     }
-    var refCell = placeRef.current;
-    if (e.key === "ArrowUp") {
-      refCell = decrementRow(placeRef.current);
-    } else if (e.key === "ArrowDown") {
-      refCell = incrementRow(placeRef.current);
-    } else if (e.key === "ArrowLeft") {
-      refCell = decrementColumn(placeRef.current);
-    } else if (e.key === "ArrowRight") {
-      refCell = incrementColumn(placeRef.current);
-    }
-    if ((e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight") && !(getCursorPosition(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) !== (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length) && e.key === "ArrowRight")) {
-      var parser = new DOMParser();
-      var doc = parser.parseFromString("<div>".concat((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML, "</div>"), "text/html");
-      var spans = doc.querySelectorAll("span");
-      var lastSpan = spans[spans.length - 1];
-      var notFunctionInit = !((_b = document.getElementById("luckysheet-rich-text-editor")) === null || _b === void 0 ? void 0 : _b.innerText.includes("("));
-      var arrowRefNotAllowed = (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(")")) || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !_.includes(["="], lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText);
-      if (((lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) === "(" || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) === "," || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes(":")) || (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) !== ")") && !(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText.includes('"')) && !isLetterNumberPattern(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) && !arrowRefNotAllowed && !/^[a-zA-Z]+$/.test(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
-        allowListNavigation = false;
-        inputRef.current.innerHTML = "".concat(inputRef.current.innerHTML, "<span class=\"fortune-formula-functionrange-cell\" rangeindex=\"0\" dir=\"auto\" style=\"color:#c1232b;\">").concat(refCell, "</span>");
-        setTimeout(function () {
-          moveCursorToEnd(inputRef.current);
-        }, 1);
-      }
-      if (isLetterNumberPattern(lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText)) {
-        allowListNavigation = false;
-        var htmlR = removeLastSpan(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerHTML);
-        inputRef.current.innerHTML = "".concat(htmlR, "<span class=\"fortune-formula-functionrange-cell\" rangeindex=\"0\" dir=\"auto\" style=\"color:#c1232b;\">").concat(refCell, "</span>");
-        moveCursorToEnd(inputRef.current);
-        setTimeout(function () {
-          moveCursorToEnd(inputRef.current);
-        }, 1);
-      }
+    if (isArrowKey && isFormulaReferenceInputMode(context)) {
+      allowListNavigation = false;
     }
     if (e.key === "Escape" && context.luckysheetCellUpdate.length > 0) {
       setContext(function (draftCtx) {
@@ -411,7 +515,7 @@ var InputBox = function InputBox() {
     }
   };
   var onChange = useCallback(function (__, isBlur) {
-    var _a;
+    var _a, _b, _c;
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
     if (((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
@@ -424,7 +528,16 @@ var InputBox = function InputBox() {
       setCommaCount(currentCommaCount);
     }
     var e = lastKeyDownEventRef.current;
-    if (!e) return;
+    if (!e) {
+      var cellEl_1 = refs.cellInput.current;
+      if (cellEl_1 && (((_b = cellEl_1.innerText) === null || _b === void 0 ? void 0 : _b.trim().startsWith("=")) || ((_c = cellEl_1.textContent) === null || _c === void 0 ? void 0 : _c.trim().startsWith("=")))) {
+        setContext(function (draftCtx) {
+          if (!isAllowEdit(draftCtx, draftCtx.luckysheet_select_save)) return;
+          rangeHightlightselected(draftCtx, cellEl_1);
+        });
+      }
+      return;
+    }
     var kcode = e.keyCode;
     if (!kcode) return;
     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) {
@@ -480,7 +593,7 @@ var InputBox = function InputBox() {
       zIndex: _.isEmpty(context.luckysheetCellUpdate) ? -1 : 19,
       display: "block"
     };
-  }, [firstSelection, (_d = context.rangeDialog) === null || _d === void 0 ? void 0 : _d.show, context.luckysheetCellUpdate, refs.cellArea, isInputBoxActive, frozenPosition, context.scrollLeft, context.scrollTop]);
+  }, [firstSelection, (_e = context.rangeDialog) === null || _e === void 0 ? void 0 : _e.show, context.luckysheetCellUpdate, refs.cellArea, isInputBoxActive, frozenPosition, context.scrollLeft, context.scrollTop]);
   useEffect(function () {
     var _a;
     if (firstSelection && !((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show) && !isInputBoxActive && !_.isEmpty(context.luckysheetCellUpdate)) {
@@ -496,7 +609,7 @@ var InputBox = function InputBox() {
         setIsInputBoxActive(true);
       }
     }
-  }, [firstSelection, (_e = context.rangeDialog) === null || _e === void 0 ? void 0 : _e.show, context.luckysheetCellUpdate, isInputBoxActive, context.scrollLeft, context.scrollTop, refs.cellArea]);
+  }, [firstSelection, (_f = context.rangeDialog) === null || _f === void 0 ? void 0 : _f.show, context.luckysheetCellUpdate, isInputBoxActive, context.scrollLeft, context.scrollTop, refs.cellArea]);
   var getAddressIndicatorPosition = useCallback(function () {
     var _a;
     if (!firstSelection || ((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show)) {
@@ -509,7 +622,7 @@ var InputBox = function InputBox() {
       left: "0",
       display: "block"
     };
-  }, [firstSelection, (_f = context.rangeDialog) === null || _f === void 0 ? void 0 : _f.show]);
+  }, [firstSelection, (_g = context.rangeDialog) === null || _g === void 0 ? void 0 : _g.show]);
   var getCellAddress = useCallback(function () {
     if (!firstSelection) return "";
     var rowIndex = firstSelection.row_focus || 0;
@@ -559,10 +672,9 @@ var InputBox = function InputBox() {
       };
     });
     setLinkSelectionHighlightRects(relative);
-  }, [(_g = context.linkCard) === null || _g === void 0 ? void 0 : _g.applyToSelection, (_h = context.linkCard) === null || _h === void 0 ? void 0 : _h.selectionOffsets, (_j = context.linkCard) === null || _j === void 0 ? void 0 : _j.r, (_k = context.linkCard) === null || _k === void 0 ? void 0 : _k.c, context.luckysheetCellUpdate]);
+  }, [(_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]);
   var wraperGetCell = function wraperGetCell() {
     var cell = getCellAddress();
-    placeRef.current = cell;
     if (activeRefCell !== cell) {
       setActiveRefCell(cell);
     }
@@ -586,6 +698,7 @@ var InputBox = function InputBox() {
   }, []);
   var functionName = context.functionHint || getFunctionNameFromInput();
   var fn = functionName ? context.formulaCache.functionlistMap[functionName] : null;
+  var inputBoxBaseSelection = isInputBoxActive && firstSelectionActiveCell ? firstSelectionActiveCell : firstSelection;
   return /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-input-box",
     id: "luckysheet-input-box",
@@ -596,16 +709,16 @@ var InputBox = function InputBox() {
     onMouseUp: function onMouseUp(e) {
       return e.stopPropagation();
     }
-  }, firstSelection && !((_l = context.rangeDialog) === null || _l === void 0 ? void 0 : _l.show) && (/*#__PURE__*/React.createElement("div", {
+  }, firstSelection && !((_m = context.rangeDialog) === null || _m === void 0 ? void 0 : _m.show) && (/*#__PURE__*/React.createElement("div", {
     className: "luckysheet-cell-address-indicator",
     style: getAddressIndicatorPosition()
   }, wraperGetCell())), /*#__PURE__*/React.createElement("div", {
     ref: inputBoxInnerRef,
     className: "luckysheet-input-box-inner",
-    style: firstSelection ? __assign({
+    style: inputBoxBaseSelection ? __assign({
       position: "relative",
-      minWidth: firstSelection.width,
-      minHeight: firstSelection.height
+      minWidth: inputBoxBaseSelection.width,
+      minHeight: inputBoxBaseSelection.height
     }, inputBoxStyle) : {
       position: "relative"
     }

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

@@ -211,7 +211,7 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
       var sheetIdx_1 = getSheetIndex(context, context.currentSheetId);
       if (sheetIdx_1 != null && sourceIndex_1 >= 0 && Number.isFinite(finalInsertionIndex_1) && finalInsertionIndex_1 >= 0) {
         setContext(function (draft) {
-          var _a, _b, _c, _d, _e, _f, _g;
+          var _a, _b, _c, _d, _e, _f, _g, _h;
           var _sheet = draft.luckysheetfile[sheetIdx_1];
           if (!(_sheet === null || _sheet === void 0 ? void 0 : _sheet.data)) return;
           var rows = _sheet.data;
@@ -374,6 +374,30 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
             }
           });
           (_g = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _g === void 0 ? void 0 : _g.call(window, selectedSourceCol, selectedTargetCol, "column", context.currentSheetId, sourceIndex_1, targetIndex);
+          var cellChanges = [];
+          var affectedColStart = Math.min(sourceIndex_1, targetIndex);
+          var affectedColEnd = Math.max(sourceIndex_1, targetIndex) + selectedSourceCol.length - 1;
+          var numRows = rows.length;
+          for (var r = 0; r < numRows; r += 1) {
+            var row = rows[r];
+            for (var c = affectedColStart; c <= affectedColEnd; c += 1) {
+              var cell = row === null || row === void 0 ? void 0 : row[c];
+              cellChanges.push({
+                sheetId: draft.currentSheetId,
+                path: ["celldata"],
+                value: {
+                  r: r,
+                  c: c,
+                  v: cell !== null && cell !== void 0 ? cell : null
+                },
+                key: "".concat(r, "_").concat(c),
+                type: "update"
+              });
+            }
+          }
+          if (cellChanges.length > 0 && ((_h = draft.hooks) === null || _h === void 0 ? void 0 : _h.updateCellYdoc)) {
+            draft.hooks.updateCellYdoc(cellChanges);
+          }
           var rowLen = (d === null || d === void 0 ? void 0 : d.length) || 0;
           api.setSelection(draft, [{
             row: [0, rowLen],

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

@@ -207,7 +207,7 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
       var sheetIdx_1 = getSheetIndex(context, context.currentSheetId);
       if (sheetIdx_1 != null && sourceIndex_1 >= 0 && Number.isFinite(finalInsertionIndex_1) && finalInsertionIndex_1 >= 0) {
         setContext(function (draft) {
-          var _a, _b, _c, _d, _e, _f;
+          var _a, _b, _c, _d, _e, _f, _g, _h, _j;
           var _sheet = draft.luckysheetfile[sheetIdx_1];
           if (!(_sheet === null || _sheet === void 0 ? void 0 : _sheet.data)) return;
           var rows = _sheet.data;
@@ -364,7 +364,31 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
             }
           });
           (_e = window === null || window === void 0 ? void 0 : window.updateDataBlockCalcFunctionAfterRowDrag) === null || _e === void 0 ? void 0 : _e.call(window, sourceIndex_1, targetIndex, "row", context.currentSheetId);
-          var colLen = ((_f = d === null || d === void 0 ? void 0 : d[0]) === null || _f === void 0 ? void 0 : _f.length) || 0;
+          var cellChanges = [];
+          var affectedRowStart = Math.min(sourceIndex_1, targetIndex);
+          var affectedRowEnd = Math.max(sourceIndex_1, targetIndex) + selectedSourceRow.length - 1;
+          var numCols = (_g = (_f = d === null || d === void 0 ? void 0 : d[0]) === null || _f === void 0 ? void 0 : _f.length) !== null && _g !== void 0 ? _g : 0;
+          for (var r = affectedRowStart; r <= affectedRowEnd; r += 1) {
+            var row = rows[r];
+            for (var c = 0; c < numCols; c += 1) {
+              var cell = row === null || row === void 0 ? void 0 : row[c];
+              cellChanges.push({
+                sheetId: draft.currentSheetId,
+                path: ["celldata"],
+                value: {
+                  r: r,
+                  c: c,
+                  v: cell !== null && cell !== void 0 ? cell : null
+                },
+                key: "".concat(r, "_").concat(c),
+                type: "update"
+              });
+            }
+          }
+          if (cellChanges.length > 0 && ((_h = draft.hooks) === null || _h === void 0 ? void 0 : _h.updateCellYdoc)) {
+            draft.hooks.updateCellYdoc(cellChanges);
+          }
+          var colLen = ((_j = d === null || d === void 0 ? void 0 : d[0]) === null || _j === void 0 ? void 0 : _j.length) || 0;
           api.setSelection(draft, [{
             row: [selectedTargetRow[0], selectedTargetRow[selectedTargetRow.length - 1]],
             column: [0, colLen]

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

@@ -1,5 +1,10 @@
 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 removeLastSpan(htmlString: string): string;
 export declare function numberToColumn(colNumber: number): string;