@fileverse-dev/fortune-react 1.3.11-input-ref-1 → 1.3.11-input-ref-3

package/lib/components/SheetOverlay/FormulaHint/index.js

@@ -58,29 +58,49 @@ var FormulaHint = function FormulaHint(props) {
     ETHERSCAN_API_KEY: "Etherscan API key"
   };
   var hintRef = (0, _react.useRef)(null);
-  var _h = (0, _react.useState)(0),
+  var cellHeightPx = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height_move) != null ? Number(firstSelection.height_move) : 24;
+  var belowCellTop = cellHeightPx + 4;
+  var _h = (0, _react.useState)(belowCellTop),
     top = _h[0],
     setTop = _h[1];
   var _j = (0, _react.useState)(false),
     showDelayedHint = _j[0],
     setShowDelayedHint = _j[1];
-  var calcuatePopUpPlacement = function calcuatePopUpPlacement() {
-    var _a, _b, _c, _d, _e, _f;
-    if (!((_a = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) === null || _a === void 0 ? void 0 : _a.toString()) || !((_b = firstSelection.height_move) === null || _b === void 0 ? void 0 : _b.toString()) || !hintRef.current) return;
-    var hintHeight = 360;
-    var inputBoxTop = parseInt(((_c = document.getElementById("luckysheet-input-box")) === null || _c === void 0 ? void 0 : _c.style.top) || "0", 10) - 85;
-    var inputBottom = inputBoxTop + firstSelection.height_move;
-    var availableBelow = window.innerHeight - inputBottom;
-    var hintAbove = hintHeight > availableBelow;
-    var selectionHeight = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height_move) || 0;
-    var divOffset = ((_d = hintRef.current) === null || _d === void 0 ? void 0 : _d.offsetHeight) || 0;
-    var topV = hintAbove ? selectionHeight - (divOffset + 30) : selectionHeight + 4;
-    var el = (_e = document.getElementsByClassName("fx-hint")) === null || _e === void 0 ? void 0 : _e[0];
-    if (el && ((_f = el === null || el === void 0 ? void 0 : el.style) === null || _f === void 0 ? void 0 : _f.display) !== "none") {
+  var measureFormulaHintPlacement = (0, _react.useCallback)(function () {
+    var _a;
+    if ((firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) == null || firstSelection.height_move == null) {
+      setTop(belowCellTop);
+      return;
+    }
+    var cellH = Number(firstSelection.height_move) || cellHeightPx;
+    var innerEl = hintRef.current;
+    var popupHeight = Math.min((innerEl === null || innerEl === void 0 ? void 0 : innerEl.offsetHeight) || 360, 360);
+    var inputBox = document.getElementById("luckysheet-input-box");
+    var rect = inputBox === null || inputBox === void 0 ? void 0 : inputBox.getBoundingClientRect();
+    if (!rect) {
+      setTop(cellH + 4);
+      return;
+    }
+    var cellBottomViewport = rect.top + cellH;
+    var availableBelow = window.innerHeight - cellBottomViewport - 12;
+    var preferBelow = popupHeight <= availableBelow;
+    var topV = preferBelow ? cellH + 4 : -(popupHeight + 8);
+    var fxHint = (_a = document.getElementsByClassName("fx-hint")) === null || _a === void 0 ? void 0 : _a[0];
+    if (fxHint && fxHint.style.display !== "none") {
       topV = 25;
     }
     setTop(topV);
-  };
+  }, [belowCellTop, cellHeightPx, firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height_move, firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top]);
+  (0, _react.useLayoutEffect)(function () {
+    if (!fn) {
+      return undefined;
+    }
+    measureFormulaHintPlacement();
+    var id = requestAnimationFrame(measureFormulaHintPlacement);
+    return function () {
+      cancelAnimationFrame(id);
+    };
+  }, [functionName, context.functionHint, measureFormulaHintPlacement, showFormulaHint, commaCount, showFunctionBody]);
   var hexToRgbString = function hexToRgbString(hex) {
     hex = hex.replace("#", "");
     var r = parseInt(hex.substring(0, 2), 16);
@@ -93,14 +113,13 @@ var FormulaHint = function FormulaHint(props) {
     return bg;
   };
   (0, _react.useEffect)(function () {
-    calcuatePopUpPlacement();
-  }, []);
-  (0, _react.useEffect)(function () {
-    if (!top) {
-      setTimeout(function () {
-        setShowDelayedHint(true);
-      }, 40);
-    }
+    setShowDelayedHint(false);
+    var t = setTimeout(function () {
+      return setShowDelayedHint(true);
+    }, 40);
+    return function () {
+      return clearTimeout(t);
+    };
   }, [top]);
   if (!fn) return null;
   var fnNameClass = fn.n ? String(fn.n).replace(/[^a-zA-Z0-9-]/g, "-").replace(/-+/g, "-") : "";
@@ -183,7 +202,7 @@ var FormulaHint = function FormulaHint(props) {
         localStorage.setItem("formula-expand", "".concat(!showFunctionBody));
         setShouldShowFunctionBody(!showFunctionBody);
         setTimeout(function () {
-          calcuatePopUpPlacement();
+          measureFormulaHintPlacement();
         }, 50);
       }
       dragHasMoved.current = false;
@@ -286,6 +305,7 @@ var FormulaHint = function FormulaHint(props) {
       cursor: "auto"
     }
   }, fn.API_KEY && (/*#__PURE__*/_react.default.createElement("div", {
+    className: "luckysheet-formula-help-content-api",
     style: {
       borderLeft: "4px solid ".concat(isKeyAdded ? "#177E23" : "#fb923c"),
       backgroundColor: "white",
@@ -349,6 +369,7 @@ var FormulaHint = function FormulaHint(props) {
     className: "fortune-formula-hint__cta min-w-[80px]",
     "data-testid": "formula-hint-cta-ok"
   }, "Ok"))))))), /*#__PURE__*/_react.default.createElement("div", {
+    id: "luckysheet-formula-help-content-example",
     style: {
       backgroundColor: "white",
       padding: "6px",

package/lib/components/SheetOverlay/FormulaSearch/index.d.ts

@@ -1,4 +1,6 @@
 import React from "react";
 import "./index.css";
-declare const FormulaSearch: React.FC<React.HTMLAttributes<HTMLDivElement>>;
+declare const FormulaSearch: React.FC<React.HTMLAttributes<HTMLDivElement> & {
+    from?: string;
+}>;
 export default FormulaSearch;

package/lib/components/SheetOverlay/FormulaSearch/index.js

@@ -23,11 +23,21 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-var FormulaSearch = function FormulaSearch(props) {
-  var _a;
-  var _b = (0, _react.useContext)(_context.default),
-    context = _b.context,
-    isAuthorized = _b.settings.isAuthorized;
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+var FormulaSearch = function FormulaSearch(_a) {
+  var _b, _c, _d;
+  var from = _a.from,
+    divProps = __rest(_a, ["from"]);
+  var _e = (0, _react.useContext)(_context.default),
+    context = _e.context,
+    isAuthorized = _e.settings.isAuthorized;
   var authedFunction = ["COINGECKO", "ETHERSCAN", "DEFILLAMA", "GNOSIS", "BASE", "EOA", "PNL", "SAFE", "BLOCKSCOUT", "LENS", "FARCASTER", "Ethereum", "SMARTCONTRACT", "DUNESIM"];
   var filteredDefaultCandidates = context.defaultCandidates.filter(function (item) {
     return !authedFunction.includes(item.n);
@@ -39,39 +49,58 @@ var FormulaSearch = function FormulaSearch(props) {
   var finalFunctionCandidates = isAuthorized ? context.functionCandidates : context.functionCandidates.filter(function (item) {
     return item.t !== 20;
   });
-  var firstSelection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
+  var firstSelection = (_b = context.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[0];
+  var cellHeightPx = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height_move) != null ? Number(firstSelection.height_move) : 24;
+  var belowCellTop = cellHeightPx + 4;
   var hintRef = (0, _react.useRef)(null);
-  var _c = (0, _react.useState)(0),
-    top = _c[0],
-    setTop = _c[1];
-  var calcuatePopUpPlacement = function calcuatePopUpPlacement() {
-    var _a, _b, _c, _d, _e, _f;
-    if (!((_a = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) === null || _a === void 0 ? void 0 : _a.toString()) || !((_b = firstSelection.height_move) === null || _b === void 0 ? void 0 : _b.toString()) || !hintRef.current) return;
-    var hintHeight = 360;
-    var inputBoxTop = parseInt(((_c = document.getElementById("luckysheet-input-box")) === null || _c === void 0 ? void 0 : _c.style.top) || "0", 10) - 85;
-    var inputBottom = inputBoxTop + firstSelection.height_move;
-    var availableBelow = window.innerHeight - inputBottom;
-    var hintAbove = hintHeight > availableBelow;
-    var selectionHeight = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height_move) || 0;
-    var divOffset = ((_d = hintRef.current) === null || _d === void 0 ? void 0 : _d.offsetHeight) || 0;
-    var topV = hintAbove ? selectionHeight - (divOffset + 80) : selectionHeight + 4;
-    var el = (_e = document.getElementsByClassName("fx-hint")) === null || _e === void 0 ? void 0 : _e[0];
-    if (el && ((_f = el === null || el === void 0 ? void 0 : el.style) === null || _f === void 0 ? void 0 : _f.display) !== "none") {
+  var _f = (0, _react.useState)(belowCellTop),
+    top = _f[0],
+    setTop = _f[1];
+  var applyPlacement = (0, _react.useCallback)(function () {
+    var _a;
+    if ((firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top) == null || firstSelection.height_move == null) {
+      setTop(belowCellTop);
+      return;
+    }
+    var fromFx = from === "fx";
+    var cellH = Number(firstSelection.height_move) || cellHeightPx;
+    if (fromFx) {
+      setTop(25);
+      return;
+    }
+    var innerEl = hintRef.current;
+    var popupHeight = Math.min((innerEl === null || innerEl === void 0 ? void 0 : innerEl.offsetHeight) || 360, 360);
+    var inputBox = document.getElementById("luckysheet-input-box");
+    var rect = inputBox === null || inputBox === void 0 ? void 0 : inputBox.getBoundingClientRect();
+    if (!rect) {
+      setTop(cellH + 4);
+      return;
+    }
+    var cellBottomViewport = rect.top + cellH;
+    var availableBelow = window.innerHeight - cellBottomViewport - 12;
+    var preferBelow = popupHeight <= availableBelow;
+    var topV = preferBelow ? cellH + 4 : -(popupHeight + 8);
+    var fxHint = (_a = document.getElementsByClassName("fx-hint")) === null || _a === void 0 ? void 0 : _a[0];
+    if (fxHint && fxHint.style.display !== "none") {
       topV = 25;
     }
     setTop(topV);
-  };
-  (0, _react.useEffect)(function () {
-    calcuatePopUpPlacement();
-  });
+  }, [belowCellTop, cellHeightPx, firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height_move, firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.top, from]);
+  (0, _react.useLayoutEffect)(function () {
+    applyPlacement();
+    var id = requestAnimationFrame(applyPlacement);
+    return function () {
+      cancelAnimationFrame(id);
+    };
+  }, [applyPlacement, (_c = context.defaultCandidates) === null || _c === void 0 ? void 0 : _c.length, (_d = context.functionCandidates) === null || _d === void 0 ? void 0 : _d.length, context.functionHint]);
   if (_lodash.default.isEmpty(context.functionCandidates) && _lodash.default.isEmpty(context.defaultCandidates)) return null;
   return /*#__PURE__*/_react.default.createElement("div", {
-    className: "flex color-border-default border flex-col luckysheet-formula-search-c-p custom-scroll ".concat((props === null || props === void 0 ? void 0 : props.from) === "fx" ? "fx-search" : "cell-search"),
+    className: "flex color-border-default border flex-col luckysheet-formula-search-c-p custom-scroll ".concat(from === "fx" ? "fx-search" : "cell-search"),
     id: "luckysheet-formula-search-c-p",
     style: {
       top: top
     }
-  }, /*#__PURE__*/_react.default.createElement("div", __assign({}, props, {
+  }, /*#__PURE__*/_react.default.createElement("div", __assign({}, divProps, {
     ref: hintRef,
     id: "luckysheet-formula-search-c",
     className: "luckysheet-formula-search-c"

package/lib/components/SheetOverlay/InputBox.js

@@ -65,31 +65,34 @@ var InputBox = function InputBox() {
   var _x = (0, _react.useState)(0),
     commaCount = _x[0],
     setCommaCount = _x[1];
+  var _y = (0, _react.useState)(false),
+    cellEditorIsFormula = _y[0],
+    setCellEditorIsFormula = _y[1];
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
-  var _y = (0, _react.useState)(!hideFormulaHintLocal),
-    showFormulaHint = _y[0],
-    setShowFormulaHint = _y[1];
-  var _z = (0, _react.useState)(false),
-    showSearchHint = _z[0],
-    setShowSearchHint = _z[1];
+  var _z = (0, _react.useState)(!hideFormulaHintLocal),
+    showFormulaHint = _z[0],
+    setShowFormulaHint = _z[1];
+  var _0 = (0, _react.useState)(false),
+    showSearchHint = _0[0],
+    setShowSearchHint = _0[1];
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var isComposingRef = (0, _react.useRef)(false);
   var formulaAnchorCellRef = (0, _react.useRef)(null);
   var skipNextAnchorSelectionSyncRef = (0, _react.useRef)(false);
   var lastHandledMouseDragSignatureRef = (0, _react.useRef)("");
-  var _0 = (0, _useFormulaEditorHistory.useFormulaEditorHistory)(inputRef, refs.cellInput, refs.fxInput, setContext, "cell"),
-    formulaHistoryRef = _0.formulaHistoryRef,
-    preTextRef = _0.preTextRef,
-    resetFormulaHistory = _0.resetFormulaHistory,
-    handleFormulaHistoryUndoRedo = _0.handleFormulaHistoryUndoRedo,
-    capturePreFormulaState = _0.capturePreFormulaState,
-    appendFormulaHistoryFromPrimaryEditor = _0.appendFormulaHistoryFromPrimaryEditor;
+  var _1 = (0, _useFormulaEditorHistory.useFormulaEditorHistory)(inputRef, refs.cellInput, refs.fxInput, setContext, "cell"),
+    formulaHistoryRef = _1.formulaHistoryRef,
+    preTextRef = _1.preTextRef,
+    resetFormulaHistory = _1.resetFormulaHistory,
+    handleFormulaHistoryUndoRedo = _1.handleFormulaHistoryUndoRedo,
+    capturePreFormulaState = _1.capturePreFormulaState,
+    appendFormulaHistoryFromPrimaryEditor = _1.appendFormulaHistoryFromPrimaryEditor;
   var ZWSP = "\u200B";
   var inputBoxInnerRef = (0, _react.useRef)(null);
-  var _1 = (0, _react.useState)([]),
-    linkSelectionHighlightRects = _1[0],
-    setLinkSelectionHighlightRects = _1[1];
+  var _2 = (0, _react.useState)([]),
+    linkSelectionHighlightRects = _2[0],
+    setLinkSelectionHighlightRects = _2[1];
   var ensureNotEmpty = function ensureNotEmpty() {
     var el = inputRef.current;
     if (!el) return;
@@ -112,12 +115,11 @@ var InputBox = function InputBox() {
     return lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText;
   };
   var inputBoxStyle = (0, _react.useMemo)(function () {
-    var _a;
     if (firstSelectionActiveCell && context.luckysheetCellUpdate.length > 0) {
       var flowdata = (0, _fortuneCore.getFlowdata)(context);
       if (!flowdata) return {};
       var style = (0, _fortuneCore.getStyleByCell)(context, flowdata, firstSelectionActiveCell.row_focus, firstSelectionActiveCell.column_focus);
-      if (((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText.charAt(0)) === "=") {
+      if (cellEditorIsFormula) {
         style = __assign(__assign({}, style), {
           textAlign: "left"
         });
@@ -125,7 +127,7 @@ var InputBox = function InputBox() {
       return style;
     }
     return {};
-  }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, (_b = context === null || context === void 0 ? void 0 : context.luckysheetCellUpdate) === null || _b === void 0 ? void 0 : _b.length, firstSelectionActiveCell]);
+  }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, (_b = context === null || context === void 0 ? void 0 : context.luckysheetCellUpdate) === null || _b === void 0 ? void 0 : _b.length, firstSelectionActiveCell, cellEditorIsFormula]);
   (0, _react.useLayoutEffect)(function () {
     var _a;
     if (!context.allowEdit) {
@@ -145,10 +147,23 @@ var InputBox = function InputBox() {
       if (_lodash.default.isEqual(prevCellUpdate, context.luckysheetCellUpdate) && prevSheetId === context.currentSheetId) {
         return;
       }
+      var _b = context.luckysheetCellUpdate,
+        ur = _b[0],
+        uc = _b[1];
+      var pending_1 = refs.globalCache.pendingTypeOverCell;
+      if (pending_1 && pending_1[0] === ur && pending_1[1] === uc) {
+        refs.globalCache.overwriteCell = false;
+        if (inputRef.current) {
+          setCellEditorIsFormula(inputRef.current.innerText.trim().startsWith("="));
+        }
+        delete refs.globalCache.doNotFocus;
+        return;
+      }
       var flowdata = (0, _fortuneCore.getFlowdata)(context);
       var cell = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _a === void 0 ? void 0 : _a[col_index];
+      var overwrite = refs.globalCache.overwriteCell;
       var value_1 = "";
-      if (cell && !refs.globalCache.overwriteCell) {
+      if (cell && !overwrite) {
         if ((0, _fortuneCore.isInlineStringCell)(cell)) {
           value_1 = (0, _fortuneCore.getInlineStringHTML)(row_index, col_index, flowdata);
         } else if (cell.f) {
@@ -164,14 +179,20 @@ var InputBox = function InputBox() {
         }
       }
       refs.globalCache.overwriteCell = false;
+      var wroteEditorFromStoredCell = false;
       if (!refs.globalCache.ignoreWriteCell && inputRef.current && value_1) {
         inputRef.current.innerHTML = (0, _fortuneCore.escapeHTMLTag)((0, _fortuneCore.escapeScriptTag)(value_1));
-      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && !value_1) {
+        wroteEditorFromStoredCell = true;
+      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && !value_1 && !overwrite) {
         var valueD = (0, _fortuneCore.getCellValue)(row_index, col_index, flowdata, "f");
         inputRef.current.innerText = valueD;
+        wroteEditorFromStoredCell = true;
       }
       refs.globalCache.ignoreWriteCell = false;
-      if (!refs.globalCache.doNotFocus) {
+      if (inputRef.current) {
+        setCellEditorIsFormula(inputRef.current.innerText.trim().startsWith("="));
+      }
+      if (wroteEditorFromStoredCell && !refs.globalCache.doNotFocus) {
         setTimeout(function () {
           (0, _fortuneCore.moveToEnd)(inputRef.current);
         });
@@ -184,9 +205,15 @@ var InputBox = function InputBox() {
       if (inputRef.current) {
         inputRef.current.innerHTML = "";
       }
+      delete refs.globalCache.pendingTypeOverCell;
+      setCellEditorIsFormula(false);
       resetFormulaHistory();
     }
-  }, [context.luckysheetCellUpdate, resetFormulaHistory]);
+  }, [context.luckysheetCellUpdate, resetFormulaHistory, refs.globalCache]);
+  (0, _react.useEffect)(function () {
+    if (_lodash.default.isEmpty(context.luckysheetCellUpdate)) return;
+    delete refs.globalCache.pendingTypeOverCell;
+  }, [context.luckysheetCellUpdate, refs.globalCache]);
   (0, _react.useEffect)(function () {
     var _a;
     if (_lodash.default.isEmpty(context.luckysheetCellUpdate) || !refs.cellInput.current) {
@@ -382,7 +409,7 @@ var InputBox = function InputBox() {
     });
   }, [formulaMouseDragSignature, context.formulaCache.func_selectedrange, refs.cellInput, setContext]);
   var onKeyDown = (0, _react.useCallback)(function (e) {
-    var _a, _b;
+    var _a, _b, _c;
     setContext(function (draftCtx) {
       (0, _fortuneCore.setFormulaEditorOwner)(draftCtx, "cell");
     });
@@ -404,9 +431,9 @@ var InputBox = function InputBox() {
       setContext(function (draftCtx) {
         draftCtx.formulaCache.rangeSelectionActive = null;
       });
-      var _c = formulaAnchorCellRef.current,
-        anchorRow_1 = _c[0],
-        anchorCol_1 = _c[1];
+      var _d = formulaAnchorCellRef.current,
+        anchorRow_1 = _d[0],
+        anchorCol_1 = _d[1];
       skipNextAnchorSelectionSyncRef.current = true;
       setTimeout(function () {
         setContext(function (draftCtx) {
@@ -462,6 +489,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
+    var isInPlaceEditMode = ((_c = refs.globalCache) === null || _c === void 0 ? void 0 : _c.enteredEditByTyping) !== true;
     if (e.key === "Delete" || e.key === "Backspace") {
       var anchor = formulaAnchorCellRef.current;
       if (anchor != null) {
@@ -477,6 +505,12 @@ var InputBox = function InputBox() {
               row_focus: anchorRow_2,
               column_focus: anchorCol_2
             }];
+            (0, _fortuneCore.markRangeSelectionDirty)(draftCtx);
+            var el = refs.cellInput.current;
+            if (el && el.innerText.trim().startsWith("=")) {
+              (0, _fortuneCore.createRangeHightlight)(draftCtx, el.innerHTML);
+              (0, _fortuneCore.rangeHightlightselected)(draftCtx, el);
+            }
           });
         }, 0);
       }
@@ -507,7 +541,7 @@ var InputBox = function InputBox() {
       e.preventDefault();
     } else if (e.key === "F4" && context.luckysheetCellUpdate.length > 0) {
       e.preventDefault();
-    } else if (e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0 && allowListNavigation) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0 && allowListNavigation && !(e.shiftKey && isInPlaceEditMode)) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var formulaSearchContainer = document.getElementById("luckysheet-formula-search-c");
         var activeItem = formulaSearchContainer === null || formulaSearchContainer === void 0 ? void 0 : formulaSearchContainer.querySelector(".luckysheet-formula-search-item-active");
@@ -526,7 +560,7 @@ var InputBox = function InputBox() {
         }
       }
       e.preventDefault();
-    } else if (e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0 && allowListNavigation) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0 && allowListNavigation && !(e.shiftKey && isInPlaceEditMode)) {
       if (document.getElementById("luckysheet-formula-search-c")) {
         var formulaSearchContainer = document.getElementById("luckysheet-formula-search-c");
         var activeItem = formulaSearchContainer === null || formulaSearchContainer === void 0 ? void 0 : formulaSearchContainer.querySelector(".luckysheet-formula-search-item-active");
@@ -544,7 +578,7 @@ var InputBox = function InputBox() {
       }
       e.preventDefault();
     }
-  }, [capturePreFormulaState, clearSearchItemActiveClass, context.luckysheetCellUpdate.length, handleFormulaHistoryUndoRedo, selectActiveFormula, setContext, firstSelection]);
+  }, [capturePreFormulaState, clearSearchItemActiveClass, context.luckysheetCellUpdate.length, handleFormulaHistoryUndoRedo, selectActiveFormula, setContext, firstSelection, refs.cellInput]);
   var handleHideShowHint = function handleHideShowHint() {
     var _a, _b, _c, _d;
     var searchElFx = (_a = document.getElementsByClassName("fx-search")) === null || _a === void 0 ? void 0 : _a[0];
@@ -565,10 +599,12 @@ var InputBox = function InputBox() {
     }
   };
   var onChange = (0, _react.useCallback)(function (__, isBlur) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
-    setShowSearchHint((0, _helper.shouldShowFormulaFunctionList)((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) !== null && _a !== void 0 ? _a : null));
+    var editorText = (_c = (_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText) === null || _b === void 0 ? void 0 : _b.trim()) !== null && _c !== void 0 ? _c : "";
+    setCellEditorIsFormula(editorText.startsWith("="));
+    setShowSearchHint((0, _helper.shouldShowFormulaFunctionList)((_d = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) !== null && _d !== void 0 ? _d : null));
     if (!isComposingRef.current) {
       var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
       setCommaCount(currentCommaCount);
@@ -576,7 +612,7 @@ var InputBox = function InputBox() {
     var e = lastKeyDownEventRef.current;
     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("=")))) {
+      if (cellEl_1 && (((_e = cellEl_1.innerText) === null || _e === void 0 ? void 0 : _e.trim().startsWith("=")) || ((_f = cellEl_1.textContent) === null || _f === void 0 ? void 0 : _f.trim().startsWith("=")))) {
         setContext(function (draftCtx) {
           if (!(0, _fortuneCore.isAllowEdit)(draftCtx, draftCtx.luckysheet_select_save)) return;
           (0, _fortuneCore.rangeHightlightselected)(draftCtx, cellEl_1);
@@ -591,11 +627,16 @@ var InputBox = function InputBox() {
     });
     if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || e.ctrlKey && kcode === 86) {
       setContext(function (draftCtx) {
+        var _a, _b;
         if ((draftCtx.formulaCache.rangestart || draftCtx.formulaCache.rangedrag_column_start || draftCtx.formulaCache.rangedrag_row_start || (0, _fortuneCore.israngeseleciton)(draftCtx)) && isBlur) return;
         if (!(0, _fortuneCore.isAllowEdit)(draftCtx, draftCtx.luckysheet_select_save)) {
           return;
         }
         (0, _fortuneCore.handleFormulaInput)(draftCtx, refs.fxInput.current, refs.cellInput.current, kcode, preTextRef.current);
+        var cellEl = refs.cellInput.current;
+        if (cellEl && (((_a = cellEl.innerText) === null || _a === void 0 ? void 0 : _a.trim().startsWith("=")) || ((_b = cellEl.textContent) === null || _b === void 0 ? void 0 : _b.trim().startsWith("=")))) {
+          (0, _fortuneCore.rangeHightlightselected)(draftCtx, cellEl);
+        }
       });
     }
   }, [refs.cellInput, refs.fxInput, setContext, appendFormulaHistoryFromPrimaryEditor]);

package/lib/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;
@@ -801,44 +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;
-}
-
-.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/lib/components/SheetOverlay/index.js

@@ -37,6 +37,22 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+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 = (0, _react.useContext)(_context.default),
@@ -58,6 +74,7 @@ var SheetOverlay = function SheetOverlay() {
       setContext(function (draftCtx) {
         var _a;
         (0, _fortuneCore.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 || (0, _fortuneCore.israngeseleciton)(draftCtx));
         if (!_lodash.default.isEmpty((_a = draftCtx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0]) && refs.cellInput.current) {
           if (!(0, _fortuneCore.isAllowEdit)(draftCtx)) {
             setTimeout(function () {
@@ -69,7 +86,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();
+              }
             });
           }
         }
@@ -299,18 +322,7 @@ var SheetOverlay = function SheetOverlay() {
       });
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "fortune-selection-copy-hc",
-      style: {
-        backgroundColor: backgroundColor
-      }
-    }), ["lt", "rt", "lb", "rb"].map(function (d) {
-      return /*#__PURE__*/_react.default.createElement("div", {
-        key: d,
-        "data-type": d,
-        className: "fortune-selection-highlight-".concat(d, " luckysheet-highlight"),
-        style: {
-          backgroundColor: backgroundColor
-        }
-      });
+      style: formulaRangeHighlightHcStyle(backgroundColor)
     }));
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-row-count-show luckysheet-count-show",

package/lib/hooks/useRerenderOnFormulaCaret.js

@@ -9,7 +9,9 @@ function useRerenderOnFormulaCaret(editorRef, editSessionActive) {
   var _a = (0, _react.useState)(0),
     bump = _a[1];
   (0, _react.useEffect)(function () {
-    if (!editSessionActive) return;
+    if (!editSessionActive) {
+      return function () {};
+    }
     var onSelectionChange = function onSelectionChange() {
       var _a, _b;
       var el = editorRef.current;
@@ -26,7 +28,7 @@ function useRerenderOnFormulaCaret(editorRef, editSessionActive) {
     };
     document.addEventListener("selectionchange", onSelectionChange);
     return function () {
-      return document.removeEventListener("selectionchange", onSelectionChange);
+      document.removeEventListener("selectionchange", onSelectionChange);
     };
   }, [editSessionActive, editorRef]);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.11-input-ref-1",
+  "version": "1.3.11-input-ref-3",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.11-input-ref-1",
+    "@fileverse-dev/fortune-core": "1.3.11-input-ref-3",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",