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

package/es/components/ConditionFormat/ConditionRules.js

@@ -294,6 +294,10 @@ var ConditionRules = function ConditionRules(_a) {
     text: "textContains",
     value: "()",
     label: "Text Contains"
+  }, {
+    text: "empty",
+    value: "",
+    label: "Empty"
   }, {
     text: "occurrenceDate",
     value: conditionformat.yesterday,
@@ -334,7 +338,7 @@ var ConditionRules = function ConditionRules(_a) {
       marginBottom: "16px"
     }
   }, matchedConditionFormatKey.map(function (key) {
-    var _a, _b;
+    var _a, _b, _c;
     return /*#__PURE__*/React.createElement("div", {
       onClick: function onClick() {
         var _a;
@@ -385,10 +389,10 @@ var ConditionRules = function ConditionRules(_a) {
     }, /*#__PURE__*/React.createElement("h3", {
       className: "fortune-condition-rules__heading condition-list-type",
       "data-testid": "condition-rules-heading-".concat(key)
-    }, conditionformat[allConditionFormats[key].conditionName], " ", (_a = allConditionFormats[key].conditionValue) === null || _a === void 0 ? void 0 : _a[0]), /*#__PURE__*/React.createElement("p", {
+    }, conditionformat[allConditionFormats[key].conditionName], allConditionFormats[key].conditionName !== "empty" && " ".concat((_b = (_a = allConditionFormats[key].conditionValue) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : "")), /*#__PURE__*/React.createElement("p", {
       className: "fortune-condition-rules__para condition-list-range",
       "data-testid": "condition-rules-para-".concat(key)
-    }, (_b = allConditionFormats[key].cellrange) === null || _b === void 0 ? void 0 : _b.map(function (range) {
+    }, (_c = allConditionFormats[key].cellrange) === null || _c === void 0 ? void 0 : _c.map(function (range) {
       var startCol = numberToColumn(range.column[0] + 1);
       var endCol = numberToColumn(range.column[1] + 1);
       var startRow = range.row[0] + 1;
@@ -467,6 +471,12 @@ var ConditionRules = function ConditionRules(_a) {
   }, "Format cells if"), /*#__PURE__*/React.createElement(Select, {
     value: type,
     onValueChange: function onValueChange(value) {
+      if (value === "empty" || type === "empty") {
+        setContext(function (ctx) {
+          ctx.conditionRules.rulesValue = "";
+        });
+        setEditConditionFormatValue(null);
+      }
       setType(value);
     }
   }, /*#__PURE__*/React.createElement(SelectTrigger, null, /*#__PURE__*/React.createElement(SelectValue, null, /*#__PURE__*/React.createElement("div", {
@@ -804,7 +814,7 @@ var ConditionRules = function ConditionRules(_a) {
     },
     tabIndex: 0
   }, button.cancel), editConditionFormatKey !== null ? (/*#__PURE__*/React.createElement(Button, {
-    disabled: context.conditionRules.rulesValue === "",
+    disabled: context.conditionRules.rulesValue === "" && type !== "empty",
     variant: "default",
     style: {
       minWidth: "80px"
@@ -814,7 +824,7 @@ var ConditionRules = function ConditionRules(_a) {
     },
     tabIndex: 0
   }, "Update rule")) : (/*#__PURE__*/React.createElement(Button, {
-    disabled: context.conditionRules.rulesValue === "",
+    disabled: context.conditionRules.rulesValue === "" && type !== "empty",
     variant: "default",
     style: {
       minWidth: "80px"

package/es/components/ConditionFormat/index.js

@@ -107,6 +107,9 @@ var ConditionalFormat = function ConditionalFormat(_a) {
       }, {
         text: "textContains",
         value: "()"
+      }, {
+        text: "empty",
+        value: ""
       }, {
         text: "occurrenceDate",
         value: conditionformat.yesterday

package/es/components/ContextMenu/index.js

@@ -129,7 +129,7 @@ import "./index.css";
 import Menu from "./Menu";
 import "tippy.js/dist/tippy.css";
 import SVGIcon from "../SVGIcon";
-import { LucideIcon as LocalLucidIcon } from "../../components/SheetOverlay/LucideIcon";
+import { LucideIcon as LocalLucidIcon } from "../SheetOverlay/LucideIcon";
 var ContextMenu = function ContextMenu() {
   var showDialog = useDialog().showDialog;
   var containerRef = useRef(null);

package/es/components/DataVerification/ColorPicker.js

@@ -6,7 +6,7 @@ export var TEXT_COLORS = [{
   value: "228, 232, 237"
 }, {
   name: "White",
-  value: "249, 249, 249"
+  value: "219, 233, 236"
 }, {
   name: "Pink",
   value: "244, 217, 227"

package/es/components/FxEditor/index.js

@@ -1,47 +1,75 @@
-import { getFlowdata, cancelNormalSelected, getCellValue, updateCell, getInlineStringNoStyle, isInlineStringCell, escapeScriptTag, moveHighlightCell, handleFormulaInput, rangeHightlightselected, valueShowEs, isShowHidenCR, escapeHTMLTag, isAllowEdit } from "@fileverse-dev/fortune-core";
-import React, { useContext, useState, useCallback, useEffect, useRef, useMemo } from "react";
+import { getFlowdata, cancelNormalSelected, getCellValue, updateCell, getInlineStringNoStyle, isInlineStringCell, escapeScriptTag, moveHighlightCell, handleFormulaInput, getFormulaRangeIndexAtCaret, isCaretAtValidFormulaRangeInsertionPoint, markRangeSelectionDirty, rangeHightlightselected, getFormulaEditorOwner, setFormulaEditorOwner, createRangeHightlight, valueShowEs, isShowHidenCR, escapeHTMLTag, functionHTMLGenerate, isAllowEdit, suppressFormulaRangeSelectionForInitialEdit } from "@fileverse-dev/fortune-core";
+import React, { useContext, useState, useCallback, useEffect, useLayoutEffect, useRef, useMemo } from "react";
 import "./index.css";
 import _ from "lodash";
+import { Tooltip } from "@fileverse/ui";
 import WorkbookContext from "../../context";
 import ContentEditable from "../SheetOverlay/ContentEditable";
 import NameBox from "./NameBox";
-import FormulaSearch from "../../components/SheetOverlay/FormulaSearch";
-import FormulaHint from "../../components/SheetOverlay/FormulaHint";
+import FormulaSearch from "../SheetOverlay/FormulaSearch";
+import FormulaHint from "../SheetOverlay/FormulaHint";
 import usePrevious from "../../hooks/usePrevious";
-import { LucideIcon } from "../../components/SheetOverlay/LucideIcon";
-import { countCommasBeforeCursor, isLetterNumberPattern, moveCursorToEnd } from "../../components/SheetOverlay/helper";
+import { useFormulaEditorHistory } from "../../hooks/useFormulaEditorHistory";
+import { useRerenderOnFormulaCaret } from "../../hooks/useRerenderOnFormulaCaret";
+import { LucideIcon } from "../SheetOverlay/LucideIcon";
+import { countCommasBeforeCursor, getCursorPosition, getFunctionNameFromFormulaCaretSpans, isLetterNumberPattern, setCursorPosition, buildFormulaSuggestionText, shouldShowFormulaFunctionList } from "../SheetOverlay/helper";
+import { isFormulaSegmentBoundaryKey } from "../SheetOverlay/formula-segment-boundary";
 var FxEditor = function FxEditor() {
-  var _a;
+  var _a, _b, _c;
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
-  var _b = useState(false),
-    showSearchHint = _b[0],
-    setShowSearchHint = _b[1];
-  var _c = useState(!hideFormulaHintLocal),
-    showFormulaHint = _c[0],
-    setShowFormulaHint = _c[1];
-  var _d = useState(0),
-    commaCount = _d[0],
-    setCommaCount = _d[1];
-  var _e = useContext(WorkbookContext),
-    context = _e.context,
-    setContext = _e.setContext,
-    refs = _e.refs;
+  var _d = useState(false),
+    showSearchHint = _d[0],
+    setShowSearchHint = _d[1];
+  var _e = useState(!hideFormulaHintLocal),
+    showFormulaHint = _e[0],
+    setShowFormulaHint = _e[1];
+  var _f = useState(0),
+    commaCount = _f[0],
+    setCommaCount = _f[1];
+  var _g = useContext(WorkbookContext),
+    context = _g.context,
+    setContext = _g.setContext,
+    refs = _g.refs;
   var lastKeyDownEventRef = useRef(null);
+  var _h = useFormulaEditorHistory(refs.fxInput, refs.cellInput, refs.fxInput, setContext, "fx"),
+    formulaHistoryRef = _h.formulaHistoryRef,
+    preTextRef = _h.preTextRef,
+    resetFormulaHistory = _h.resetFormulaHistory,
+    handleFormulaHistoryUndoRedo = _h.handleFormulaHistoryUndoRedo,
+    capturePreFormulaState = _h.capturePreFormulaState,
+    appendFormulaHistoryFromPrimaryEditor = _h.appendFormulaHistoryFromPrimaryEditor;
   var inputContainerRef = useRef(null);
-  var _f = useState(false),
-    isHidenRC = _f[0],
-    setIsHidenRC = _f[1];
+  var _j = useState(false),
+    isHidenRC = _j[0],
+    setIsHidenRC = _j[1];
   var firstSelection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
   var prevFirstSelection = usePrevious(firstSelection);
+  var prevCellUpdate = usePrevious(context.luckysheetCellUpdate);
   var prevSheetId = usePrevious(context.currentSheetId);
   var recentText = useRef("");
+  var formulaAnchorCellRef = useRef(null);
   var handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
   };
+  useEffect(function () {
+    var handleKeyDown = function handleKeyDown(event) {
+      if (event.key === "F10") {
+        event.preventDefault();
+        handleShowFormulaHint();
+      }
+    };
+    window.addEventListener("keydown", handleKeyDown);
+    return function () {
+      return window.removeEventListener("keydown", handleKeyDown);
+    };
+  }, [showFormulaHint]);
   useEffect(function () {
     var _a;
     setIsHidenRC(isShowHidenCR(context));
+    if (context.luckysheetCellUpdate.length > 0) {
+      return;
+    }
     if (_.isEqual(prevFirstSelection, firstSelection) && context.currentSheetId === prevSheetId) {
       return;
     }
@@ -65,7 +93,74 @@ var FxEditor = function FxEditor() {
     } else {
       refs.fxInput.current.innerHTML = "";
     }
-  }, [context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
+  }, [context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save, context.luckysheetCellUpdate.length]);
+  useLayoutEffect(function () {
+    var _a;
+    var fxInput = refs.fxInput.current;
+    if (context.luckysheetCellUpdate.length === 0 || !fxInput) {
+      return;
+    }
+    if (refs.globalCache.doNotUpdateCell) {
+      delete refs.globalCache.doNotUpdateCell;
+      return;
+    }
+    if (_.isEqual(prevCellUpdate, context.luckysheetCellUpdate) && prevSheetId === context.currentSheetId) {
+      return;
+    }
+    var _b = context.luckysheetCellUpdate,
+      rowIndex = _b[0],
+      colIndex = _b[1];
+    if (_.isNil(rowIndex) || _.isNil(colIndex)) {
+      return;
+    }
+    var pending = refs.globalCache.pendingTypeOverCell;
+    if (pending && pending[0] === rowIndex && pending[1] === colIndex) {
+      refs.globalCache.overwriteCell = false;
+      refs.globalCache.ignoreWriteCell = false;
+      return;
+    }
+    var flowdata = getFlowdata(context);
+    if (!flowdata) {
+      return;
+    }
+    var cell = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[rowIndex]) === null || _a === void 0 ? void 0 : _a[colIndex];
+    var value = "";
+    var overwrite = refs.globalCache.overwriteCell;
+    if (cell && !overwrite) {
+      if (isInlineStringCell(cell)) {
+        value = getInlineStringNoStyle(rowIndex, colIndex, flowdata);
+      } else if (cell.f) {
+        value = getCellValue(rowIndex, colIndex, flowdata, "f");
+      } else {
+        value = valueShowEs(rowIndex, colIndex, flowdata);
+      }
+    }
+    refs.globalCache.overwriteCell = false;
+    if (!refs.globalCache.ignoreWriteCell && value) {
+      fxInput.innerHTML = escapeHTMLTag(escapeScriptTag(value));
+    } else if (!refs.globalCache.ignoreWriteCell && !overwrite) {
+      var valueD = getCellValue(rowIndex, colIndex, flowdata, "f");
+      fxInput.innerText = valueD;
+    }
+    refs.globalCache.ignoreWriteCell = false;
+  }, [context.luckysheetCellUpdate, context.luckysheetfile, context.currentSheetId, prevCellUpdate, prevSheetId, refs.fxInput, refs.globalCache]);
+  useEffect(function () {
+    if (_.isEmpty(context.luckysheetCellUpdate)) {
+      delete refs.globalCache.pendingTypeOverCell;
+      resetFormulaHistory();
+    }
+  }, [context.luckysheetCellUpdate, resetFormulaHistory, refs.globalCache]);
+  useEffect(function () {
+    var _a;
+    if (_.isEmpty(context.luckysheetCellUpdate) || !refs.fxInput.current) {
+      formulaAnchorCellRef.current = null;
+      return;
+    }
+    var inputText = ((_a = refs.fxInput.current.innerText) === null || _a === void 0 ? void 0 : _a.trim()) || "";
+    if (!inputText.startsWith("=")) {
+      formulaAnchorCellRef.current = null;
+    }
+  }, [context.luckysheetCellUpdate, refs.fxInput]);
   var onFocus = useCallback(function () {
     var _a, _b;
     if (context.allowEdit === false) {
@@ -73,31 +168,55 @@ var FxEditor = function FxEditor() {
     }
     if (((_b = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 && !context.luckysheet_cell_selected_move && isAllowEdit(context, context.luckysheet_select_save)) {
       setContext(function (draftCtx) {
+        var _a;
+        setFormulaEditorOwner(draftCtx, "fx");
         var last = draftCtx.luckysheet_select_save[draftCtx.luckysheet_select_save.length - 1];
         var row_index = last.row_focus;
         var col_index = last.column_focus;
-        draftCtx.luckysheetCellUpdate = [row_index, col_index];
-        refs.globalCache.doNotFocus = true;
+        if (!_.isNil(row_index) && !_.isNil(col_index)) {
+          var flowdata = getFlowdata(draftCtx);
+          var cellAt = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _a === void 0 ? void 0 : _a[col_index];
+          if ((cellAt === null || cellAt === void 0 ? void 0 : cellAt.f) != null && String(cellAt.f).trim() !== "") {
+            suppressFormulaRangeSelectionForInitialEdit(draftCtx);
+          }
+        }
+        var currentUpdate = draftCtx.luckysheetCellUpdate || [];
+        var alreadyEditingSameCell = currentUpdate.length === 2 && currentUpdate[0] === row_index && currentUpdate[1] === col_index;
+        if (!alreadyEditingSameCell) {
+          refs.globalCache.doNotUpdateCell = true;
+          draftCtx.luckysheetCellUpdate = [row_index, col_index];
+          refs.globalCache.doNotFocus = true;
+        }
       });
     }
+    setContext(function (draftCtx) {
+      setFormulaEditorOwner(draftCtx, "fx");
+    });
   }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, refs.globalCache, setContext]);
   var getActiveFormula = useCallback(function () {
     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);
+    setShowSearchHint(shouldShowFormulaFunctionList(fxEditor));
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];
-      draftCtx.functionHint = formulaName;
+      draftCtx.functionHint = (formulaName || "").toUpperCase();
     });
-  }, [setContext]);
+  }, [refs.fxInput, setContext]);
   var clearSearchItemActiveClass = useCallback(function () {
     var activeFormula = getActiveFormula();
     if (activeFormula) {
@@ -113,10 +232,11 @@ var FxEditor = function FxEditor() {
     return lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText;
   };
   var selectActiveFormulaOnClick = useCallback(function (e) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (e.target.className.includes("sign-fortune")) return;
-    recentText.current = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current.innerText;
-    var formulaName = (_c = (_b = getActiveFormula()) === null || _b === void 0 ? void 0 : _b.querySelector(".luckysheet-formula-search-func")) === null || _c === void 0 ? void 0 : _c.textContent;
+    preTextRef.current = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current.innerText;
+    recentText.current = (_b = refs.fxInput) === null || _b === void 0 ? void 0 : _b.current.innerText;
+    var formulaName = (_d = (_c = getActiveFormula()) === null || _c === void 0 ? void 0 : _c.querySelector(".luckysheet-formula-search-func")) === null || _d === void 0 ? void 0 : _d.textContent;
     var lastSpanText = getLastInputSpanText();
     if (formulaName && !isLetterNumberPattern(lastSpanText)) {
       insertSelectedFormula(formulaName);
@@ -125,18 +245,103 @@ var FxEditor = function FxEditor() {
     }
   }, [getActiveFormula, insertSelectedFormula]);
   var onKeyDown = useCallback(function (e) {
-    var _a;
+    var _a, _b, _c, _d;
+    if (e.key === "Delete" || e.key === "Backspace") {
+      var anchor = formulaAnchorCellRef.current;
+      if (anchor != null) {
+        var anchorRow_1 = anchor[0],
+          anchorCol_1 = anchor[1];
+        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
+            }];
+            markRangeSelectionDirty(draftCtx);
+            var el = refs.fxInput.current;
+            if (el && el.innerText.trim().startsWith("=")) {
+              createRangeHightlight(draftCtx, el.innerHTML);
+              rangeHightlightselected(draftCtx, el);
+            }
+          });
+        }, 0);
+      }
+    }
     if (context.allowEdit === false) {
       return;
     }
+    setContext(function (draftCtx) {
+      setFormulaEditorOwner(draftCtx, "fx");
+    });
     var currentCommaCount = countCommasBeforeCursor((_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current);
     setCommaCount(currentCommaCount);
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
-    var key = e.key;
+    capturePreFormulaState();
     recentText.current = refs.fxInput.current.innerText;
-    if (key === "ArrowLeft" || key === "ArrowRight") {
+    var key = e.key;
+    var currentInputText = ((_c = (_b = refs.fxInput.current) === null || _b === void 0 ? void 0 : _b.innerText) === null || _c === void 0 ? void 0 : _c.trim()) || "";
+    if ((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 (key === "(" && currentInputText.startsWith("=")) {
+      setContext(function (draftCtx) {
+        draftCtx.formulaCache.rangeSelectionActive = null;
+      });
+    }
+    if (isFormulaSegmentBoundaryKey(key) && context.luckysheetCellUpdate.length > 0 && currentInputText.startsWith("=") && formulaAnchorCellRef.current) {
+      setContext(function (draftCtx) {
+        draftCtx.formulaCache.rangeSelectionActive = null;
+      });
+      var _e = formulaAnchorCellRef.current,
+        anchorRow_2 = _e[0],
+        anchorCol_2 = _e[1];
+      setTimeout(function () {
+        setContext(function (draftCtx) {
+          var _a, _b;
+          draftCtx.luckysheetCellUpdate = [anchorRow_2, anchorCol_2];
+          draftCtx.luckysheet_select_save = [{
+            row: [anchorRow_2, anchorRow_2],
+            column: [anchorCol_2, anchorCol_2],
+            row_focus: anchorRow_2,
+            column_focus: anchorCol_2
+          }];
+          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;
+          createRangeHightlight(draftCtx, ((_a = refs.fxInput.current) === null || _a === void 0 ? void 0 : _a.innerHTML) || ((_b = refs.cellInput.current) === null || _b === void 0 ? void 0 : _b.innerHTML) || "");
+          moveHighlightCell(draftCtx, "down", 0, "rangeOfSelect");
+        });
+      }, 0);
+    }
+    var isArrowKey = key === "ArrowUp" || key === "ArrowDown" || key === "ArrowLeft" || key === "ArrowRight";
+    var isDirectPlainTypeEdit = context.luckysheetCellUpdate.length > 0 && ((_d = refs.globalCache) === null || _d === void 0 ? void 0 : _d.enteredEditByTyping) === true && !currentInputText.startsWith("=");
+    var sheetArrowShortcut = isArrowKey && (e.metaKey || e.ctrlKey || e.shiftKey);
+    if ((key === "ArrowLeft" || key === "ArrowRight") && !(isDirectPlainTypeEdit && sheetArrowShortcut)) {
       e.stopPropagation();
     }
+    if ((e.metaKey || e.ctrlKey) && context.luckysheetCellUpdate.length > 0) {
+      if (e.code === "KeyZ" || e.code === "KeyY") {
+        var shouldUseFormulaHistory = currentInputText.startsWith("=") || formulaHistoryRef.current.active;
+        if (shouldUseFormulaHistory) {
+          var handledByFormulaHistory = handleFormulaHistoryUndoRedo(e.code === "KeyY" || e.code === "KeyZ" && e.shiftKey);
+          if (handledByFormulaHistory) {
+            e.preventDefault();
+          }
+        }
+        e.stopPropagation();
+        return;
+      }
+    }
     if ((e.key === "Enter" || e.key === "Tab") && context.luckysheetCellUpdate.length > 0) {
       if (e.altKey || e.metaKey) {
         document.execCommand("insertHTML", false, "\n ");
@@ -148,7 +353,7 @@ var FxEditor = function FxEditor() {
       }
       return;
     }
-    if (e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0) {
+    if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowUp" && context.luckysheetCellUpdate.length > 0) {
       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");
@@ -167,7 +372,7 @@ var FxEditor = function FxEditor() {
         }
       }
       e.preventDefault();
-    } else if (e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0) {
+    } else if (!(e.metaKey || e.ctrlKey) && e.key === "ArrowDown" && context.luckysheetCellUpdate.length > 0) {
       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");
@@ -226,7 +431,7 @@ var FxEditor = function FxEditor() {
         }
       }
     });
-  }, [context.allowEdit, context.luckysheetCellUpdate.length, refs.fxInput, setContext]);
+  }, [capturePreFormulaState, context.allowEdit, context.luckysheetCellUpdate, handleFormulaHistoryUndoRedo, refs.cellInput, refs.fxInput, setContext]);
   var handleHideShowHint = function handleHideShowHint() {
     var _a, _b, _c, _d;
     var el = (_a = document.getElementsByClassName("cell-hint")) === null || _a === void 0 ? void 0 : _a[0];
@@ -247,26 +452,54 @@ var FxEditor = function FxEditor() {
     }
   };
   var onChange = useCallback(function () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (context.isFlvReadOnly) return;
-    handleHideShowHint();
-    if (((_b = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
-      setShowSearchHint(true);
-    } else {
-      setShowSearchHint(false);
+    var fxEl = refs.fxInput.current;
+    if (fxEl && context.luckysheetCellUpdate.length === 2 && formulaAnchorCellRef.current == null) {
+      var t = ((_a = fxEl.innerText) === null || _a === void 0 ? void 0 : _a.trim()) || "";
+      if (t.startsWith("=")) {
+        formulaAnchorCellRef.current = [context.luckysheetCellUpdate[0], context.luckysheetCellUpdate[1]];
+      }
     }
-    var currentCommaCount = countCommasBeforeCursor((_c = refs.fxInput) === null || _c === void 0 ? void 0 : _c.current);
+    handleHideShowHint();
+    setShowSearchHint(shouldShowFormulaFunctionList((_c = (_b = refs.fxInput) === null || _b === void 0 ? void 0 : _b.current) !== null && _c !== void 0 ? _c : null));
+    var currentCommaCount = countCommasBeforeCursor((_d = refs.fxInput) === null || _d === void 0 ? void 0 : _d.current);
     setCommaCount(currentCommaCount);
     var e = lastKeyDownEventRef.current;
-    if (!e) return;
+    if (!e) {
+      var fx = refs.fxInput.current;
+      var cell = refs.cellInput.current;
+      var isFormula = function isFormula(el) {
+        var _a, _b;
+        return !!(((_a = el === null || el === void 0 ? void 0 : el.innerText) === null || _a === void 0 ? void 0 : _a.trim().startsWith("=")) || ((_b = el === null || el === void 0 ? void 0 : el.textContent) === null || _b === void 0 ? void 0 : _b.trim().startsWith("=")));
+      };
+      var sel = window.getSelection();
+      var editor_1 = null;
+      if (sel === null || sel === void 0 ? void 0 : sel.rangeCount) {
+        var node = sel.getRangeAt(0).startContainer;
+        if ((fx === null || fx === void 0 ? void 0 : fx.contains(node)) && isFormula(fx)) editor_1 = fx;else if ((cell === null || cell === void 0 ? void 0 : cell.contains(node)) && isFormula(cell)) editor_1 = cell;
+      }
+      if (!editor_1 && isFormula(fx)) editor_1 = fx;else if (!editor_1 && isFormula(cell)) editor_1 = cell;
+      if (editor_1) {
+        setContext(function (draftCtx) {
+          if (!isAllowEdit(draftCtx, draftCtx.luckysheet_select_save)) return;
+          rangeHightlightselected(draftCtx, editor_1);
+        });
+      }
+      return;
+    }
     var kcode = e.keyCode;
     if (!kcode) return;
+    appendFormulaHistoryFromPrimaryEditor(function () {
+      return getCursorPosition(refs.fxInput.current);
+    });
     if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || e.ctrlKey && kcode === 86) {
       setContext(function (draftCtx) {
         handleFormulaInput(draftCtx, refs.cellInput.current, refs.fxInput.current, kcode, recentText.current);
       });
     }
-  }, [refs.cellInput, refs.fxInput, setContext]);
+  }, [appendFormulaHistoryFromPrimaryEditor, context.isFlvReadOnly, context.luckysheetCellUpdate, refs.cellInput, refs.fxInput, setContext]);
+  useRerenderOnFormulaCaret(refs.fxInput, context.luckysheetCellUpdate.length > 0);
   var getFunctionNameFromInput = useCallback(function () {
     var _a, _b, _c, _d;
     var inputText = ((_b = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.innerText) || "";
@@ -283,8 +516,9 @@ var FxEditor = function FxEditor() {
     }
     return null;
   }, []);
-  var functionName = context.functionHint || getFunctionNameFromInput();
+  var functionName = (_c = (_b = getFunctionNameFromFormulaCaretSpans(refs.fxInput.current)) !== null && _b !== void 0 ? _b : context.functionHint) !== null && _c !== void 0 ? _c : getFunctionNameFromInput();
   var fn = functionName ? context.formulaCache.functionlistMap[functionName] : null;
+  var showFxFormulaChrome = context.luckysheetCellUpdate.length > 0 && getFormulaEditorOwner(context) === "fx";
   var allowEdit = useMemo(function () {
     if (context.allowEdit === false) {
       return false;
@@ -298,9 +532,9 @@ var FxEditor = function FxEditor() {
     return true;
   }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, isHidenRC]);
   var divRef = useRef(null);
-  var _g = useState(false),
-    isResizing = _g[0],
-    setIsResizing = _g[1];
+  var _k = useState(false),
+    isResizing = _k[0],
+    setIsResizing = _k[1];
   var startResize = function startResize(e) {
     e.preventDefault();
     setIsResizing(true);
@@ -319,7 +553,7 @@ var FxEditor = function FxEditor() {
     document.addEventListener("mouseup", _onMouseUp);
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-    className: "fortune-fx-editor",
+    className: showFxFormulaChrome ? "fortune-fx-editor fortune-fx-editor--formula-owner" : "fortune-fx-editor",
     ref: divRef
   }, /*#__PURE__*/React.createElement(NameBox, null), /*#__PURE__*/React.createElement("div", {
     className: "fortune-fx-icon",
@@ -346,8 +580,20 @@ var FxEditor = function FxEditor() {
     onMouseUp: function onMouseUp() {
       var _a;
       handleHideShowHint();
-      var currentCommaCount = countCommasBeforeCursor((_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current);
+      setContext(function (draftCtx) {
+        setFormulaEditorOwner(draftCtx, "fx");
+      });
+      var editor = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current;
+      var currentCommaCount = countCommasBeforeCursor(editor);
       setCommaCount(currentCommaCount);
+      setContext(function (draftCtx) {
+        if (draftCtx.formulaCache.rangeSelectionActive !== true) return;
+        var clickedInsideManagedRange = getFormulaRangeIndexAtCaret(editor) !== null;
+        var atValidInsertionPoint = isCaretAtValidFormulaRangeInsertionPoint(editor);
+        if (clickedInsideManagedRange || !atValidInsertionPoint) {
+          markRangeSelectionDirty(draftCtx);
+        }
+      });
     },
     innerRef: function innerRef(e) {
       refs.fxInput.current = e;
@@ -360,7 +606,7 @@ var FxEditor = function FxEditor() {
     onChange: onChange,
     tabIndex: 0,
     allowEdit: allowEdit && !context.isFlvReadOnly
-  }), showSearchHint && (/*#__PURE__*/React.createElement(FormulaSearch, {
+  }), (context.functionCandidates.length > 0 || context.functionHint || context.defaultCandidates.length > 0 || fn) && showFxFormulaChrome && (/*#__PURE__*/React.createElement(React.Fragment, null, showSearchHint && (/*#__PURE__*/React.createElement(FormulaSearch, {
     from: "fx",
     onMouseMove: function onMouseMove(e) {
       if (document.getElementById("luckysheet-formula-search-c")) {
@@ -376,12 +622,22 @@ var FxEditor = function FxEditor() {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "fx-hint"
-  }, showFormulaHint && fn && (/*#__PURE__*/React.createElement(FormulaHint, {
+  }, showFormulaHint && fn && !showSearchHint && (/*#__PURE__*/React.createElement(FormulaHint, {
     handleShowFormulaHint: handleShowFormulaHint,
     showFormulaHint: showFormulaHint,
     commaCount: commaCount,
     functionName: functionName
-  })), !showFormulaHint && fn && (/*#__PURE__*/React.createElement("div", {
+  })), !showFormulaHint && fn && !showSearchHint && (/*#__PURE__*/React.createElement(Tooltip, {
+    text: "Turn on formula suggestions (F10)",
+    placement: "top",
+    defaultOpen: true,
+    style: {
+      position: "absolute",
+      top: "-50px",
+      left: "-130px",
+      width: "210px"
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-hin absolute show-more-btn",
     onClick: function onClick() {
       handleShowFormulaHint();
@@ -395,7 +651,7 @@ var FxEditor = function FxEditor() {
       margin: "auto",
       marginTop: "1px"
     }
-  })))))), /*#__PURE__*/React.createElement("div", {
+  }))))))))), /*#__PURE__*/React.createElement("div", {
     className: "resize-handle",
     onMouseDown: startResize,
     style: {