@fileverse-dev/fortune-react 1.2.89 → 1.2.90-bold-1

package/es/components/SheetOverlay/InputBox.js

@@ -8,7 +8,7 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-import { cancelNormalSelected, getCellValue, getInlineStringHTML, getStyleByCell, isInlineStringCell, moveToEnd, getFlowdata, handleFormulaInput, moveHighlightCell, escapeScriptTag, valueShowEs, createRangeHightlight, isShowHidenCR, israngeseleciton, escapeHTMLTag, isAllowEdit, getrangeseleciton, indexToColumnChar, handleBold, handleItalic, handleUnderline, handleStrikeThrough, setCellValue } from "@fileverse-dev/fortune-core";
+import { cancelNormalSelected, getCellValue, getInlineStringHTML, getStyleByCell, isInlineStringCell, moveToEnd, getFlowdata, handleFormulaInput, moveHighlightCell, escapeScriptTag, valueShowEs, createRangeHightlight, isShowHidenCR, israngeseleciton, escapeHTMLTag, isAllowEdit, getrangeseleciton, indexToColumnChar, handleItalic, handleUnderline, handleStrikeThrough } from "@fileverse-dev/fortune-core";
 import React, { useContext, useEffect, useMemo, useRef, useCallback, useLayoutEffect, useState } from "react";
 import _ from "lodash";
 import { Tooltip } from "@fileverse/ui";
@@ -65,22 +65,15 @@ var InputBox = function InputBox() {
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = useRef("");
   var placeRef = useRef("");
-  var rootRef = useRef(null);
   var isComposingRef = useRef(false);
-  var placeCursorAtEnd = function placeCursorAtEnd(el) {
-    var range = document.createRange();
-    var sel = window.getSelection();
-    range.selectNodeContents(el);
-    range.collapse(false);
-    sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();
-    sel === null || sel === void 0 ? void 0 : sel.addRange(range);
-  };
+  var ZWSP = "\u200B";
   var ensureNotEmpty = function ensureNotEmpty() {
-    var el = rootRef.current;
+    var el = inputRef.current;
     if (!el) return;
-    if (el.textContent === "") {
-      el.innerHTML = "\u200B";
-      placeCursorAtEnd(el);
+    var text = el.textContent;
+    if (!text || text === ZWSP) {
+      el.innerHTML = ZWSP;
+      moveCursorToEnd(el);
     }
   };
   var handleShowFormulaHint = function handleShowFormulaHint() {
@@ -148,7 +141,12 @@ var InputBox = function InputBox() {
         }
       }
       refs.globalCache.overwriteCell = false;
-      if (!refs.globalCache.ignoreWriteCell && inputRef.current) inputRef.current.innerHTML = escapeHTMLTag(escapeScriptTag(value_1));
+      if (!refs.globalCache.ignoreWriteCell && inputRef.current && value_1) {
+        inputRef.current.innerHTML = escapeHTMLTag(escapeScriptTag(value_1));
+      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && !value_1) {
+        var valueD = getCellValue(row_index, col_index, flowdata, "f");
+        inputRef.current.innerText = valueD;
+      }
       refs.globalCache.ignoreWriteCell = false;
       if (!refs.globalCache.doNotFocus) {
         setTimeout(function () {
@@ -170,7 +168,6 @@ var InputBox = function InputBox() {
   }, [context.luckysheet_select_save]);
   useEffect(function () {
     var _a;
-    if (isComposingRef.current) return;
     if (!firstSelection || ((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show) || _.isEmpty(context.luckysheetCellUpdate)) {
       setIsInputBoxActive(false);
     }
@@ -180,7 +177,6 @@ var InputBox = function InputBox() {
   }, []);
   var insertSelectedFormula = useCallback(function (formulaName) {
     var _a;
-    if (isComposingRef.current) return;
     if (/^=[a-zA-Z]+$/.test(inputRef.current.innerText)) {
       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>");
       inputRef.current.innerHTML = ht;
@@ -245,7 +241,6 @@ var InputBox = function InputBox() {
   }, [getActiveFormula]);
   var selectActiveFormula = useCallback(function (e) {
     var _a, _b;
-    if (isComposingRef.current) return;
     var formulaName = (_b = (_a = getActiveFormula()) === null || _a === void 0 ? void 0 : _a.querySelector(".luckysheet-formula-search-func")) === null || _b === void 0 ? void 0 : _b.textContent;
     var lastSpanText = getLastInputSpanText();
     if (formulaName && !isLetterNumberPattern(lastSpanText)) {
@@ -280,12 +275,8 @@ var InputBox = function InputBox() {
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
     if (e.metaKey) {
-      if (e.code === "KeyB") {
-        handleBold(context, inputRef.current);
-        stopPropagation(e);
-      } else if (e.code === "KeyI") {
+      if (e.code === "KeyB") {} else if (e.code === "KeyI") {
         handleItalic(context, inputRef.current);
-        stopPropagation(e);
       } else if (e.code === "KeyU") {
         handleUnderline(context, inputRef.current);
         stopPropagation(e);
@@ -299,10 +290,13 @@ var InputBox = function InputBox() {
       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 () {
-        moveCursorToEnd(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-      }, 5);
+    if (e.key === "Delete" || e.key === "Backspace") {
+      requestAnimationFrame(ensureNotEmpty);
+      if (getCursorPosition(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === (inputRef === null || inputRef === void 0 ? void 0 : inputRef.current.innerText.length)) {
+        setTimeout(function () {
+          moveCursorToEnd(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+        }, 5);
+      }
     }
     var refCell = placeRef.current;
     if (e.key === "ArrowUp") {
@@ -414,9 +408,6 @@ var InputBox = function InputBox() {
   };
   var onChange = useCallback(function (__, isBlur) {
     var _a;
-    if (isComposingRef.current) {
-      return;
-    }
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
     if (((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
@@ -443,7 +434,6 @@ var InputBox = function InputBox() {
     }
   }, [refs.cellInput, refs.fxInput, setContext]);
   var onPaste = useCallback(function (e) {
-    if (isComposingRef.current) return;
     if (_.isEmpty(context.luckysheetCellUpdate)) {
       e.preventDefault();
     }
@@ -591,29 +581,15 @@ var InputBox = function InputBox() {
   }, /*#__PURE__*/React.createElement(ContentEditable, {
     onCompositionStart: function onCompositionStart() {
       isComposingRef.current = true;
-      console.log("onCompositionStart");
     },
-    onCompositionUpdate: function onCompositionUpdate(e) {
-      window.CompositData = e.currentTarget.innerText;
+    onCompositionUpdate: function onCompositionUpdate() {
       isComposingRef.current = true;
-      console.log("onCompositionUpdate", e.currentTarget.innerText);
     },
-    onCompositionEnd: function onCompositionEnd(e) {
+    onCompositionEnd: function onCompositionEnd() {
       ensureNotEmpty();
-      var rowIndex = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus) || 0;
-      var colIndex = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus) || 0;
-      console.log("onCompositionEnd", e.currentTarget.innerText, getCellAddress(), rowIndex, colIndex, setCellValue);
-      window.CompositData = e.currentTarget.innerText;
-      setContext(function (draftCtx) {
-        setCellValue(draftCtx, rowIndex, colIndex, null, window.CompositData);
-        window.CompositData = "";
-      });
       isComposingRef.current = false;
     },
     onMouseUp: function onMouseUp() {
-      if (isComposingRef.current) {
-        return;
-      }
       handleHideShowHint();
       if (!isComposingRef.current) {
         var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
@@ -621,12 +597,6 @@ var InputBox = function InputBox() {
       }
     },
     innerRef: function innerRef(e) {
-      rootRef.current = e;
-      if (isComposingRef.current) {
-        inputRef.current = null;
-        refs.cellInput.current = null;
-        return;
-      }
       inputRef.current = e;
       refs.cellInput.current = e;
     },

package/es/components/Workbook/index.js

@@ -503,6 +503,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var resetDeleteRowTimer;
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
+    console.log("onKeyDown", e);
     var _c = ref.current,
       getSelection = _c.getSelection,
       getSheet = _c.getSheet,
@@ -644,6 +645,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       return;
     }
     setContextWithProduce(function (draftCtx) {
+      console.log("handleGlobalKeyDown");
       handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
     });
   }, [handleRedo, handleUndo, setContextWithProduce]);

package/lib/components/SheetOverlay/InputBox.js

@@ -74,22 +74,15 @@ var InputBox = function InputBox() {
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = (0, _react.useRef)("");
   var placeRef = (0, _react.useRef)("");
-  var rootRef = (0, _react.useRef)(null);
   var isComposingRef = (0, _react.useRef)(false);
-  var placeCursorAtEnd = function placeCursorAtEnd(el) {
-    var range = document.createRange();
-    var sel = window.getSelection();
-    range.selectNodeContents(el);
-    range.collapse(false);
-    sel === null || sel === void 0 ? void 0 : sel.removeAllRanges();
-    sel === null || sel === void 0 ? void 0 : sel.addRange(range);
-  };
+  var ZWSP = "\u200B";
   var ensureNotEmpty = function ensureNotEmpty() {
-    var el = rootRef.current;
+    var el = inputRef.current;
     if (!el) return;
-    if (el.textContent === "") {
-      el.innerHTML = "\u200B";
-      placeCursorAtEnd(el);
+    var text = el.textContent;
+    if (!text || text === ZWSP) {
+      el.innerHTML = ZWSP;
+      (0, _helper.moveCursorToEnd)(el);
     }
   };
   var handleShowFormulaHint = function handleShowFormulaHint() {
@@ -157,7 +150,12 @@ var InputBox = function InputBox() {
         }
       }
       refs.globalCache.overwriteCell = false;
-      if (!refs.globalCache.ignoreWriteCell && inputRef.current) inputRef.current.innerHTML = (0, _fortuneCore.escapeHTMLTag)((0, _fortuneCore.escapeScriptTag)(value_1));
+      if (!refs.globalCache.ignoreWriteCell && inputRef.current && value_1) {
+        inputRef.current.innerHTML = (0, _fortuneCore.escapeHTMLTag)((0, _fortuneCore.escapeScriptTag)(value_1));
+      } else if (!refs.globalCache.ignoreWriteCell && inputRef.current && !value_1) {
+        var valueD = (0, _fortuneCore.getCellValue)(row_index, col_index, flowdata, "f");
+        inputRef.current.innerText = valueD;
+      }
       refs.globalCache.ignoreWriteCell = false;
       if (!refs.globalCache.doNotFocus) {
         setTimeout(function () {
@@ -179,7 +177,6 @@ var InputBox = function InputBox() {
   }, [context.luckysheet_select_save]);
   (0, _react.useEffect)(function () {
     var _a;
-    if (isComposingRef.current) return;
     if (!firstSelection || ((_a = context.rangeDialog) === null || _a === void 0 ? void 0 : _a.show) || _lodash.default.isEmpty(context.luckysheetCellUpdate)) {
       setIsInputBoxActive(false);
     }
@@ -189,7 +186,6 @@ var InputBox = function InputBox() {
   }, []);
   var insertSelectedFormula = (0, _react.useCallback)(function (formulaName) {
     var _a;
-    if (isComposingRef.current) return;
     if (/^=[a-zA-Z]+$/.test(inputRef.current.innerText)) {
       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>");
       inputRef.current.innerHTML = ht;
@@ -254,7 +250,6 @@ var InputBox = function InputBox() {
   }, [getActiveFormula]);
   var selectActiveFormula = (0, _react.useCallback)(function (e) {
     var _a, _b;
-    if (isComposingRef.current) return;
     var formulaName = (_b = (_a = getActiveFormula()) === null || _a === void 0 ? void 0 : _a.querySelector(".luckysheet-formula-search-func")) === null || _b === void 0 ? void 0 : _b.textContent;
     var lastSpanText = getLastInputSpanText();
     if (formulaName && !(0, _helper.isLetterNumberPattern)(lastSpanText)) {
@@ -289,12 +284,8 @@ var InputBox = function InputBox() {
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
     if (e.metaKey) {
-      if (e.code === "KeyB") {
-        (0, _fortuneCore.handleBold)(context, inputRef.current);
-        stopPropagation(e);
-      } else if (e.code === "KeyI") {
+      if (e.code === "KeyB") {} else if (e.code === "KeyI") {
         (0, _fortuneCore.handleItalic)(context, inputRef.current);
-        stopPropagation(e);
       } else if (e.code === "KeyU") {
         (0, _fortuneCore.handleUnderline)(context, inputRef.current);
         stopPropagation(e);
@@ -308,10 +299,13 @@ var InputBox = function InputBox() {
       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 () {
-        (0, _helper.moveCursorToEnd)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-      }, 5);
+    if (e.key === "Delete" || e.key === "Backspace") {
+      requestAnimationFrame(ensureNotEmpty);
+      if ((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 () {
+          (0, _helper.moveCursorToEnd)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+        }, 5);
+      }
     }
     var refCell = placeRef.current;
     if (e.key === "ArrowUp") {
@@ -423,9 +417,6 @@ var InputBox = function InputBox() {
   };
   var onChange = (0, _react.useCallback)(function (__, isBlur) {
     var _a;
-    if (isComposingRef.current) {
-      return;
-    }
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
     if (((_a = inputRef === null || inputRef === void 0 ? void 0 : inputRef.current) === null || _a === void 0 ? void 0 : _a.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
@@ -452,7 +443,6 @@ var InputBox = function InputBox() {
     }
   }, [refs.cellInput, refs.fxInput, setContext]);
   var onPaste = (0, _react.useCallback)(function (e) {
-    if (isComposingRef.current) return;
     if (_lodash.default.isEmpty(context.luckysheetCellUpdate)) {
       e.preventDefault();
     }
@@ -600,29 +590,15 @@ var InputBox = function InputBox() {
   }, /*#__PURE__*/_react.default.createElement(_ContentEditable.default, {
     onCompositionStart: function onCompositionStart() {
       isComposingRef.current = true;
-      console.log("onCompositionStart");
     },
-    onCompositionUpdate: function onCompositionUpdate(e) {
-      window.CompositData = e.currentTarget.innerText;
+    onCompositionUpdate: function onCompositionUpdate() {
       isComposingRef.current = true;
-      console.log("onCompositionUpdate", e.currentTarget.innerText);
     },
-    onCompositionEnd: function onCompositionEnd(e) {
+    onCompositionEnd: function onCompositionEnd() {
       ensureNotEmpty();
-      var rowIndex = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus) || 0;
-      var colIndex = (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus) || 0;
-      console.log("onCompositionEnd", e.currentTarget.innerText, getCellAddress(), rowIndex, colIndex, _fortuneCore.setCellValue);
-      window.CompositData = e.currentTarget.innerText;
-      setContext(function (draftCtx) {
-        (0, _fortuneCore.setCellValue)(draftCtx, rowIndex, colIndex, null, window.CompositData);
-        window.CompositData = "";
-      });
       isComposingRef.current = false;
     },
     onMouseUp: function onMouseUp() {
-      if (isComposingRef.current) {
-        return;
-      }
       handleHideShowHint();
       if (!isComposingRef.current) {
         var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
@@ -630,12 +606,6 @@ var InputBox = function InputBox() {
       }
     },
     innerRef: function innerRef(e) {
-      rootRef.current = e;
-      if (isComposingRef.current) {
-        inputRef.current = null;
-        refs.cellInput.current = null;
-        return;
-      }
       inputRef.current = e;
       refs.cellInput.current = e;
     },

package/lib/components/Workbook/index.js

@@ -512,6 +512,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
   var resetDeleteRowTimer;
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
+    console.log("onKeyDown", e);
     var _c = ref.current,
       getSelection = _c.getSelection,
       getSheet = _c.getSheet,
@@ -653,6 +654,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       return;
     }
     setContextWithProduce(function (draftCtx) {
+      console.log("handleGlobalKeyDown");
       (0, _fortuneCore.handleGlobalKeyDown)(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
     });
   }, [handleRedo, handleUndo, setContextWithProduce]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.89",
+  "version": "1.2.90-bold-1",
   "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.2.89",
+    "@fileverse-dev/fortune-core": "1.2.90-bold-1",
     "@fileverse/ui": "^4.1.7-patch-40",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",