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

package/lib/hooks/useFormulaEditorHistory.js

@@ -15,17 +15,6 @@ function normalizeEditorHtmlSnapshot(html) {
   }
   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 preHtmlRef = (0, _react.useRef)("");
@@ -51,11 +40,6 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     var history = formulaHistoryRef.current;
     var current = history.entries[history.index];
     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);
@@ -64,16 +48,9 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     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, preserveSelection) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     var primaryEl = primaryRef.current;
     if (!primaryEl) return;
     isApplyingHistoryRef.current = true;
@@ -94,11 +71,6 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     } 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 () {
@@ -108,22 +80,13 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     });
   }, [cellInputRef, fxInputRef, primary, primaryRef]);
   var handleFormulaHistoryUndoRedo = (0, _react.useCallback)(function (isRedo) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     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) {
-      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 : "");
+        var liveHtml = normalizeEditorHtmlSnapshot((_b = (_a = primaryRef.current) === null || _a === void 0 ? void 0 : _a.innerHTML) !== null && _b !== void 0 ? _b : "");
         if (liveHtml !== "") {
           history.entries[0] = {
             html: "",
@@ -132,11 +95,6 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
           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;
         }
       }
@@ -146,17 +104,10 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     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, primaryRef]);
   var capturePreEditorHistoryState = (0, _react.useCallback)(function () {
-    var _a, _b, _c;
+    var _a;
     var el = primaryRef.current;
     if (!el) return;
     preTextRef.current = el.innerText;
@@ -165,15 +116,6 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     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 appendEditorHistoryFromPrimaryEditor = (0, _react.useCallback)(function (getCaret) {
     var _a, _b;
@@ -185,16 +127,6 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
     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 : "";
@@ -202,12 +134,6 @@ function useFormulaEditorHistory(primaryRef, cellInputRef, fxInputRef, _setConte
         html: seedHtml,
         caret: preCaretRef.current
       });
-    } else {
-      console.log("[Hist:seedSkippedAlreadyActive]", {
-        index: history.index,
-        entriesLen: history.entries.length,
-        entries: historyForLog(history.entries, history.index)
-      });
     }
     pushFormulaHistoryEntry({
       html: snapshotHtml,

package/lib/hooks/useRerenderOnFormulaCaret.d.ts

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

package/lib/hooks/useRerenderOnFormulaCaret.js

@@ -5,15 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useRerenderOnFormulaCaret = useRerenderOnFormulaCaret;
 var _react = require("react");
-function useRerenderOnFormulaCaret(editorRef, editSessionActive) {
+function useRerenderOnFormulaCaret(editorRef, editSessionActive, onAfterCaretMove) {
   var _a = (0, _react.useState)(0),
     bump = _a[1];
+  var onAfterCaretMoveRef = (0, _react.useRef)(onAfterCaretMove);
+  onAfterCaretMoveRef.current = onAfterCaretMove;
   (0, _react.useEffect)(function () {
     if (!editSessionActive) {
       return function () {};
     }
     var onSelectionChange = function onSelectionChange() {
-      var _a, _b;
+      var _a, _b, _c;
       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 : "";
@@ -25,6 +27,7 @@ function useRerenderOnFormulaCaret(editorRef, editSessionActive) {
       bump(function (n) {
         return n + 1;
       });
+      (_c = onAfterCaretMoveRef.current) === null || _c === void 0 ? void 0 : _c.call(onAfterCaretMoveRef);
     };
     document.addEventListener("selectionchange", onSelectionChange);
     return function () {

package/package.json

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