@fileverse-dev/fortune-react 1.3.10 → 1.3.11-input-ref

package/es/components/SheetOverlay/helper.js

@@ -18,6 +18,58 @@ export function getCursorPosition(editableDiv) {
   preRange.setEnd(range.endContainer, range.endOffset);
   return preRange.toString().length;
 }
+export function setCursorPosition(editableDiv, targetOffset) {
+  var _a, _b;
+  editableDiv.focus();
+  var selection = window.getSelection();
+  if (!selection) return;
+  var range = document.createRange();
+  var walker = document.createTreeWalker(editableDiv, NodeFilter.SHOW_TEXT);
+  var remaining = Math.max(0, targetOffset);
+  var node = walker.nextNode();
+  while (node) {
+    var textLength = (_b = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+    if (remaining <= textLength) {
+      range.setStart(node, remaining);
+      range.collapse(true);
+      selection.removeAllRanges();
+      selection.addRange(range);
+      return;
+    }
+    remaining -= textLength;
+    node = walker.nextNode();
+  }
+  range.selectNodeContents(editableDiv);
+  range.collapse(false);
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
+export function buildFormulaSuggestionText(editableDiv, formulaName) {
+  var fullText = editableDiv.innerText || "";
+  var selection = window.getSelection();
+  var selectionInEditor = !!(selection === null || selection === void 0 ? void 0 : selection.rangeCount) && editableDiv.contains(selection.getRangeAt(0).startContainer);
+  var caretOffset = selectionInEditor ? getCursorPosition(editableDiv) : fullText.length;
+  var safeCaretOffset = Math.max(0, Math.min(caretOffset, fullText.length));
+  var beforeCaret = fullText.slice(0, safeCaretOffset);
+  var afterCaret = fullText.slice(safeCaretOffset);
+  var replaceStart = safeCaretOffset;
+  var tokenMatch = beforeCaret.match(/[A-Za-z_][A-Za-z0-9_]*$/);
+  if (tokenMatch) {
+    var token = tokenMatch[0];
+    var tokenStart = safeCaretOffset - token.length;
+    var charBeforeToken = tokenStart > 0 ? beforeCaret[tokenStart - 1] : "";
+    if (tokenStart === 0 || /[\s=(,+\-*/&^<>]$/.test(charBeforeToken)) {
+      replaceStart = tokenStart;
+    }
+  }
+  var shouldAddOpeningParen = !afterCaret.startsWith("(");
+  var insertedText = "".concat(formulaName).concat(shouldAddOpeningParen ? "(" : "");
+  var nextText = fullText.slice(0, replaceStart) + insertedText + afterCaret;
+  return {
+    text: nextText,
+    caretOffset: replaceStart + insertedText.length
+  };
+}
 export function isLetterNumberPattern(str) {
   var regex = /^[a-zA-Z]+\d+$/;
   return regex.test(str);

package/es/components/Workbook/index.js

@@ -142,6 +142,101 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       onOp(patchToOp(ctx, patches, options, undo));
     }
   }, [onOp]);
+  var emitYjsFromPatches = useCallback(function (ctxBefore, ctxAfter, patches) {
+    var _a;
+    var _b = (_a = ctxBefore.hooks) !== null && _a !== void 0 ? _a : {},
+      updateCellYdoc = _b.updateCellYdoc,
+      updateAllCell = _b.updateAllCell;
+    if (!updateCellYdoc) return;
+    var mapFields = new Set(["celldata", "calcChain", "dataBlockCalcFunction", "liveQueryList", "dataVerification", "hyperlink", "conditionRules"]);
+    var changeMap = new Map();
+    var upsert = function upsert(change) {
+      var _a, _b, _c;
+      var k = "".concat(change.sheetId, ":").concat((_b = (_a = change.path) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : "", ":").concat((_c = change.key) !== null && _c !== void 0 ? _c : "");
+      changeMap.set(k, change);
+    };
+    var upsertCell = function upsertCell(sheetId, r, c) {
+      var _a, _b, _c;
+      var cell = (_c = (_b = (_a = getFlowdata(ctxAfter, sheetId)) === null || _a === void 0 ? void 0 : _a[r]) === null || _b === void 0 ? void 0 : _b[c]) !== null && _c !== void 0 ? _c : null;
+      var key = "".concat(r, "_").concat(c);
+      upsert({
+        sheetId: sheetId,
+        path: ["celldata"],
+        key: key,
+        value: {
+          r: r,
+          c: c,
+          v: cell
+        },
+        type: cell == null ? "delete" : "update"
+      });
+    };
+    patches.forEach(function (p) {
+      var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
+      var path = p.path;
+      if ((path === null || path === void 0 ? void 0 : path[0]) !== "luckysheetfile") return;
+      var sheetIndex = path[1];
+      if (!_.isNumber(sheetIndex)) return;
+      var sheetBefore = (_a = ctxBefore.luckysheetfile) === null || _a === void 0 ? void 0 : _a[sheetIndex];
+      var sheetAfter = (_b = ctxAfter.luckysheetfile) === null || _b === void 0 ? void 0 : _b[sheetIndex];
+      var sheetId = (sheetAfter === null || sheetAfter === void 0 ? void 0 : sheetAfter.id) || (sheetBefore === null || sheetBefore === void 0 ? void 0 : sheetBefore.id);
+      if (!sheetId) return;
+      var root = path[2];
+      if (root === "data") {
+        if (_.isNumber(path[3]) && _.isNumber(path[4])) {
+          upsertCell(sheetId, path[3], path[4]);
+          return;
+        }
+        if (_.isNumber(path[3]) && path.length === 4) {
+          var r = path[3];
+          var beforeRow = (_d = (_c = sheetBefore === null || sheetBefore === void 0 ? void 0 : sheetBefore.data) === null || _c === void 0 ? void 0 : _c[r]) !== null && _d !== void 0 ? _d : [];
+          var afterRow = (_f = (_e = sheetAfter === null || sheetAfter === void 0 ? void 0 : sheetAfter.data) === null || _e === void 0 ? void 0 : _e[r]) !== null && _f !== void 0 ? _f : [];
+          var max = Math.max((_g = beforeRow.length) !== null && _g !== void 0 ? _g : 0, (_h = afterRow.length) !== null && _h !== void 0 ? _h : 0);
+          for (var c = 0; c < max; c += 1) {
+            if (!_.isEqual((_j = beforeRow[c]) !== null && _j !== void 0 ? _j : null, (_k = afterRow[c]) !== null && _k !== void 0 ? _k : null)) {
+              upsertCell(sheetId, r, c);
+            }
+          }
+          return;
+        }
+        if (path.length === 3) {
+          var dataAfter = sheetAfter === null || sheetAfter === void 0 ? void 0 : sheetAfter.data;
+          var rows = (_l = dataAfter === null || dataAfter === void 0 ? void 0 : dataAfter.length) !== null && _l !== void 0 ? _l : 0;
+          var cols = rows > 0 ? (_o = (_m = dataAfter === null || dataAfter === void 0 ? void 0 : dataAfter[0]) === null || _m === void 0 ? void 0 : _m.length) !== null && _o !== void 0 ? _o : 0 : 0;
+          var size = rows * cols;
+          if (size > 50000 && updateAllCell) {
+            updateAllCell(sheetId);
+            return;
+          }
+          for (var r = 0; r < rows; r += 1) {
+            var beforeRow = (_q = (_p = sheetBefore === null || sheetBefore === void 0 ? void 0 : sheetBefore.data) === null || _p === void 0 ? void 0 : _p[r]) !== null && _q !== void 0 ? _q : [];
+            var afterRow = (_s = (_r = sheetAfter === null || sheetAfter === void 0 ? void 0 : sheetAfter.data) === null || _r === void 0 ? void 0 : _r[r]) !== null && _s !== void 0 ? _s : [];
+            var max = Math.max((_t = beforeRow.length) !== null && _t !== void 0 ? _t : 0, (_u = afterRow.length) !== null && _u !== void 0 ? _u : 0);
+            for (var c = 0; c < max; c += 1) {
+              if (!_.isEqual((_v = beforeRow[c]) !== null && _v !== void 0 ? _v : null, (_w = afterRow[c]) !== null && _w !== void 0 ? _w : null)) {
+                upsertCell(sheetId, r, c);
+              }
+            }
+          }
+        }
+        return;
+      }
+      if (typeof root === "string" && mapFields.has(root)) {
+        var key = path[3];
+        if (typeof key === "string") {
+          upsert({
+            sheetId: sheetId,
+            path: [root],
+            key: key,
+            value: p.value,
+            type: p.op === "remove" || p.value == null ? "delete" : "update"
+          });
+        }
+      }
+    });
+    var changes = Array.from(changeMap.values());
+    if (changes.length > 0) updateCellYdoc(changes);
+  }, []);
   function reduceUndoList(ctx, ctxBefore) {
     var sheetsId = ctx.luckysheetfile.map(function (sheet) {
       return sheet.id;
@@ -299,6 +394,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
           delete inversedOptions.addSheet.value.data;
         }
         emitOp(newContext, history.inversePatches, inversedOptions, true);
+        emitYjsFromPatches(ctx_, newContext, history.inversePatches);
         var sheetIdxAfterUndo = getSheetIndex(newContext, newContext.currentSheetId);
         var nw = __assign(__assign({}, newContext), sheetIdxAfterUndo != null && ((_f = newContext.luckysheetfile[sheetIdxAfterUndo]) === null || _f === void 0 ? void 0 : _f.config) != null ? {
           config: newContext.luckysheetfile[sheetIdxAfterUndo].config
@@ -327,6 +423,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         });
         globalCache.current.undoList.push(history);
         emitOp(newContext, history.patches, history.options);
+        emitYjsFromPatches(ctx_, newContext, history.patches);
         var sheetIdxAfterRedo = getSheetIndex(newContext, newContext.currentSheetId);
         var nw = __assign(__assign({}, newContext), sheetIdxAfterRedo != null && ((_a = newContext.luckysheetfile[sheetIdxAfterRedo]) === null || _a === void 0 ? void 0 : _a.config) != null ? {
           config: newContext.luckysheetfile[sheetIdxAfterRedo].config
@@ -353,18 +450,13 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   useEffect(function () {
     var _a, _b;
     setContext(function (ctx) {
-      var _a, _b;
       var gridData = getFlowdata(ctx);
       var cellData = api.dataToCelldata(gridData);
-      var denominatedUsed = false;
-      for (var _i = 0, cellData_1 = cellData; _i < cellData_1.length; _i++) {
-        var cell = cellData_1[_i];
+      var denominatedUsed = (cellData !== null && cellData !== void 0 ? cellData : []).some(function (cell) {
+        var _a, _b;
         var value = (_b = (_a = cell === null || cell === void 0 ? void 0 : cell.v) === null || _a === void 0 ? void 0 : _a.m) === null || _b === void 0 ? void 0 : _b.toString();
-        if ((value === null || value === void 0 ? void 0 : value.includes("BTC")) || (value === null || value === void 0 ? void 0 : value.includes("ETH")) || (value === null || value === void 0 ? void 0 : value.includes("SOL"))) {
-          denominatedUsed = true;
-          break;
-        }
-      }
+        return (value === null || value === void 0 ? void 0 : value.includes("BTC")) || (value === null || value === void 0 ? void 0 : value.includes("ETH")) || (value === null || value === void 0 ? void 0 : value.includes("SOL"));
+      });
       var denoWarn = document.getElementById("denomination-warning");
       var scrollBar = document.getElementsByClassName("luckysheet-scrollbar-x")[0];
       if (denominatedUsed && denoWarn) {
@@ -438,6 +530,32 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       context.hooks.afterOrderChanges();
     }
   }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.order]);
+  var sheetColorSig = useMemo(function () {
+    var _a;
+    return ((_a = context === null || context === void 0 ? void 0 : context.luckysheetfile) !== null && _a !== void 0 ? _a : []).map(function (s) {
+      var _a;
+      return "".concat(s.id, ":").concat((_a = s.color) !== null && _a !== void 0 ? _a : "");
+    }).join("|");
+  }, [context === null || context === void 0 ? void 0 : context.luckysheetfile]);
+  useEffect(function () {
+    var _a;
+    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.afterColorChanges) {
+      context.hooks.afterColorChanges();
+    }
+  }, [sheetColorSig]);
+  var sheetHideSig = useMemo(function () {
+    var _a;
+    return ((_a = context === null || context === void 0 ? void 0 : context.luckysheetfile) !== null && _a !== void 0 ? _a : []).map(function (s) {
+      var _a;
+      return "".concat(s.id, ":").concat((_a = s.hide) !== null && _a !== void 0 ? _a : 0);
+    }).join("|");
+  }, [context === null || context === void 0 ? void 0 : context.luckysheetfile]);
+  useEffect(function () {
+    var _a;
+    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.afterHideChanges) {
+      context.hooks.afterHideChanges();
+    }
+  }, [sheetHideSig]);
   useEffect(function () {
     var _a;
     if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.afterConfigChanges) {
@@ -504,6 +622,18 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       context.hooks.conditionFormatChange();
     }
   }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.luckysheet_conditionformat_save]);
+  useEffect(function () {
+    var _a;
+    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.filterSelectChange) {
+      context.hooks.filterSelectChange();
+    }
+  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.filter_select]);
+  useEffect(function () {
+    var _a;
+    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.filterChange) {
+      context.hooks.filterChange();
+    }
+  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.filter]);
   useEffect(function () {
     var _a;
     if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.hyperlinkChange) {

package/es/utils/convertCellsToCrypto.js

@@ -274,9 +274,12 @@ export function convertCellsToCrypto(_a) {
         });
       });
       setContext(function (ctx) {
+        var _a;
         var d = getFlowdata(ctx);
         if (!d || !Array.isArray(d)) return;
+        var ydocChanges = [];
         cellUpdates.forEach(function (_a) {
+          var _b, _c;
           var row = _a.row,
             col = _a.col,
             baseValue = _a.baseValue,
@@ -296,7 +299,21 @@ export function convertCellsToCrypto(_a) {
           cellCp.baseCurrency = baseCurrency.toLowerCase();
           cellCp.baseCurrencyPrice = baseCurrencyPrice;
           d[row][col] = cellCp;
+          ydocChanges.push({
+            sheetId: ctx.currentSheetId,
+            path: ["celldata"],
+            value: {
+              r: row,
+              c: col,
+              v: (_c = (_b = d[row]) === null || _b === void 0 ? void 0 : _b[col]) !== null && _c !== void 0 ? _c : null
+            },
+            key: "".concat(row, "_").concat(col),
+            type: "update"
+          });
         });
+        if (ydocChanges.length > 0 && ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc)) {
+          ctx.hooks.updateCellYdoc(ydocChanges);
+        }
       });
       setContext(function (ctx) {
         api.calculateSheetFromula(ctx, ctx.currentSheetId);

package/lib/components/FxEditor/index.js

@@ -94,13 +94,19 @@ var FxEditor = function FxEditor() {
     return document.querySelector(".luckysheet-formula-search-item-active");
   }, []);
   var insertSelectedFormula = (0, _react.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 = (0, _helper.buildFormulaSuggestionText)(fxEditor, formulaName),
+      text = _a.text,
+      caretOffset = _a.caretOffset;
+    var safeText = (0, _fortuneCore.escapeScriptTag)(text);
+    var html = safeText.startsWith("=") ? (0, _fortuneCore.functionHTMLGenerate)(safeText) : (0, _fortuneCore.escapeHTMLTag)(safeText);
+    fxEditor.innerHTML = html;
     if (cellEditor) {
-      cellEditor.innerHTML = ht;
+      cellEditor.innerHTML = html;
     }
-    (0, _helper.moveCursorToEnd)(refs.fxInput.current);
+    (0, _helper.setCursorPosition)(fxEditor, caretOffset);
     setContext(function (draftCtx) {
       draftCtx.functionCandidates = [];
       draftCtx.defaultCandidates = [];