@fileverse-dev/fortune-react 1.1.96 → 1.1.98

package/es/components/DataVerification/DropdownList.js

@@ -24,7 +24,16 @@ var DropDownList = function DropDownList() {
   var _f = useState([]),
     rbgColor = _f[0],
     setRbgColor = _f[1];
-  var close = useCallback(function () {}, [setContext]);
+  var close = useCallback(function () {
+    setContext(function (ctx) {
+      var _a, _b;
+      var index = getSheetIndex(ctx, ctx.currentSheetId);
+      var verification = context.luckysheetfile[index].dataVerification;
+      if (!verification["".concat((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0].row_focus, "_").concat((_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[0].column_focus)]) {
+        ctx.dataVerificationDropDownList = false;
+      }
+    });
+  }, [setContext]);
   useOutsideClick(containerRef, close, [close]);
   useEffect(function () {
     var _a, _b;

package/es/components/DataVerification/DropdownOption.js

@@ -235,11 +235,19 @@ var DynamicInputList = function DynamicInputList(_a) {
     })), /*#__PURE__*/React.createElement("div", {
       className: "flex flex-1 optionItems-center transition"
     }, /*#__PURE__*/React.createElement(TextField, {
+      type: "text",
+      onMouseDown: function onMouseDown(e) {
+        e.stopPropagation();
+        e.target.focus();
+      },
+      key: item.id,
       className: "w-full",
       placeholder: "Option ".concat(index + 1),
       value: item.value,
       onChange: function onChange(e) {
-        return handleChange(index, e.target.value);
+        e.stopPropagation();
+        handleChange(index, e.target.value);
+        e.target.focus();
       },
       "aria-label": "Option ".concat(index + 1)
     })), optionItems.length > 1 && (/*#__PURE__*/React.createElement(IconButton, {

package/es/components/DataVerification/index.js

@@ -84,14 +84,6 @@ var DataVerification = function DataVerification() {
       }));
     }
   }, []);
-  var dataSelectRange = useCallback(function (type, value) {
-    hideDialog();
-    setContext(function (ctx) {
-      ctx.rangeDialog.show = true;
-      ctx.rangeDialog.type = type;
-      ctx.rangeDialog.rangeTxt = value;
-    });
-  }, [hideDialog, setContext]);
   var btn = useCallback(function (type) {
     if (type === "confirm") {
       setContext(function (ctx) {
@@ -234,17 +226,7 @@ var DataVerification = function DataVerification() {
     }),
     "aria-hidden": "true",
     readOnly: true,
-    value: (_a = context.dataVerification.dataRegulation) === null || _a === void 0 ? void 0 : _a.rangeTxt,
-    onChange: function onChange(e) {
-      var value = e.target.value;
-      setContext(function (ctx) {
-        ctx.dataVerification.dataRegulation.rangeTxt = value;
-      });
-    },
-    onClick: function onClick() {
-      hideDialog();
-      dataSelectRange("rangeTxt", context.dataVerification.dataRegulation.value1);
-    }
+    value: (_a = context.dataVerification.dataRegulation) === null || _a === void 0 ? void 0 : _a.rangeTxt
   })), /*#__PURE__*/React.createElement("div", {
     className: "flex flex-col"
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -17,7 +17,8 @@ import { DraggableDiv } from "./dragable-div";
 var FormulaHint = function FormulaHint(props) {
   var _a;
   var showFormulaHint = props.showFormulaHint,
-    handleShowFormulaHint = props.handleShowFormulaHint;
+    handleShowFormulaHint = props.handleShowFormulaHint,
+    commaCount = props.commaCount;
   var dragHasMoved = useRef(false);
   var context = useContext(WorkbookContext).context;
   var firstSelection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
@@ -186,7 +187,10 @@ var FormulaHint = function FormulaHint(props) {
     return /*#__PURE__*/React.createElement("code", {
       className: "luckysheet-arguments-help-parameter font-family-mono mb-1 mt-2 color-text-default",
       dir: "auto",
-      key: name
+      key: name,
+      style: {
+        backgroundColor: commaCount === i ? (fn === null || fn === void 0 ? void 0 : fn.BRAND_SECONDARY_COLOR) || "#FFDF0A" : "transparent"
+      }
     }, name, i !== fn.p.length - 1 && ", ");
   })), /*#__PURE__*/React.createElement("code", {
     className: "luckysheet-arguments-paren font-family-mono mb-1 mt-2 color-text-default"
@@ -354,12 +358,15 @@ var FormulaHint = function FormulaHint(props) {
       paddingTop: "16px"
     },
     className: "luckysheet-formula-help-content-param"
-  }, fn.p.map(function (param) {
+  }, fn.p.map(function (param, index) {
     return /*#__PURE__*/React.createElement("div", {
       className: "",
       key: param.name
     }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("code", {
-      className: "font-family-mono mb-1 mt-2 color-text-default font-family-mono"
+      className: "font-family-mono mb-1 mt-2 color-text-default font-family-mono",
+      style: {
+        backgroundColor: commaCount === index ? (fn === null || fn === void 0 ? void 0 : fn.BRAND_SECONDARY_COLOR) || "#FFDF0A" : "transparent"
+      }
     }, param.name, param.repeat === "y" && (/*#__PURE__*/React.createElement("span", {
       className: "luckysheet-arguments-help-argument-info example-value",
       style: {

package/es/components/SheetOverlay/InputBox.js

@@ -17,7 +17,7 @@ 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 } from "./helper";
+import { moveCursorToEnd, getCursorPosition, isLetterNumberPattern, removeLastSpan, incrementColumn, decrementColumn, incrementRow, decrementRow, countCommasBeforeCursor } from "./helper";
 import { LucideIcon } from "./LucideIcon";
 var InputBox = function InputBox() {
   var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -51,13 +51,16 @@ var InputBox = function InputBox() {
   var _q = useState({}),
     firstSelectionActiveCell = _q[0],
     setFirstSelectionActiveCell = _q[1];
+  var _r = useState(0),
+    commaCount = _r[0],
+    setCommaCount = _r[1];
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
-  var _r = useState(!hideFormulaHintLocal),
-    showFormulaHint = _r[0],
-    setShowFormulaHint = _r[1];
-  var _s = useState(false),
-    showSearchHint = _s[0],
-    setShowSearchHint = _s[1];
+  var _s = useState(!hideFormulaHintLocal),
+    showFormulaHint = _s[0],
+    setShowFormulaHint = _s[1];
+  var _t = useState(false),
+    showSearchHint = _t[0],
+    setShowSearchHint = _t[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("");
@@ -242,6 +245,9 @@ var InputBox = function InputBox() {
     var _a, _b;
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
+    var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+    console.log("currentCommaCount", currentCommaCount);
+    setCommaCount(currentCommaCount);
     var allowListNavigation = true;
     if ((e.key === "Delete" || e.key === "Backspace") && getCursorPosition(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
       setTimeout(function () {
@@ -344,6 +350,8 @@ var InputBox = function InputBox() {
     } else {
       setShowSearchHint(false);
     }
+    var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+    setCommaCount(currentCommaCount);
     var e = lastKeyDownEventRef.current;
     if (!e) return;
     var kcode = e.keyCode;
@@ -487,6 +495,10 @@ var InputBox = function InputBox() {
       minHeight: firstSelection.height
     }, inputBoxStyle) : {}
   }, /*#__PURE__*/React.createElement(ContentEditable, {
+    onMouseUp: function onMouseUp(e) {
+      var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+      setCommaCount(currentCommaCount);
+    },
     innerRef: function innerRef(e) {
       inputRef.current = e;
       refs.cellInput.current = e;
@@ -520,7 +532,8 @@ var InputBox = function InputBox() {
     }
   })), showFormulaHint && fn && ((_h = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _h === void 0 ? void 0 : _h.innerText.includes("(")) && (/*#__PURE__*/React.createElement(FormulaHint, {
     handleShowFormulaHint: handleShowFormulaHint,
-    showFormulaHint: showFormulaHint
+    showFormulaHint: showFormulaHint,
+    commaCount: commaCount
   })), !showFormulaHint && fn && (/*#__PURE__*/React.createElement(Tooltip, {
     text: "Turn on formula suggestions (F10)",
     placement: "top",

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

@@ -272,6 +272,24 @@ export var useColumnDragAndDrop = function useColumnDragAndDrop(containerRef, se
               }
             });
           });
+          var newDataVerification = {};
+          Object.keys(_sheet.dataVerification).forEach(function (item) {
+            var _a;
+            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+            var colRow = item.split("_");
+            if (colRow.length !== 2) return;
+            var presentcol = parseInt(colRow[1], 10);
+            var updatedCol = presentcol;
+            if (presentcol === sourceIndex_1) {
+              updatedCol = targetIndex;
+            } else if (presentcol > sourceIndex_1 && presentcol < targetIndex) {
+              updatedCol -= 1;
+            } else if (presentcol < sourceIndex_1 && presentcol >= targetIndex) {
+              updatedCol += 1;
+            }
+            newDataVerification["".concat(colRow[0], "_").concat(updatedCol)] = itemData;
+          });
+          _sheet.dataVerification = newDataVerification;
           (_c = _sheet.calcChain) === null || _c === void 0 ? void 0 : _c.forEach(function (item) {
             if (item.c === sourceIndex_1) {
               item.c = targetIndex;

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

@@ -253,6 +253,24 @@ export var useRowDragAndDrop = function useRowDragAndDrop(containerRef, selected
               }
             });
           });
+          var newDataVerification = {};
+          Object.keys(_sheet.dataVerification).forEach(function (item) {
+            var _a;
+            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+            var colRow = item.split("_");
+            if (colRow.length !== 2) return;
+            var presentRow = parseInt(colRow[0], 10);
+            var updatedRow = presentRow;
+            if (presentRow === sourceIndex_1) {
+              updatedRow = targetIndex;
+            } else if (presentRow > sourceIndex_1 && presentRow < targetIndex) {
+              updatedRow -= 1;
+            } else if (presentRow < sourceIndex_1 && presentRow >= targetIndex) {
+              updatedRow += 1;
+            }
+            newDataVerification["".concat(updatedRow, "_").concat(colRow[1])] = itemData;
+          });
+          _sheet.dataVerification = newDataVerification;
           (_a = _sheet.calcChain) === null || _a === void 0 ? void 0 : _a.forEach(function (item) {
             if (item.r === sourceIndex_1) {
               item.r = targetIndex;

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

@@ -6,3 +6,5 @@ export declare function incrementColumn(cell: string): string;
 export declare function decrementColumn(cell: string): string;
 export declare function incrementRow(cell: string): string;
 export declare function decrementRow(cell: string): string;
+export declare function countCommasOutsideQuotes(str: string): number;
+export declare function countCommasBeforeCursor(editableDiv: HTMLDivElement): number;

package/es/components/SheetOverlay/helper.js

@@ -83,4 +83,37 @@ export function decrementRow(cell) {
   if (!parsed) return "";
   var newRowPart = Math.max(1, parsed.rowPart - 1);
   return parsed.colPart + newRowPart;
+}
+export function countCommasOutsideQuotes(str) {
+  var inQuotes = false;
+  var count = 0;
+  for (var i = 0; i < str.length; i++) {
+    var char = str[i];
+    if (char === '"') {
+      inQuotes = !inQuotes;
+    } else if (char === ',' && !inQuotes) {
+      count++;
+    }
+  }
+  return count;
+}
+export function countCommasBeforeCursor(editableDiv) {
+  var selection = window.getSelection();
+  if (!(selection === null || selection === void 0 ? void 0 : selection.rangeCount)) return 0;
+  var range = selection.getRangeAt(0);
+  var preCaretRange = range.cloneRange();
+  preCaretRange.selectNodeContents(editableDiv);
+  preCaretRange.setEnd(range.endContainer, range.endOffset);
+  var textBeforeCursor = preCaretRange.toString();
+  var inQuotes = false;
+  var count = 0;
+  for (var i = 0; i < textBeforeCursor.length; i++) {
+    var char = textBeforeCursor[i];
+    if (char === '"') {
+      inQuotes = !inQuotes;
+    } else if (char === ',' && !inQuotes) {
+      count++;
+    }
+  }
+  return count;
 }

package/es/components/Toolbar/index.js

@@ -123,11 +123,11 @@ 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 DataVerificationPortal from "./dataVerificationPortal";
 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 } from "@fileverse-dev/fortune-core";
 import { setSelection, getSelection } from "@fileverse-dev/fortune-core/lib/api";
 import _ from "lodash";
 import { IconButton, LucideIcon, Tooltip, Command, CommandInput, CommandList, CommandEmpty, CommandGroup, CommandItem } from "@fileverse/ui";
+import DataVerificationPortal from "./dataVerificationPortal";
 import WorkbookContext from "../../context";
 import "./index.css";
 import Button from "./Button";

package/lib/components/DataVerification/DropdownList.js

@@ -33,7 +33,16 @@ var DropDownList = function DropDownList() {
   var _f = (0, _react.useState)([]),
     rbgColor = _f[0],
     setRbgColor = _f[1];
-  var close = (0, _react.useCallback)(function () {}, [setContext]);
+  var close = (0, _react.useCallback)(function () {
+    setContext(function (ctx) {
+      var _a, _b;
+      var index = (0, _fortuneCore.getSheetIndex)(ctx, ctx.currentSheetId);
+      var verification = context.luckysheetfile[index].dataVerification;
+      if (!verification["".concat((_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0].row_focus, "_").concat((_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b[0].column_focus)]) {
+        ctx.dataVerificationDropDownList = false;
+      }
+    });
+  }, [setContext]);
   (0, _useOutsideClick.useOutsideClick)(containerRef, close, [close]);
   (0, _react.useEffect)(function () {
     var _a, _b;

package/lib/components/DataVerification/DropdownOption.js

@@ -242,11 +242,19 @@ var DynamicInputList = function DynamicInputList(_a) {
     })), /*#__PURE__*/_react.default.createElement("div", {
       className: "flex flex-1 optionItems-center transition"
     }, /*#__PURE__*/_react.default.createElement(_ui.TextField, {
+      type: "text",
+      onMouseDown: function onMouseDown(e) {
+        e.stopPropagation();
+        e.target.focus();
+      },
+      key: item.id,
       className: "w-full",
       placeholder: "Option ".concat(index + 1),
       value: item.value,
       onChange: function onChange(e) {
-        return handleChange(index, e.target.value);
+        e.stopPropagation();
+        handleChange(index, e.target.value);
+        e.target.focus();
       },
       "aria-label": "Option ".concat(index + 1)
     })), optionItems.length > 1 && (/*#__PURE__*/_react.default.createElement(_ui.IconButton, {

package/lib/components/DataVerification/index.js

@@ -93,14 +93,6 @@ var DataVerification = function DataVerification() {
       }));
     }
   }, []);
-  var dataSelectRange = (0, _react.useCallback)(function (type, value) {
-    hideDialog();
-    setContext(function (ctx) {
-      ctx.rangeDialog.show = true;
-      ctx.rangeDialog.type = type;
-      ctx.rangeDialog.rangeTxt = value;
-    });
-  }, [hideDialog, setContext]);
   var btn = (0, _react.useCallback)(function (type) {
     if (type === "confirm") {
       setContext(function (ctx) {
@@ -243,17 +235,7 @@ var DataVerification = function DataVerification() {
     }),
     "aria-hidden": "true",
     readOnly: true,
-    value: (_a = context.dataVerification.dataRegulation) === null || _a === void 0 ? void 0 : _a.rangeTxt,
-    onChange: function onChange(e) {
-      var value = e.target.value;
-      setContext(function (ctx) {
-        ctx.dataVerification.dataRegulation.rangeTxt = value;
-      });
-    },
-    onClick: function onClick() {
-      hideDialog();
-      dataSelectRange("rangeTxt", context.dataVerification.dataRegulation.value1);
-    }
+    value: (_a = context.dataVerification.dataRegulation) === null || _a === void 0 ? void 0 : _a.rangeTxt
   })), /*#__PURE__*/_react.default.createElement("div", {
     className: "flex flex-col"
   }, /*#__PURE__*/_react.default.createElement("div", {

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

@@ -26,7 +26,8 @@ var __assign = void 0 && (void 0).__assign || function () {
 var FormulaHint = function FormulaHint(props) {
   var _a;
   var showFormulaHint = props.showFormulaHint,
-    handleShowFormulaHint = props.handleShowFormulaHint;
+    handleShowFormulaHint = props.handleShowFormulaHint,
+    commaCount = props.commaCount;
   var dragHasMoved = (0, _react.useRef)(false);
   var context = (0, _react.useContext)(_context.default).context;
   var firstSelection = (_a = context.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a[0];
@@ -195,7 +196,10 @@ var FormulaHint = function FormulaHint(props) {
     return /*#__PURE__*/_react.default.createElement("code", {
       className: "luckysheet-arguments-help-parameter font-family-mono mb-1 mt-2 color-text-default",
       dir: "auto",
-      key: name
+      key: name,
+      style: {
+        backgroundColor: commaCount === i ? (fn === null || fn === void 0 ? void 0 : fn.BRAND_SECONDARY_COLOR) || "#FFDF0A" : "transparent"
+      }
     }, name, i !== fn.p.length - 1 && ", ");
   })), /*#__PURE__*/_react.default.createElement("code", {
     className: "luckysheet-arguments-paren font-family-mono mb-1 mt-2 color-text-default"
@@ -363,12 +367,15 @@ var FormulaHint = function FormulaHint(props) {
       paddingTop: "16px"
     },
     className: "luckysheet-formula-help-content-param"
-  }, fn.p.map(function (param) {
+  }, fn.p.map(function (param, index) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "",
       key: param.name
     }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("code", {
-      className: "font-family-mono mb-1 mt-2 color-text-default font-family-mono"
+      className: "font-family-mono mb-1 mt-2 color-text-default font-family-mono",
+      style: {
+        backgroundColor: commaCount === index ? (fn === null || fn === void 0 ? void 0 : fn.BRAND_SECONDARY_COLOR) || "#FFDF0A" : "transparent"
+      }
     }, param.name, param.repeat === "y" && (/*#__PURE__*/_react.default.createElement("span", {
       className: "luckysheet-arguments-help-argument-info example-value",
       style: {

package/lib/components/SheetOverlay/InputBox.js

@@ -17,7 +17,7 @@ var _usePrevious = _interopRequireDefault(require("../../hooks/usePrevious"));
 var _helper = require("./helper");
 var _LucideIcon = require("./LucideIcon");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t2 in e) "default" !== _t2 && {}.hasOwnProperty.call(e, _t2) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t2)) && (i.get || i.set) ? o(f, _t2, i) : f[_t2] = e[_t2]); return f; })(e, t); }
 var __assign = void 0 && (void 0).__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -60,13 +60,16 @@ var InputBox = function InputBox() {
   var _q = (0, _react.useState)({}),
     firstSelectionActiveCell = _q[0],
     setFirstSelectionActiveCell = _q[1];
+  var _r = (0, _react.useState)(0),
+    commaCount = _r[0],
+    setCommaCount = _r[1];
   var hideFormulaHintLocal = localStorage.getItem("formulaMore") === "true";
-  var _r = (0, _react.useState)(!hideFormulaHintLocal),
-    showFormulaHint = _r[0],
-    setShowFormulaHint = _r[1];
-  var _s = (0, _react.useState)(false),
-    showSearchHint = _s[0],
-    setShowSearchHint = _s[1];
+  var _s = (0, _react.useState)(!hideFormulaHintLocal),
+    showFormulaHint = _s[0],
+    setShowFormulaHint = _s[1];
+  var _t = (0, _react.useState)(false),
+    showSearchHint = _t[0],
+    setShowSearchHint = _t[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 = (0, _react.useRef)("");
@@ -251,6 +254,9 @@ var InputBox = function InputBox() {
     var _a, _b;
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
+    var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+    console.log("currentCommaCount", currentCommaCount);
+    setCommaCount(currentCommaCount);
     var allowListNavigation = true;
     if ((e.key === "Delete" || e.key === "Backspace") && (0, _helper.getCursorPosition)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
       setTimeout(function () {
@@ -353,6 +359,8 @@ var InputBox = function InputBox() {
     } else {
       setShowSearchHint(false);
     }
+    var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+    setCommaCount(currentCommaCount);
     var e = lastKeyDownEventRef.current;
     if (!e) return;
     var kcode = e.keyCode;
@@ -496,6 +504,10 @@ var InputBox = function InputBox() {
       minHeight: firstSelection.height
     }, inputBoxStyle) : {}
   }, /*#__PURE__*/_react.default.createElement(_ContentEditable.default, {
+    onMouseUp: function onMouseUp(e) {
+      var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+      setCommaCount(currentCommaCount);
+    },
     innerRef: function innerRef(e) {
       inputRef.current = e;
       refs.cellInput.current = e;
@@ -529,7 +541,8 @@ var InputBox = function InputBox() {
     }
   })), showFormulaHint && fn && ((_h = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _h === void 0 ? void 0 : _h.innerText.includes("(")) && (/*#__PURE__*/_react.default.createElement(_FormulaHint.default, {
     handleShowFormulaHint: handleShowFormulaHint,
-    showFormulaHint: showFormulaHint
+    showFormulaHint: showFormulaHint,
+    commaCount: commaCount
   })), !showFormulaHint && fn && (/*#__PURE__*/_react.default.createElement(_ui.Tooltip, {
     text: "Turn on formula suggestions (F10)",
     placement: "top",

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

@@ -280,6 +280,24 @@ var useColumnDragAndDrop = exports.useColumnDragAndDrop = function useColumnDrag
               }
             });
           });
+          var newDataVerification = {};
+          Object.keys(_sheet.dataVerification).forEach(function (item) {
+            var _a;
+            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+            var colRow = item.split("_");
+            if (colRow.length !== 2) return;
+            var presentcol = parseInt(colRow[1], 10);
+            var updatedCol = presentcol;
+            if (presentcol === sourceIndex_1) {
+              updatedCol = targetIndex;
+            } else if (presentcol > sourceIndex_1 && presentcol < targetIndex) {
+              updatedCol -= 1;
+            } else if (presentcol < sourceIndex_1 && presentcol >= targetIndex) {
+              updatedCol += 1;
+            }
+            newDataVerification["".concat(colRow[0], "_").concat(updatedCol)] = itemData;
+          });
+          _sheet.dataVerification = newDataVerification;
           (_c = _sheet.calcChain) === null || _c === void 0 ? void 0 : _c.forEach(function (item) {
             if (item.c === sourceIndex_1) {
               item.c = targetIndex;

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

@@ -260,6 +260,24 @@ var useRowDragAndDrop = exports.useRowDragAndDrop = function useRowDragAndDrop(c
               }
             });
           });
+          var newDataVerification = {};
+          Object.keys(_sheet.dataVerification).forEach(function (item) {
+            var _a;
+            var itemData = (_a = _sheet.dataVerification) === null || _a === void 0 ? void 0 : _a[item];
+            var colRow = item.split("_");
+            if (colRow.length !== 2) return;
+            var presentRow = parseInt(colRow[0], 10);
+            var updatedRow = presentRow;
+            if (presentRow === sourceIndex_1) {
+              updatedRow = targetIndex;
+            } else if (presentRow > sourceIndex_1 && presentRow < targetIndex) {
+              updatedRow -= 1;
+            } else if (presentRow < sourceIndex_1 && presentRow >= targetIndex) {
+              updatedRow += 1;
+            }
+            newDataVerification["".concat(updatedRow, "_").concat(colRow[1])] = itemData;
+          });
+          _sheet.dataVerification = newDataVerification;
           (_a = _sheet.calcChain) === null || _a === void 0 ? void 0 : _a.forEach(function (item) {
             if (item.r === sourceIndex_1) {
               item.r = targetIndex;

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

@@ -6,3 +6,5 @@ export declare function incrementColumn(cell: string): string;
 export declare function decrementColumn(cell: string): string;
 export declare function incrementRow(cell: string): string;
 export declare function decrementRow(cell: string): string;
+export declare function countCommasOutsideQuotes(str: string): number;
+export declare function countCommasBeforeCursor(editableDiv: HTMLDivElement): number;

package/lib/components/SheetOverlay/helper.js

@@ -3,6 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.countCommasBeforeCursor = countCommasBeforeCursor;
+exports.countCommasOutsideQuotes = countCommasOutsideQuotes;
 exports.decrementColumn = decrementColumn;
 exports.decrementRow = decrementRow;
 exports.getCursorPosition = getCursorPosition;
@@ -96,4 +98,37 @@ function decrementRow(cell) {
   if (!parsed) return "";
   var newRowPart = Math.max(1, parsed.rowPart - 1);
   return parsed.colPart + newRowPart;
+}
+function countCommasOutsideQuotes(str) {
+  var inQuotes = false;
+  var count = 0;
+  for (var i = 0; i < str.length; i++) {
+    var char = str[i];
+    if (char === '"') {
+      inQuotes = !inQuotes;
+    } else if (char === ',' && !inQuotes) {
+      count++;
+    }
+  }
+  return count;
+}
+function countCommasBeforeCursor(editableDiv) {
+  var selection = window.getSelection();
+  if (!(selection === null || selection === void 0 ? void 0 : selection.rangeCount)) return 0;
+  var range = selection.getRangeAt(0);
+  var preCaretRange = range.cloneRange();
+  preCaretRange.selectNodeContents(editableDiv);
+  preCaretRange.setEnd(range.endContainer, range.endOffset);
+  var textBeforeCursor = preCaretRange.toString();
+  var inQuotes = false;
+  var count = 0;
+  for (var i = 0; i < textBeforeCursor.length; i++) {
+    var char = textBeforeCursor[i];
+    if (char === '"') {
+      inQuotes = !inQuotes;
+    } else if (char === ',' && !inQuotes) {
+      count++;
+    }
+  }
+  return count;
 }

package/lib/components/Toolbar/index.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getLucideIcon = exports.default = exports.CurrencySelector = void 0;
 var _react = _interopRequireWildcard(require("react"));
-var _dataVerificationPortal = _interopRequireDefault(require("./dataVerificationPortal"));
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _api = require("@fileverse-dev/fortune-core/lib/api");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _ui = require("@fileverse/ui");
+var _dataVerificationPortal = _interopRequireDefault(require("./dataVerificationPortal"));
 var _context = _interopRequireDefault(require("../../context"));
 require("./index.css");
 var _Button = _interopRequireDefault(require("./Button"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.1.96",
+  "version": "1.1.98",
   "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.1.96",
+    "@fileverse-dev/fortune-core": "1.1.98",
     "@fileverse/ui": "^4.1.7-patch-21",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",