@fileverse-dev/fortune-react 1.3.10 → 1.3.11-mixed

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/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/SheetOverlay/InputBox.js

@@ -17,50 +17,50 @@ 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, isLetterNumberPattern, removeLastSpan, 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, _o;
+  var _p = useContext(WorkbookContext),
+    context = _p.context,
+    setContext = _p.setContext,
+    refs = _p.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];
-  var _r = useState(""),
-    activeRefCell = _r[0],
-    setActiveRefCell = _r[1];
-  var _s = useState({
+  var _q = useState(false),
+    isHidenRC = _q[0],
+    setIsHidenRC = _q[1];
+  var _r = useState(false),
+    isInputBoxActive = _r[0],
+    setIsInputBoxActive = _r[1];
+  var _s = useState(""),
+    activeCell = _s[0],
+    setActiveCell = _s[1];
+  var _t = useState(""),
+    activeRefCell = _t[0],
+    setActiveRefCell = _t[1];
+  var _u = useState({
       left: 0,
       top: 0
     }),
-    frozenPosition = _s[0],
-    setFrozenPosition = _s[1];
+    frozenPosition = _u[0],
+    setFrozenPosition = _u[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 _v = useState({}),
+    firstSelectionActiveCell = _v[0],
+    setFirstSelectionActiveCell = _v[1];
+  var _w = useState(0),
+    commaCount = _w[0],
+    setCommaCount = _w[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 _x = useState(!hideFormulaHintLocal),
+    showFormulaHint = _x[0],
+    setShowFormulaHint = _x[1];
+  var _y = useState(false),
+    showSearchHint = _y[0],
+    setShowSearchHint = _y[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("");
@@ -68,9 +68,9 @@ var InputBox = function InputBox() {
   var isComposingRef = useRef(false);
   var ZWSP = "\u200B";
   var inputBoxInnerRef = useRef(null);
-  var _x = useState([]),
-    linkSelectionHighlightRects = _x[0],
-    setLinkSelectionHighlightRects = _x[1];
+  var _z = useState([]),
+    linkSelectionHighlightRects = _z[0],
+    setLinkSelectionHighlightRects = _z[1];
   var ensureNotEmpty = function ensureNotEmpty() {
     var el = inputRef.current;
     if (!el) return;
@@ -106,7 +106,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, (_c = inputRef.current) === null || _c === void 0 ? void 0 : _c.innerText]);
   useLayoutEffect(function () {
     var _a;
     if (!context.allowEdit) {
@@ -129,6 +129,8 @@ var InputBox = function InputBox() {
       var flowdata = 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 value_1 = "";
+      var wasOverwrite = refs.globalCache.overwriteCell;
+      var overwriteFirstChar = refs.globalCache.overwriteCellFirstChar;
       if (cell && !refs.globalCache.overwriteCell) {
         if (isInlineStringCell(cell)) {
           value_1 = getInlineStringHTML(row_index, col_index, flowdata);
@@ -145,9 +147,15 @@ var InputBox = function InputBox() {
         }
       }
       refs.globalCache.overwriteCell = false;
-      if (!refs.globalCache.ignoreWriteCell && inputRef.current && value_1) {
+      delete refs.globalCache.overwriteCellFirstChar;
+      if (wasOverwrite && inputRef.current) {
+        inputRef.current.innerText = overwriteFirstChar !== null && overwriteFirstChar !== void 0 ? overwriteFirstChar : "";
+        if (overwriteFirstChar) {
+          moveToEnd(inputRef.current);
+        }
+      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && value_1) {
         inputRef.current.innerHTML = escapeHTMLTag(escapeScriptTag(value_1));
-      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && !value_1) {
+      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && !value_1 && !wasOverwrite) {
         var valueD = getCellValue(row_index, col_index, flowdata, "f");
         inputRef.current.innerText = valueD;
       }
@@ -175,7 +183,7 @@ var InputBox = function InputBox() {
     if (!firstSelection || ((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show) || _.isEmpty(context.luckysheetCellUpdate)) {
       setIsInputBoxActive(false);
     }
-  }, [firstSelection, (_c = context.rangeDialog) === null || _c === void 0 ? void 0 : _c.show, context.luckysheetCellUpdate]);
+  }, [firstSelection, (_d = context.rangeDialog) === null || _d === void 0 ? void 0 : _d.show, context.luckysheetCellUpdate]);
   var getActiveFormula = useCallback(function () {
     return document.querySelector(".luckysheet-formula-search-item-active");
   }, []);
@@ -270,6 +278,54 @@ var InputBox = function InputBox() {
     event.stopPropagation();
     event.preventDefault();
   };
+  useEffect(function () {
+    var _a, _b;
+    var selection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
+    var editor = inputRef.current;
+    if (!selection || !editor || !isInputBoxActive || ((_b = context.rangeDialog) === null || _b === void 0 ? void 0 : _b.show)) {
+      return;
+    }
+    var rowSel = selection.row;
+    var colSel = selection.column;
+    if (!rowSel || !colSel || rowSel.length < 2 || colSel.length < 2) return;
+    var rowStart = Math.min(rowSel[0], rowSel[1]);
+    var rowEnd = Math.max(rowSel[0], rowSel[1]);
+    var colStart = Math.min(colSel[0], colSel[1]);
+    var colEnd = Math.max(colSel[0], colSel[1]);
+    var startRef = "".concat(indexToColumnChar(colStart)).concat(rowStart + 1);
+    var endRef = "".concat(indexToColumnChar(colEnd)).concat(rowEnd + 1);
+    var refText = startRef === endRef ? startRef : "".concat(startRef, ":").concat(endRef);
+    var editorText = editor.innerText || "";
+    if (!editorText.startsWith("=")) return;
+    var spans = editor.querySelectorAll("span");
+    var lastSpan = spans[spans.length - 1];
+    var lastSpanText = (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.innerText) || "";
+    var isA1RangePattern = /^[a-zA-Z]+\d+:[a-zA-Z]+\d+$/.test(lastSpanText);
+    var notFunctionInit = !editorText.includes("(");
+    var refNotAllowed = lastSpanText.includes(")") || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpanText) && !_.includes(["="], lastSpanText);
+    var shouldHandleRef = (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.classList.contains("fortune-formula-functionrange-cell")) || isLetterNumberPattern(lastSpanText) || isA1RangePattern || (lastSpanText === "(" || lastSpanText === "," || lastSpanText.includes(":") || lastSpanText === "=") && !lastSpanText.includes('"') && !refNotAllowed && !/^[a-zA-Z]+$/.test(lastSpanText);
+    if (!shouldHandleRef) return;
+    var refSpanHtml = "<span class=\"fortune-formula-functionrange-cell\" rangeindex=\"0\" dir=\"auto\" style=\"color:#c1232b;\">".concat(refText, "</span>");
+    if (lastSpan === null || lastSpan === void 0 ? void 0 : lastSpan.classList.contains("fortune-formula-functionrange-cell")) {
+      if (lastSpan.textContent !== refText) lastSpan.textContent = refText;
+      setTimeout(function () {
+        return moveCursorToEnd(editor);
+      }, 1);
+      return;
+    }
+    if (isLetterNumberPattern(lastSpanText) || isA1RangePattern) {
+      var htmlR = removeLastSpan(editor.innerHTML);
+      editor.innerHTML = "".concat(htmlR).concat(refSpanHtml);
+      setTimeout(function () {
+        return moveCursorToEnd(editor);
+      }, 1);
+      return;
+    }
+    editor.innerHTML = "".concat(editor.innerHTML).concat(refSpanHtml);
+    setTimeout(function () {
+      return moveCursorToEnd(editor);
+    }, 1);
+  }, [context.luckysheet_select_save, (_e = context.rangeDialog) === null || _e === void 0 ? void 0 : _e.show, isInputBoxActive]);
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
@@ -302,37 +358,18 @@ 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)) {
+    var isArrowKey = e.key === "ArrowUp" || e.key === "ArrowDown" || e.key === "ArrowLeft" || e.key === "ArrowRight";
+    if (isArrowKey && !(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 editorText = ((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText) || "";
+      var lastSpanText = getLastInputSpanText() || "";
+      var isA1RangePattern = /^[a-zA-Z]+\d+:[a-zA-Z]+\d+$/.test(lastSpanText);
+      var notFunctionInit = !editorText.includes("(");
+      var refNotAllowed = lastSpanText.includes(")") || notFunctionInit && /^[a-zA-Z]+$/.test(lastSpanText) && !_.includes(["="], lastSpanText);
+      var shouldTreatAsRefNavigation = editorText.startsWith("=") && (Boolean((_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.querySelector(".fortune-formula-functionrange-cell")) || isLetterNumberPattern(lastSpanText) || isA1RangePattern || (lastSpanText === "(" || lastSpanText === "," || lastSpanText.includes(":") || lastSpanText === "=") && !lastSpanText.includes('"') && !refNotAllowed && !/^[a-zA-Z]+$/.test(lastSpanText));
+      if (shouldTreatAsRefNavigation) {
         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);
+          if (inputRef.current) moveCursorToEnd(inputRef.current);
         }, 1);
       }
     }
@@ -390,7 +427,7 @@ var InputBox = function InputBox() {
       }
       e.preventDefault();
     }
-  }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext, firstSelection]);
+  }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext]);
   var handleHideShowHint = function handleHideShowHint() {
     var _a, _b, _c, _d;
     var searchElFx = (_a = document.getElementsByClassName("fx-search")) === null || _a === void 0 ? void 0 : _a[0];
@@ -480,7 +517,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, (_f = context.rangeDialog) === null || _f === void 0 ? void 0 : _f.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 +533,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, (_g = context.rangeDialog) === null || _g === void 0 ? void 0 : _g.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 +546,7 @@ var InputBox = function InputBox() {
       left: "0",
       display: "block"
     };
-  }, [firstSelection, (_f = context.rangeDialog) === null || _f === void 0 ? void 0 : _f.show]);
+  }, [firstSelection, (_h = context.rangeDialog) === null || _h === void 0 ? void 0 : _h.show]);
   var getCellAddress = useCallback(function () {
     if (!firstSelection) return "";
     var rowIndex = firstSelection.row_focus || 0;
@@ -559,7 +596,7 @@ 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]);
+  }, [(_j = context.linkCard) === null || _j === void 0 ? void 0 : _j.applyToSelection, (_k = context.linkCard) === null || _k === void 0 ? void 0 : _k.selectionOffsets, (_l = context.linkCard) === null || _l === void 0 ? void 0 : _l.r, (_m = context.linkCard) === null || _m === void 0 ? void 0 : _m.c, context.luckysheetCellUpdate]);
   var wraperGetCell = function wraperGetCell() {
     var cell = getCellAddress();
     placeRef.current = cell;
@@ -596,7 +633,7 @@ 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 && !((_o = context.rangeDialog) === null || _o === void 0 ? void 0 : _o.show) && (/*#__PURE__*/React.createElement("div", {
     className: "luckysheet-cell-address-indicator",
     style: getAddressIndicatorPosition()
   }, wraperGetCell())), /*#__PURE__*/React.createElement("div", {

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/index.css

@@ -830,6 +830,12 @@
   cursor: se-resize;
 }
 
+/* FLV: show blue dashed border for active selection while in edit mode */
+.luckysheet-cell-selected-edit-mode .luckysheet-cs-inner-border {
+  border: 2px dashed #12a5ff;
+  border-radius: 1px;
+}
+
 .fortune-formula-functionrange-highlight .luckysheet-highlight {
   position: absolute;
   z-index: 19;

package/es/components/SheetOverlay/index.js

@@ -375,18 +375,18 @@ var SheetOverlay = function SheetOverlay() {
   }), ((_h = (_g = context.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g.length) !== null && _h !== void 0 ? _h : 0) > 0 && (/*#__PURE__*/React.createElement("div", {
     id: "luckysheet-cell-selected-boxs"
   }, context.luckysheet_select_save.map(function (selection, index) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     return /*#__PURE__*/React.createElement("div", {
       key: index,
       id: "luckysheet-cell-selected",
-      className: "luckysheet-cell-selected",
+      className: "luckysheet-cell-selected".concat(((_b = (_a = context.luckysheetCellUpdate) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0 ? " luckysheet-cell-selected-edit-mode" : ""),
       style: _.assign({
         left: selection.left_move,
         top: selection.top_move,
         width: selection.width_move ? selection.width_move - 1.8 : selection.width_move,
         height: selection.height_move ? selection.height_move - 1.8 : selection.height_move,
         display: "block"
-      }, fixRowStyleOverflowInFreeze(context, selection.row[0], selection.row[1], (_a = refs.globalCache.freezen) === null || _a === void 0 ? void 0 : _a[context.currentSheetId]), fixColumnStyleOverflowInFreeze(context, selection.column[0], selection.column[1], (_b = refs.globalCache.freezen) === null || _b === void 0 ? void 0 : _b[context.currentSheetId])),
+      }, fixRowStyleOverflowInFreeze(context, selection.row[0], selection.row[1], (_c = refs.globalCache.freezen) === null || _c === void 0 ? void 0 : _c[context.currentSheetId]), fixColumnStyleOverflowInFreeze(context, selection.column[0], selection.column[1], (_d = refs.globalCache.freezen) === null || _d === void 0 ? void 0 : _d[context.currentSheetId])),
       onMouseDown: function onMouseDown(e) {
         e.stopPropagation();
         var nativeEvent = e.nativeEvent;

package/es/components/Toolbar/index.js

@@ -123,7 +123,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   return to.concat(ar || Array.prototype.slice.call(from));
 };
 import React, { useContext, useCallback, useRef, useEffect, useState } from "react";
-import { toolbarItemClickHandler, handleTextBackground, handleTextColor, handleTextSize, normalizedCellAttr, getFlowdata, newComment, editComment, deleteComment, showHideComment, showHideAllComments, autoSelectionFormula, handleSum, locale, handleMerge, handleBorder, toolbarItemSelectedFunc, handleFreeze, insertImage, showImgChooser, updateFormat, handleSort, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, createFilter, clearFilter, applyLocation, insertDuneChart, api, getSheetIndex } from "@fileverse-dev/fortune-core";
+import { toolbarItemClickHandler, handleTextBackground, handleTextColor, handleTextSize, normalizedCellAttr, getFlowdata, newComment, editComment, deleteComment, showHideComment, showHideAllComments, autoSelectionFormula, handleSum, locale, handleMerge, handleBorder, toolbarItemSelectedFunc, handleFreeze, insertImage, showImgChooser, updateFormat, handleSort, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, createFilter, clearFilter, applyLocation, insertDuneChart, api, getSheetIndex, is_date } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import { IconButton, LucideIcon, Tooltip, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from "@fileverse/ui";
 import DataVerificationPortal from "./dataVerificationPortal";
@@ -649,7 +649,7 @@ var Toolbar = function Toolbar(_a) {
     }
   }, [cell, refs.globalCache]);
   var getToolbarItem = useCallback(function (name, i) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     var tooltip = toolbar[name];
     if (name === "|") {
       return /*#__PURE__*/React.createElement(Divider, {
@@ -714,10 +714,15 @@ var Toolbar = function Toolbar(_a) {
           return v.value === (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa);
         });
         if ((curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) != null) {
-          if (format != null) {
-            currentFmt_1 = format.text;
-          } else if (((_a = curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === null || _a === void 0 ? void 0 : _a.includes("#,##0")) || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0" || (curr_2 === null || curr_2 === void 0 ? void 0 : curr_2.fa) === "0.00") {
+          var hasTime = /[hH]:/.test(curr_2.fa);
+          if (curr_2.t === "d") {
+            currentFmt_1 = hasTime ? "Date time" : "Date";
+          } else if (curr_2.t === "n" || curr_2.fa.includes("#,##0") || curr_2.fa === "0" || curr_2.fa === "0.00") {
             currentFmt_1 = "Number";
+          } else if (is_date(curr_2.fa)) {
+            currentFmt_1 = hasTime ? "Date time" : "Date";
+          } else if (format != null) {
+            currentFmt_1 = format.text;
           } else {
             currentFmt_1 = defaultFormat[defaultFormat.length - 1].text;
           }
@@ -872,9 +877,9 @@ var Toolbar = function Toolbar(_a) {
         value: 2
       }];
       return /*#__PURE__*/React.createElement(Combo, {
-        iconId: ((_b = _.find(items_1, function (item) {
+        iconId: ((_a = _.find(items_1, function (item) {
           return "".concat(item.value) === "".concat(cell === null || cell === void 0 ? void 0 : cell.ht);
-        })) === null || _b === void 0 ? void 0 : _b.title) || "align-left",
+        })) === null || _a === void 0 ? void 0 : _a.title) || "align-left",
         key: name,
         tooltip: toolbar.horizontalAlign,
         showArrow: false
@@ -924,9 +929,9 @@ var Toolbar = function Toolbar(_a) {
         value: 2
       }];
       return /*#__PURE__*/React.createElement(Combo, {
-        iconId: ((_c = _.find(items_2, function (item) {
+        iconId: ((_b = _.find(items_2, function (item) {
           return "".concat(item.value) === "".concat(cell === null || cell === void 0 ? void 0 : cell.vt);
-        })) === null || _c === void 0 ? void 0 : _c.title) || "align-top",
+        })) === null || _b === void 0 ? void 0 : _b.title) || "align-top",
         key: name,
         tooltip: toolbar.verticalAlign,
         showArrow: false
@@ -1167,7 +1172,7 @@ var Toolbar = function Toolbar(_a) {
       });
     }
     if (name === "comment") {
-      var last = (_d = context.luckysheet_select_save) === null || _d === void 0 ? void 0 : _d[context.luckysheet_select_save.length - 1];
+      var last = (_c = context.luckysheet_select_save) === null || _c === void 0 ? void 0 : _c[context.luckysheet_select_save.length - 1];
       var row_index_1 = last === null || last === void 0 ? void 0 : last.row_focus;
       var col_index_1 = last === null || last === void 0 ? void 0 : last.column_focus;
       if (!last) {
@@ -1182,7 +1187,7 @@ var Toolbar = function Toolbar(_a) {
         }
       }
       var itemData_1;
-      if (((_f = (_e = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index_1]) === null || _e === void 0 ? void 0 : _e[col_index_1]) === null || _f === void 0 ? void 0 : _f.ps) != null) {
+      if (((_e = (_d = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index_1]) === null || _d === void 0 ? void 0 : _d[col_index_1]) === null || _e === void 0 ? void 0 : _e.ps) != null) {
         itemData_1 = [{
           key: "edit",
           text: comment.edit,
@@ -1695,7 +1700,7 @@ var Toolbar = function Toolbar(_a) {
       iconId: name,
       tooltip: tooltip,
       key: name,
-      selected: (_g = toolbarItemSelectedFunc(name)) === null || _g === void 0 ? void 0 : _g(cell),
+      selected: (_f = toolbarItemSelectedFunc(name)) === null || _f === void 0 ? void 0 : _f(cell),
       onClick: function onClick() {
         return setContext(function (draftCtx) {
           var _a;

package/es/components/Workbook/api.d.ts

@@ -728,6 +728,8 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             conditionformat_equal_title: string;
             conditionformat_textContains: string;
             conditionformat_textContains_title: string;
+            conditionformat_empty: string;
+            conditionformat_empty_title: string;
             conditionformat_occurrenceDate: string;
             conditionformat_occurrenceDate_title: string;
             conditionformat_duplicateValue: string;
@@ -830,6 +832,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
             between2: string;
             contain: string;
             textContains: string;
+            empty: string;
             duplicateValue: string;
             uniqueValue: string;
             top: string;

package/es/components/Workbook/index.d.ts

@@ -735,6 +735,8 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             conditionformat_equal_title: string;
             conditionformat_textContains: string;
             conditionformat_textContains_title: string;
+            conditionformat_empty: string;
+            conditionformat_empty_title: string;
             conditionformat_occurrenceDate: string;
             conditionformat_occurrenceDate_title: string;
             conditionformat_duplicateValue: string;
@@ -837,6 +839,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
             between2: string;
             contain: string;
             textContains: string;
+            empty: string;
             duplicateValue: string;
             uniqueValue: string;
             top: string;