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

package/es/components/Workbook/index.js

@@ -25,7 +25,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
+import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick, update } from "@fileverse-dev/fortune-core";
 import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
 import "./index.css";
 import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
@@ -124,6 +124,12 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       });
       celldata === null || celldata === void 0 ? void 0 : celldata.forEach(function (d) {
         expandedData_1[d.r][d.c] = d.v;
+        var cell = d.v;
+        if (cell && cell.ct && cell.ct.t === "d" && (cell.m === undefined || cell.m === null)) {
+          try {
+            cell.m = update(cell.ct.fa || "General", cell.v);
+          } catch (e) {}
+        }
       });
       draftCtx.luckysheetfile = produce(draftCtx.luckysheetfile, function (d) {
         d[index].data = expandedData_1;
@@ -878,7 +884,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       });
     }
     var nativeEvent = e.nativeEvent;
-    if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ") {
+    if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ" && context.luckysheetCellUpdate.length === 0) {
       if (e.shiftKey) {
         handleRedo();
       } else {
@@ -887,7 +893,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       e.stopPropagation();
       return;
     }
-    if ((e.ctrlKey || e.metaKey) && e.code === "KeyY") {
+    if ((e.ctrlKey || e.metaKey) && e.code === "KeyY" && context.luckysheetCellUpdate.length === 0) {
       handleRedo();
       e.stopPropagation();
       e.preventDefault();

package/es/hooks/useFormulaEditorHistory.d.ts

@@ -0,0 +1,24 @@
+import { type RefObject } from "react";
+import { type Context } from "@fileverse-dev/fortune-core";
+import type { SetContextOptions } from "../context";
+export type FormulaHistoryEntry = {
+    text: string;
+    caret: number;
+    spanValues: string[];
+};
+export type FormulaEditorHistoryPrimary = "cell" | "fx";
+type SetContext = (recipe: (ctx: Context) => void, options?: SetContextOptions) => void;
+export declare function useFormulaEditorHistory(primaryRef: RefObject<HTMLDivElement | null>, cellInputRef: RefObject<HTMLDivElement | null>, fxInputRef: RefObject<HTMLDivElement | null>, setContext: SetContext, primary: FormulaEditorHistoryPrimary): {
+    formulaHistoryRef: RefObject<{
+        active: boolean;
+        entries: FormulaHistoryEntry[];
+        index: number;
+    }>;
+    preTextRef: RefObject<string>;
+    preFormulaSpanValuesRef: RefObject<string[] | null>;
+    resetFormulaHistory: () => void;
+    handleFormulaHistoryUndoRedo: (isRedo: boolean) => boolean;
+    capturePreFormulaState: () => void;
+    appendFormulaHistoryFromPrimaryEditor: (getCaret: () => number) => void;
+};
+export {};

package/es/hooks/useFormulaEditorHistory.js

@@ -0,0 +1,119 @@
+import { useCallback, useRef } from "react";
+import _ from "lodash";
+import { escapeScriptTag, functionHTMLGenerate, escapeHTMLTag, handleFormulaInput } from "@fileverse-dev/fortune-core";
+import { setCursorPosition } from "../components/SheetOverlay/helper";
+var MAX_FORMULA_HISTORY = 100;
+export function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, setContext, primary) {
+  var preTextRef = useRef("");
+  var preFormulaSpanValuesRef = useRef(null);
+  var formulaHistoryRef = useRef({
+    active: false,
+    entries: [],
+    index: -1
+  });
+  var resetFormulaHistory = useCallback(function () {
+    formulaHistoryRef.current = {
+      active: false,
+      entries: [],
+      index: -1
+    };
+    preFormulaSpanValuesRef.current = null;
+  }, []);
+  var pushFormulaHistoryEntry = useCallback(function (entry) {
+    var history = formulaHistoryRef.current;
+    var current = history.entries[history.index];
+    if (current && current.spanValues.length > 0 && entry.spanValues.length > 0 && _.isEqual(current.spanValues, entry.spanValues)) {
+      return;
+    }
+    if (current && current.spanValues.length === 0 && entry.spanValues.length === 0 && current.text === entry.text && current.caret === entry.caret) {
+      return;
+    }
+    var nextEntries = history.entries.slice(0, history.index + 1);
+    nextEntries.push(entry);
+    if (nextEntries.length > MAX_FORMULA_HISTORY) {
+      nextEntries.shift();
+    }
+    history.entries = nextEntries;
+    history.index = nextEntries.length - 1;
+    history.active = true;
+  }, []);
+  var applyFormulaHistoryEntry = useCallback(function (entry) {
+    var primaryEl = primaryRef.current;
+    if (!primaryEl) return;
+    var safeText = escapeScriptTag(entry.text || "");
+    var html = safeText.startsWith("=") ? functionHTMLGenerate(safeText) : escapeHTMLTag(safeText);
+    var cell = cellInputRef.current;
+    var fx = fxInputRef.current;
+    primaryEl.innerHTML = html;
+    if (primary === "cell") {
+      if (fx) fx.innerHTML = html;
+    } else if (cell) {
+      cell.innerHTML = html;
+    }
+    setCursorPosition(primaryEl, Math.min(entry.caret, entry.text.length));
+    setContext(function (draftCtx) {
+      if (primary === "cell") {
+        if (!cellInputRef.current) return;
+        handleFormulaInput(draftCtx, fxInputRef.current, cellInputRef.current, 0);
+      } else {
+        if (!fxInputRef.current) return;
+        handleFormulaInput(draftCtx, cellInputRef.current, fxInputRef.current, 0);
+      }
+    });
+  }, [cellInputRef, fxInputRef, primary, primaryRef, setContext]);
+  var handleFormulaHistoryUndoRedo = useCallback(function (isRedo) {
+    var history = formulaHistoryRef.current;
+    if (!history.active || history.entries.length === 0) return false;
+    var nextIndex = isRedo ? history.index + 1 : history.index - 1;
+    if (nextIndex < 0 || nextIndex >= history.entries.length) return true;
+    history.index = nextIndex;
+    applyFormulaHistoryEntry(history.entries[nextIndex]);
+    return true;
+  }, [applyFormulaHistoryEntry]);
+  var capturePreFormulaState = useCallback(function () {
+    var el = primaryRef.current;
+    if (!el) return;
+    preTextRef.current = el.innerText;
+    preFormulaSpanValuesRef.current = Array.from(el.querySelectorAll("span.fortune-formula-functionrange-cell")).map(function (node) {
+      var _a;
+      return (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+    });
+  }, [primaryRef]);
+  var appendFormulaHistoryFromPrimaryEditor = useCallback(function (getCaret) {
+    var _a, _b;
+    var el = primaryRef.current;
+    if (!el) return;
+    var currentText = el.innerText || "";
+    if (currentText.startsWith("=")) {
+      var caret = getCaret();
+      var spanValues = Array.from(el.querySelectorAll("span.fortune-formula-functionrange-cell")).map(function (node) {
+        var _a;
+        return (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+      });
+      if (!formulaHistoryRef.current.active) {
+        var seedText = preTextRef.current || "";
+        pushFormulaHistoryEntry({
+          text: seedText,
+          caret: Math.min(caret, seedText.length),
+          spanValues: (_b = (_a = preFormulaSpanValuesRef.current) !== null && _a !== void 0 ? _a : spanValues) !== null && _b !== void 0 ? _b : []
+        });
+      }
+      pushFormulaHistoryEntry({
+        text: currentText,
+        caret: caret,
+        spanValues: spanValues
+      });
+    } else if (formulaHistoryRef.current.active) {
+      resetFormulaHistory();
+    }
+  }, [primaryRef, pushFormulaHistoryEntry, resetFormulaHistory]);
+  return {
+    formulaHistoryRef: formulaHistoryRef,
+    preTextRef: preTextRef,
+    preFormulaSpanValuesRef: preFormulaSpanValuesRef,
+    resetFormulaHistory: resetFormulaHistory,
+    handleFormulaHistoryUndoRedo: handleFormulaHistoryUndoRedo,
+    capturePreFormulaState: capturePreFormulaState,
+    appendFormulaHistoryFromPrimaryEditor: appendFormulaHistoryFromPrimaryEditor
+  };
+}

package/es/hooks/useRerenderOnFormulaCaret.d.ts

@@ -0,0 +1,2 @@
+import { type RefObject } from "react";
+export declare function useRerenderOnFormulaCaret(editorRef: RefObject<HTMLDivElement | null>, editSessionActive: boolean): void;

package/es/hooks/useRerenderOnFormulaCaret.js

@@ -0,0 +1,28 @@
+import { useEffect, useState } from "react";
+export function useRerenderOnFormulaCaret(editorRef, editSessionActive) {
+  var _a = useState(0),
+    bump = _a[1];
+  useEffect(function () {
+    if (!editSessionActive) {
+      return function () {};
+    }
+    var onSelectionChange = function onSelectionChange() {
+      var _a, _b;
+      var el = editorRef.current;
+      if (!el) return;
+      var text = (_b = (_a = el.innerText) === null || _a === void 0 ? void 0 : _a.trim()) !== null && _b !== void 0 ? _b : "";
+      if (!text.startsWith("=")) return;
+      var sel = window.getSelection();
+      if (!(sel === null || sel === void 0 ? void 0 : sel.rangeCount) || !el.contains(sel.getRangeAt(0).startContainer)) {
+        return;
+      }
+      bump(function (n) {
+        return n + 1;
+      });
+    };
+    document.addEventListener("selectionchange", onSelectionChange);
+    return function () {
+      document.removeEventListener("selectionchange", onSelectionChange);
+    };
+  }, [editSessionActive, editorRef]);
+}

package/lib/components/ConditionFormat/ConditionRules.js

@@ -303,6 +303,10 @@ var ConditionRules = function ConditionRules(_a) {
     text: "textContains",
     value: "()",
     label: "Text Contains"
+  }, {
+    text: "empty",
+    value: "",
+    label: "Empty"
   }, {
     text: "occurrenceDate",
     value: conditionformat.yesterday,
@@ -343,7 +347,7 @@ var ConditionRules = function ConditionRules(_a) {
       marginBottom: "16px"
     }
   }, matchedConditionFormatKey.map(function (key) {
-    var _a, _b;
+    var _a, _b, _c;
     return /*#__PURE__*/_react.default.createElement("div", {
       onClick: function onClick() {
         var _a;
@@ -394,10 +398,10 @@ var ConditionRules = function ConditionRules(_a) {
     }, /*#__PURE__*/_react.default.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.default.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.default.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 = (0, _helper.numberToColumn)(range.column[0] + 1);
       var endCol = (0, _helper.numberToColumn)(range.column[1] + 1);
       var startRow = range.row[0] + 1;
@@ -476,6 +480,12 @@ var ConditionRules = function ConditionRules(_a) {
   }, "Format cells if"), /*#__PURE__*/_react.default.createElement(_ui.Select, {
     value: type,
     onValueChange: function onValueChange(value) {
+      if (value === "empty" || type === "empty") {
+        setContext(function (ctx) {
+          ctx.conditionRules.rulesValue = "";
+        });
+        setEditConditionFormatValue(null);
+      }
       setType(value);
     }
   }, /*#__PURE__*/_react.default.createElement(_ui.SelectTrigger, null, /*#__PURE__*/_react.default.createElement(_ui.SelectValue, null, /*#__PURE__*/_react.default.createElement("div", {
@@ -813,7 +823,7 @@ var ConditionRules = function ConditionRules(_a) {
     },
     tabIndex: 0
   }, button.cancel), editConditionFormatKey !== null ? (/*#__PURE__*/_react.default.createElement(_ui.Button, {
-    disabled: context.conditionRules.rulesValue === "",
+    disabled: context.conditionRules.rulesValue === "" && type !== "empty",
     variant: "default",
     style: {
       minWidth: "80px"
@@ -823,7 +833,7 @@ var ConditionRules = function ConditionRules(_a) {
     },
     tabIndex: 0
   }, "Update rule")) : (/*#__PURE__*/_react.default.createElement(_ui.Button, {
-    disabled: context.conditionRules.rulesValue === "",
+    disabled: context.conditionRules.rulesValue === "" && type !== "empty",
     variant: "default",
     style: {
       minWidth: "80px"

package/lib/components/ConditionFormat/index.js

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

package/lib/components/ContextMenu/index.js

@@ -21,7 +21,7 @@ require("./index.css");
 var _Menu = _interopRequireDefault(require("./Menu"));
 require("tippy.js/dist/tippy.css");
 var _SVGIcon = _interopRequireDefault(require("../SVGIcon"));
-var _LucideIcon = require("../../components/SheetOverlay/LucideIcon");
+var _LucideIcon = require("../SheetOverlay/LucideIcon");
 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 _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {

package/lib/components/DataVerification/ColorPicker.js

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