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

package/lib/components/SheetOverlay/helper.js

@@ -9,14 +9,18 @@ exports.decrementColumn = decrementColumn;
 exports.decrementRow = decrementRow;
 exports.getCursorPosition = getCursorPosition;
 exports.getFunctionNameFromFormulaCaretSpans = getFunctionNameFromFormulaCaretSpans;
+exports.getSelectionOffsets = getSelectionOffsets;
 exports.incrementColumn = incrementColumn;
 exports.incrementRow = incrementRow;
+exports.isEditorUndoRedoKeyEvent = isEditorUndoRedoKeyEvent;
 exports.isLetterNumberPattern = isLetterNumberPattern;
 exports.moveCursorToEnd = moveCursorToEnd;
 exports.numberToColumn = numberToColumn;
 exports.removeLastSpan = removeLastSpan;
 exports.setCursorPosition = setCursorPosition;
+exports.setSelectionOffsets = setSelectionOffsets;
 exports.shouldShowFormulaFunctionList = shouldShowFormulaFunctionList;
+exports.shouldUseCustomEditorHistory = shouldUseCustomEditorHistory;
 function moveCursorToEnd(editableDiv) {
   editableDiv.focus();
   var range = document.createRange();
@@ -37,6 +41,44 @@ function getCursorPosition(editableDiv) {
   preRange.setEnd(range.endContainer, range.endOffset);
   return preRange.toString().length;
 }
+function getSelectionOffsets(editableDiv) {
+  var selection = window.getSelection();
+  if (!selection || selection.rangeCount === 0) {
+    var caret = getCursorPosition(editableDiv);
+    return {
+      start: caret,
+      end: caret
+    };
+  }
+  var range = selection.getRangeAt(0);
+  if (!editableDiv.contains(range.startContainer) || !editableDiv.contains(range.endContainer)) {
+    var caret = getCursorPosition(editableDiv);
+    return {
+      start: caret,
+      end: caret
+    };
+  }
+  var startRange = range.cloneRange();
+  startRange.selectNodeContents(editableDiv);
+  startRange.setEnd(range.startContainer, range.startOffset);
+  var start = startRange.toString().length;
+  var endRange = range.cloneRange();
+  endRange.selectNodeContents(editableDiv);
+  endRange.setEnd(range.endContainer, range.endOffset);
+  var end = endRange.toString().length;
+  return {
+    start: Math.max(0, Math.min(start, end)),
+    end: Math.max(start, end)
+  };
+}
+function isEditorUndoRedoKeyEvent(e) {
+  if (!e.metaKey && !e.ctrlKey) return false;
+  if (e.code === "KeyZ" || e.code === "KeyY") return true;
+  return e.keyCode === 90 || e.keyCode === 89;
+}
+function shouldUseCustomEditorHistory(editorInnerTextTrimmed, historyActive) {
+  return historyActive || editorInnerTextTrimmed.length > 0;
+}
 function setCursorPosition(editableDiv, targetOffset) {
   var _a, _b;
   editableDiv.focus();
@@ -63,6 +105,43 @@ function setCursorPosition(editableDiv, targetOffset) {
   selection.removeAllRanges();
   selection.addRange(range);
 }
+function setSelectionOffsets(editableDiv, startOffset, endOffset) {
+  editableDiv.focus();
+  var selection = window.getSelection();
+  if (!selection) return;
+  var startTarget = Math.max(0, Math.min(startOffset, endOffset));
+  var endTarget = Math.max(startTarget, endOffset);
+  var walker = document.createTreeWalker(editableDiv, NodeFilter.SHOW_TEXT);
+  var resolve = function resolve(target) {
+    var _a, _b;
+    var remaining = target;
+    var node = walker.nextNode();
+    while (node) {
+      var len = (_b = (_a = node.textContent) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
+      if (remaining <= len) return {
+        node: node,
+        offset: remaining
+      };
+      remaining -= len;
+      node = walker.nextNode();
+    }
+    return null;
+  };
+  walker.currentNode = editableDiv;
+  var startPos = resolve(startTarget);
+  walker.currentNode = editableDiv;
+  var endPos = resolve(endTarget);
+  var range = document.createRange();
+  if (startPos && endPos) {
+    range.setStart(startPos.node, startPos.offset);
+    range.setEnd(endPos.node, endPos.offset);
+  } else {
+    range.selectNodeContents(editableDiv);
+    range.collapse(false);
+  }
+  selection.removeAllRanges();
+  selection.addRange(range);
+}
 function buildFormulaSuggestionText(editableDiv, formulaName) {
   var fullText = editableDiv.innerText || "";
   var selection = window.getSelection();

package/lib/components/Toolbar/ColorPicker.js

@@ -19,8 +19,9 @@ var ColorPicker = function ColorPicker(_a) {
       return /*#__PURE__*/_react.default.createElement("div", {
         key: c,
         className: "fortune-toolbar-color-picker-item",
-        onClick: function onClick() {
-          return onPick(c);
+        onMouseDown: function onMouseDown(e) {
+          e.preventDefault();
+          onPick(c);
         },
         tabIndex: 0,
         style: {

package/lib/components/Toolbar/CustomColor.js

@@ -13,11 +13,15 @@ var CustomColor = exports.CustomColor = function CustomColor(_a) {
   var onCustomPick = _a.onCustomPick,
     onColorPick = _a.onColorPick;
   return /*#__PURE__*/_react.default.createElement("div", {
-    id: "fortune-custom-color"
+    id: "fortune-custom-color",
+    onMouseDown: function onMouseDown(e) {
+      e.preventDefault();
+    }
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: "color-reset",
-    onClick: function onClick() {
-      return onCustomPick(undefined);
+    onMouseDown: function onMouseDown(e) {
+      e.preventDefault();
+      onCustomPick(undefined);
     },
     tabIndex: 0
   }, /*#__PURE__*/_react.default.createElement(_SVGIcon.default, {

package/lib/components/Toolbar/index.js

@@ -472,6 +472,14 @@ var Toolbar = function Toolbar(_a) {
     settings = _f.settings,
     handleUndo = _f.handleUndo,
     handleRedo = _f.handleRedo;
+  var restoreEditorFocusAfterToolbarAction = (0, _react.useCallback)(function () {
+    if (context.luckysheetCellUpdate.length === 0) return;
+    requestAnimationFrame(function () {
+      var owner = (0, _fortuneCore.getFormulaEditorOwner)(context);
+      var target = owner === "fx" ? refs.fxInput.current : refs.cellInput.current;
+      target === null || target === void 0 ? void 0 : target.focus();
+    });
+  }, [context, refs.cellInput, refs.fxInput]);
   var contextRef = (0, _react.useRef)(context);
   var containerRef = (0, _react.useRef)(null);
   var _g = (0, _react.useState)(-1),
@@ -1721,7 +1729,8 @@ var Toolbar = function Toolbar(_a) {
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: containerRef,
     className: "fortune-toolbar",
-    "aria-label": toolbar.toolbar
+    "aria-label": toolbar.toolbar,
+    onMouseUpCapture: restoreEditorFocusAfterToolbarAction
   }, /*#__PURE__*/_react.default.createElement(_dataVerificationPortal.default, {
     visible: showDataValidation
   }), /*#__PURE__*/_react.default.createElement(_conditionalFormatPortal.default, {

package/lib/hooks/useFormulaEditorHistory.d.ts

@@ -2,22 +2,22 @@ import { type RefObject } from "react";
 import { type Context } from "@fileverse-dev/fortune-core";
 import type { SetContextOptions } from "../context";
 export type FormulaHistoryEntry = {
-    text: string;
+    html: 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): {
+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;
+    capturePreEditorHistoryState: () => void;
+    appendEditorHistoryFromPrimaryEditor: (getCaret: () => number) => void;
     capturePreFormulaState: () => void;
     appendFormulaHistoryFromPrimaryEditor: (getCaret: () => number) => void;
 };

package/lib/hooks/useFormulaEditorHistory.js

@@ -5,50 +5,79 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useFormulaEditorHistory = useFormulaEditorHistory;
 var _react = require("react");
-var _lodash = _interopRequireDefault(require("lodash"));
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _helper = require("../components/SheetOverlay/helper");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var MAX_FORMULA_HISTORY = 100;
-function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, setContext, primary) {
+function normalizeEditorHtmlSnapshot(html) {
+  var stripped = (html !== null && html !== void 0 ? html : "").replace(/\u200B/g, "").trim();
+  if (stripped === "" || stripped === "<br>" || stripped === "<div><br></div>" || stripped === "<div></div>") {
+    return "";
+  }
+  return html !== null && html !== void 0 ? html : "";
+}
+function historyForLog(entries, index) {
+  return entries.map(function (e, i) {
+    var _a, _b;
+    return {
+      i: i,
+      active: i === index,
+      len: ((_a = e.html) !== null && _a !== void 0 ? _a : "").length,
+      preview: ((_b = e.html) !== null && _b !== void 0 ? _b : "").replace(/\s+/g, " ").slice(0, 24)
+    };
+  });
+}
+function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setContext, primary) {
   var preTextRef = (0, _react.useRef)("");
-  var preFormulaSpanValuesRef = (0, _react.useRef)(null);
+  var preHtmlRef = (0, _react.useRef)("");
+  var preCaretRef = (0, _react.useRef)(0);
+  var startedFromEmptyRef = (0, _react.useRef)(true);
   var formulaHistoryRef = (0, _react.useRef)({
     active: false,
     entries: [],
     index: -1
   });
+  var isApplyingHistoryRef = (0, _react.useRef)(false);
   var resetFormulaHistory = (0, _react.useCallback)(function () {
     formulaHistoryRef.current = {
       active: false,
       entries: [],
       index: -1
     };
-    preFormulaSpanValuesRef.current = null;
+    preHtmlRef.current = "";
+    preCaretRef.current = 0;
+    startedFromEmptyRef.current = true;
   }, []);
   var pushFormulaHistoryEntry = (0, _react.useCallback)(function (entry) {
     var history = formulaHistoryRef.current;
     var current = history.entries[history.index];
-    if (current && current.spanValues.length > 0 && entry.spanValues.length > 0 && _lodash.default.isEqual(current.spanValues, entry.spanValues)) {
-      return;
-    }
-    if (current && current.spanValues.length === 0 && entry.spanValues.length === 0 && current.text === entry.text && current.caret === entry.caret) {
+    if (current && current.html === entry.html) {
+      console.log("[Hist:pushSkipDuplicate]", {
+        currentHtmlLen: current.html.length,
+        entryHtmlLen: entry.html.length,
+        index: history.index
+      });
       return;
     }
     var nextEntries = history.entries.slice(0, history.index + 1);
     nextEntries.push(entry);
-    if (nextEntries.length > MAX_FORMULA_HISTORY) {
-      nextEntries.shift();
-    }
+    if (nextEntries.length > MAX_FORMULA_HISTORY) nextEntries.shift();
     history.entries = nextEntries;
     history.index = nextEntries.length - 1;
     history.active = true;
+    console.log("[Hist:push]", {
+      htmlLen: entry.html.length,
+      caret: entry.caret,
+      entriesLen: history.entries.length,
+      index: history.index,
+      entries: historyForLog(history.entries, history.index)
+    });
   }, []);
-  var applyFormulaHistoryEntry = (0, _react.useCallback)(function (entry) {
+  var applyFormulaHistoryEntry = (0, _react.useCallback)(function (entry, preserveSelection) {
+    var _a, _b, _c, _d, _e;
     var primaryEl = primaryRef.current;
     if (!primaryEl) return;
-    var safeText = (0, _fortuneCore.escapeScriptTag)(entry.text || "");
-    var html = safeText.startsWith("=") ? (0, _fortuneCore.functionHTMLGenerate)(safeText) : (0, _fortuneCore.escapeHTMLTag)(safeText);
+    isApplyingHistoryRef.current = true;
+    var html = (0, _fortuneCore.escapeScriptTag)((_a = entry.html) !== null && _a !== void 0 ? _a : "");
     var cell = cellInputRef.current;
     var fx = fxInputRef.current;
     primaryEl.innerHTML = html;
@@ -57,70 +86,142 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, setContex
     } else if (cell) {
       cell.innerHTML = html;
     }
-    (0, _helper.setCursorPosition)(primaryEl, Math.min(entry.caret, entry.text.length));
-    setContext(function (draftCtx) {
-      if (primary === "cell") {
-        if (!cellInputRef.current) return;
-        (0, _fortuneCore.handleFormulaInput)(draftCtx, fxInputRef.current, cellInputRef.current, 0);
-      } else {
-        if (!fxInputRef.current) return;
-        (0, _fortuneCore.handleFormulaInput)(draftCtx, cellInputRef.current, fxInputRef.current, 0);
-      }
+    var textLen = (_c = (_b = primaryEl.innerText) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0;
+    if (preserveSelection && preserveSelection.end > preserveSelection.start && textLen > 0) {
+      var start = Math.max(0, Math.min(preserveSelection.start, textLen));
+      var end = Math.max(start, Math.min(preserveSelection.end, textLen));
+      (0, _helper.setSelectionOffsets)(primaryEl, start, end);
+    } else {
+      (0, _helper.setCursorPosition)(primaryEl, Math.max(0, textLen));
+    }
+    console.log("[Hist:apply]", {
+      entryHtmlLen: ((_d = entry.html) !== null && _d !== void 0 ? _d : "").length,
+      afterHtmlLen: ((_e = primaryEl.innerHTML) !== null && _e !== void 0 ? _e : "").length,
+      afterTextLen: textLen
+    });
+    requestAnimationFrame(function () {
+      requestAnimationFrame(function () {
+        setTimeout(function () {
+          isApplyingHistoryRef.current = false;
+        }, 120);
+      });
     });
-  }, [cellInputRef, fxInputRef, primary, primaryRef, setContext]);
+  }, [cellInputRef, fxInputRef, primary, primaryRef]);
   var handleFormulaHistoryUndoRedo = (0, _react.useCallback)(function (isRedo) {
+    var _a, _b, _c, _d;
     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;
+    if (nextIndex < 0 || nextIndex >= history.entries.length) {
+      console.log("[Hist:undoRedoBoundary]", {
+        isRedo: isRedo,
+        index: history.index,
+        entriesLen: history.entries.length,
+        nextIndex: nextIndex,
+        startedFromEmpty: startedFromEmptyRef.current,
+        liveHtmlLen: normalizeEditorHtmlSnapshot((_b = (_a = primaryRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "").length,
+        entries: historyForLog(history.entries, history.index)
+      });
+      if (!isRedo && nextIndex < 0 && startedFromEmptyRef.current) {
+        var liveHtml = normalizeEditorHtmlSnapshot((_d = (_c = primaryRef.current) === null || _c === void 0 ? void 0 : _c.innerHTML) !== null && _d !== void 0 ? _d : "");
+        if (liveHtml !== "") {
+          history.entries[0] = {
+            html: "",
+            caret: 0
+          };
+          history.index = 0;
+          var currentSelection_1 = primaryRef.current ? (0, _helper.getSelectionOffsets)(primaryRef.current) : undefined;
+          applyFormulaHistoryEntry(history.entries[0], currentSelection_1);
+          console.log("[Hist:undoRedoForcedEmpty]", {
+            entriesLen: history.entries.length,
+            index: history.index,
+            entries: historyForLog(history.entries, history.index)
+          });
+          return true;
+        }
+      }
+      return false;
+    }
     history.index = nextIndex;
-    applyFormulaHistoryEntry(history.entries[nextIndex]);
+    var entry = history.entries[nextIndex];
+    var currentSelection = primaryRef.current ? (0, _helper.getSelectionOffsets)(primaryRef.current) : undefined;
+    applyFormulaHistoryEntry(entry, currentSelection);
+    console.log("[Hist:undoRedoApplied]", {
+      isRedo: isRedo,
+      nextIndex: nextIndex,
+      entriesLen: history.entries.length,
+      entryHtmlLen: entry.html.length,
+      entries: historyForLog(history.entries, history.index)
+    });
     return true;
-  }, [applyFormulaHistoryEntry]);
-  var capturePreFormulaState = (0, _react.useCallback)(function () {
+  }, [applyFormulaHistoryEntry, primaryRef]);
+  var capturePreEditorHistoryState = (0, _react.useCallback)(function () {
+    var _a, _b, _c;
     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 : "";
+    preHtmlRef.current = el.innerHTML;
+    preCaretRef.current = (0, _helper.getCursorPosition)(el);
+    if (!formulaHistoryRef.current.active) {
+      startedFromEmptyRef.current = normalizeEditorHtmlSnapshot((_a = preHtmlRef.current) !== null && _a !== void 0 ? _a : "") === "";
+    }
+    console.log("[Hist:capturePre]", {
+      preHtmlLen: ((_b = preHtmlRef.current) !== null && _b !== void 0 ? _b : "").length,
+      preTextLen: ((_c = preTextRef.current) !== null && _c !== void 0 ? _c : "").length,
+      preCaret: preCaretRef.current,
+      startedFromEmpty: startedFromEmptyRef.current,
+      historyActive: formulaHistoryRef.current.active,
+      entriesLen: formulaHistoryRef.current.entries.length,
+      index: formulaHistoryRef.current.index
     });
   }, [primaryRef]);
-  var appendFormulaHistoryFromPrimaryEditor = (0, _react.useCallback)(function (getCaret) {
+  var appendEditorHistoryFromPrimaryEditor = (0, _react.useCallback)(function (getCaret) {
     var _a, _b;
+    if (isApplyingHistoryRef.current) return;
     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 : []
-        });
-      }
+    var preHtmlSnapshot = normalizeEditorHtmlSnapshot((_a = preHtmlRef.current) !== null && _a !== void 0 ? _a : "");
+    var snapshotHtml = normalizeEditorHtmlSnapshot((_b = el.innerHTML) !== null && _b !== void 0 ? _b : "");
+    var caret = getCaret();
+    var history = formulaHistoryRef.current;
+    var wasInactive = !history.active || history.entries.length === 0;
+    console.log("[Hist:appendStart]", {
+      preHtmlLen: preHtmlSnapshot.length,
+      currentHtmlLen: snapshotHtml.length,
+      caret: caret,
+      wasInactive: wasInactive,
+      historyActive: history.active,
+      entriesLen: history.entries.length,
+      index: history.index,
+      entries: historyForLog(history.entries, history.index)
+    });
+    if (wasInactive) {
+      startedFromEmptyRef.current = preHtmlSnapshot === "";
+      var seedHtml = preHtmlSnapshot === snapshotHtml ? "" : preHtmlSnapshot !== null && preHtmlSnapshot !== void 0 ? preHtmlSnapshot : "";
       pushFormulaHistoryEntry({
-        text: currentText,
-        caret: caret,
-        spanValues: spanValues
+        html: seedHtml,
+        caret: preCaretRef.current
+      });
+    } else {
+      console.log("[Hist:seedSkippedAlreadyActive]", {
+        index: history.index,
+        entriesLen: history.entries.length,
+        entries: historyForLog(history.entries, history.index)
       });
-    } else if (formulaHistoryRef.current.active) {
-      resetFormulaHistory();
     }
-  }, [primaryRef, pushFormulaHistoryEntry, resetFormulaHistory]);
+    pushFormulaHistoryEntry({
+      html: snapshotHtml,
+      caret: caret
+    });
+  }, [primaryRef, pushFormulaHistoryEntry]);
   return {
     formulaHistoryRef: formulaHistoryRef,
     preTextRef: preTextRef,
-    preFormulaSpanValuesRef: preFormulaSpanValuesRef,
     resetFormulaHistory: resetFormulaHistory,
     handleFormulaHistoryUndoRedo: handleFormulaHistoryUndoRedo,
-    capturePreFormulaState: capturePreFormulaState,
-    appendFormulaHistoryFromPrimaryEditor: appendFormulaHistoryFromPrimaryEditor
+    capturePreEditorHistoryState: capturePreEditorHistoryState,
+    appendEditorHistoryFromPrimaryEditor: appendEditorHistoryFromPrimaryEditor,
+    capturePreFormulaState: capturePreEditorHistoryState,
+    appendFormulaHistoryFromPrimaryEditor: appendEditorHistoryFromPrimaryEditor
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.13-create-2",
+  "version": "1.3.13-create-4",
   "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.3.13-create-2",
+    "@fileverse-dev/fortune-core": "1.3.13-create-4",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",