@fileverse-dev/fortune-react 1.2.86-pinyin → 1.2.86-pinyin-3

package/es/components/FxEditor/index.js

@@ -1,4 +1,4 @@
-import { getFlowdata, cancelNormalSelected, getCellValue, updateCell, getInlineStringNoStyle, isInlineStringCell, escapeScriptTag, moveHighlightCell, handleFormulaInput, rangeHightlightselected, valueShowEs, isShowHidenCR, escapeHTMLTag, isAllowEdit, setCellValue } from "@fileverse-dev/fortune-core";
+import { getFlowdata, cancelNormalSelected, getCellValue, updateCell, getInlineStringNoStyle, isInlineStringCell, escapeScriptTag, moveHighlightCell, handleFormulaInput, rangeHightlightselected, valueShowEs, isShowHidenCR, escapeHTMLTag, isAllowEdit } from "@fileverse-dev/fortune-core";
 import React, { useContext, useState, useCallback, useEffect, useRef, useMemo } from "react";
 import "./index.css";
 import _ from "lodash";
@@ -35,7 +35,6 @@ var FxEditor = function FxEditor() {
   var prevFirstSelection = usePrevious(firstSelection);
   var prevSheetId = usePrevious(context.currentSheetId);
   var recentText = useRef("");
-  var isComposingRef = useRef(false);
   var handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
@@ -69,9 +68,6 @@ var FxEditor = function FxEditor() {
   }, [context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
   var onFocus = useCallback(function () {
     var _a, _b;
-    if (isComposingRef.current) {
-      return;
-    }
     if (context.allowEdit === false) {
       return;
     }
@@ -194,13 +190,8 @@ var FxEditor = function FxEditor() {
         switch (key) {
           case "Enter":
             {
-              if (isComposingRef.current) {
-                break;
-              }
               var lastCellUpdate = _.clone(draftCtx.luckysheetCellUpdate);
-              if (!isComposingRef.current) {
-                updateCell(draftCtx, draftCtx.luckysheetCellUpdate[0], draftCtx.luckysheetCellUpdate[1], refs.fxInput.current);
-              }
+              updateCell(draftCtx, draftCtx.luckysheetCellUpdate[0], draftCtx.luckysheetCellUpdate[1], refs.fxInput.current);
               draftCtx.luckysheet_select_save = [{
                 row: [lastCellUpdate[0], lastCellUpdate[0]],
                 column: [lastCellUpdate[1], lastCellUpdate[1]],
@@ -222,12 +213,12 @@ var FxEditor = function FxEditor() {
             }
           case "ArrowLeft":
             {
-              if (!isComposingRef.current) rangeHightlightselected(draftCtx, refs.fxInput.current);
+              rangeHightlightselected(draftCtx, refs.fxInput.current);
               break;
             }
           case "ArrowRight":
             {
-              if (!isComposingRef.current) rangeHightlightselected(draftCtx, refs.fxInput.current);
+              rangeHightlightselected(draftCtx, refs.fxInput.current);
               break;
             }
           default:
@@ -257,7 +248,6 @@ var FxEditor = function FxEditor() {
   };
   var onChange = useCallback(function () {
     var _a, _b, _c;
-    if (isComposingRef.current) return;
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
     if (((_b = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
@@ -353,25 +343,6 @@ var FxEditor = function FxEditor() {
     ref: inputContainerRef,
     className: "fortune-fx-input-container"
   }, /*#__PURE__*/React.createElement(ContentEditable, {
-    onCompositionStart: function onCompositionStart() {
-      isComposingRef.current = true;
-      console.log("onCompositionStart");
-    },
-    onCompositionUpdate: function onCompositionUpdate(e) {
-      window.CompositData = e.currentTarget.innerText;
-      isComposingRef.current = true;
-      console.log("onCompositionUpdate", e.currentTarget.innerText);
-    },
-    onCompositionEnd: function onCompositionEnd(e) {
-      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;
-      window.CompositData = e.currentTarget.innerText;
-      setContext(function (draftCtx) {
-        setCellValue(draftCtx, rowIndex, colIndex, null, window.CompositData);
-        window.CompositData = "";
-      });
-      isComposingRef.current = false;
-    },
     onMouseUp: function onMouseUp() {
       var _a;
       handleHideShowHint();
@@ -379,10 +350,6 @@ var FxEditor = function FxEditor() {
       setCommaCount(currentCommaCount);
     },
     innerRef: function innerRef(e) {
-      if (isComposingRef.current) {
-        refs.fxInput.current = null;
-        return;
-      }
       refs.fxInput.current = e;
     },
     className: "fortune-fx-input",

package/es/components/SheetOverlay/InputBox.js

@@ -65,7 +65,24 @@ 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 ensureNotEmpty = function ensureNotEmpty() {
+    var el = rootRef.current;
+    if (!el) return;
+    if (el.textContent === "") {
+      el.innerHTML = "\u200B";
+      placeCursorAtEnd(el);
+    }
+  };
+  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 handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
@@ -239,7 +256,7 @@ var InputBox = function InputBox() {
   }, [getActiveFormula, insertSelectedFormula]);
   var selectActiveFormulaOnClick = useCallback(function (e) {
     var _a, _b;
-    if (isComposingRef.current) return;
+    if (isComposingRef.current || !inputRef.current) return;
     if (e.target.className.includes("sign-fortune")) return;
     preText.current = inputRef.current.innerText;
     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;
@@ -256,7 +273,10 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
-    if (isComposingRef.current) return;
+    if (isComposingRef.current || !inputRef.current) {
+      ensureNotEmpty();
+      return;
+    }
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
     if (e.metaKey) {
@@ -274,8 +294,10 @@ var InputBox = function InputBox() {
         stopPropagation(e);
       }
     }
-    var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-    setCommaCount(currentCommaCount);
+    if (!isComposingRef.current) {
+      var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+      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 () {
@@ -402,8 +424,10 @@ var InputBox = function InputBox() {
     } else {
       setShowSearchHint(false);
     }
-    var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-    setCommaCount(currentCommaCount);
+    if (!isComposingRef.current) {
+      var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+      setCommaCount(currentCommaCount);
+    }
     var e = lastKeyDownEventRef.current;
     if (!e) return;
     var kcode = e.keyCode;
@@ -575,6 +599,7 @@ var InputBox = function InputBox() {
       console.log("onCompositionUpdate", e.currentTarget.innerText);
     },
     onCompositionEnd: function onCompositionEnd(e) {
+      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);
@@ -590,10 +615,13 @@ var InputBox = function InputBox() {
         return;
       }
       handleHideShowHint();
-      var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-      setCommaCount(currentCommaCount);
+      if (!isComposingRef.current) {
+        var currentCommaCount = countCommasBeforeCursor(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+        setCommaCount(currentCommaCount);
+      }
     },
     innerRef: function innerRef(e) {
+      rootRef.current = e;
       if (isComposingRef.current) {
         inputRef.current = null;
         refs.cellInput.current = null;

package/lib/components/FxEditor/index.js

@@ -44,7 +44,6 @@ var FxEditor = function FxEditor() {
   var prevFirstSelection = (0, _usePrevious.default)(firstSelection);
   var prevSheetId = (0, _usePrevious.default)(context.currentSheetId);
   var recentText = (0, _react.useRef)("");
-  var isComposingRef = (0, _react.useRef)(false);
   var handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
@@ -78,9 +77,6 @@ var FxEditor = function FxEditor() {
   }, [context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
   var onFocus = (0, _react.useCallback)(function () {
     var _a, _b;
-    if (isComposingRef.current) {
-      return;
-    }
     if (context.allowEdit === false) {
       return;
     }
@@ -203,13 +199,8 @@ var FxEditor = function FxEditor() {
         switch (key) {
           case "Enter":
             {
-              if (isComposingRef.current) {
-                break;
-              }
               var lastCellUpdate = _lodash.default.clone(draftCtx.luckysheetCellUpdate);
-              if (!isComposingRef.current) {
-                (0, _fortuneCore.updateCell)(draftCtx, draftCtx.luckysheetCellUpdate[0], draftCtx.luckysheetCellUpdate[1], refs.fxInput.current);
-              }
+              (0, _fortuneCore.updateCell)(draftCtx, draftCtx.luckysheetCellUpdate[0], draftCtx.luckysheetCellUpdate[1], refs.fxInput.current);
               draftCtx.luckysheet_select_save = [{
                 row: [lastCellUpdate[0], lastCellUpdate[0]],
                 column: [lastCellUpdate[1], lastCellUpdate[1]],
@@ -231,12 +222,12 @@ var FxEditor = function FxEditor() {
             }
           case "ArrowLeft":
             {
-              if (!isComposingRef.current) (0, _fortuneCore.rangeHightlightselected)(draftCtx, refs.fxInput.current);
+              (0, _fortuneCore.rangeHightlightselected)(draftCtx, refs.fxInput.current);
               break;
             }
           case "ArrowRight":
             {
-              if (!isComposingRef.current) (0, _fortuneCore.rangeHightlightselected)(draftCtx, refs.fxInput.current);
+              (0, _fortuneCore.rangeHightlightselected)(draftCtx, refs.fxInput.current);
               break;
             }
           default:
@@ -266,7 +257,6 @@ var FxEditor = function FxEditor() {
   };
   var onChange = (0, _react.useCallback)(function () {
     var _a, _b, _c;
-    if (isComposingRef.current) return;
     if (context.isFlvReadOnly) return;
     handleHideShowHint();
     if (((_b = (_a = refs.fxInput) === null || _a === void 0 ? void 0 : _a.current) === null || _b === void 0 ? void 0 : _b.innerText.includes("=")) && /^=?[A-Za-z]*$/.test(getLastInputSpanText())) {
@@ -362,25 +352,6 @@ var FxEditor = function FxEditor() {
     ref: inputContainerRef,
     className: "fortune-fx-input-container"
   }, /*#__PURE__*/_react.default.createElement(_ContentEditable.default, {
-    onCompositionStart: function onCompositionStart() {
-      isComposingRef.current = true;
-      console.log("onCompositionStart");
-    },
-    onCompositionUpdate: function onCompositionUpdate(e) {
-      window.CompositData = e.currentTarget.innerText;
-      isComposingRef.current = true;
-      console.log("onCompositionUpdate", e.currentTarget.innerText);
-    },
-    onCompositionEnd: function onCompositionEnd(e) {
-      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;
-      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() {
       var _a;
       handleHideShowHint();
@@ -388,10 +359,6 @@ var FxEditor = function FxEditor() {
       setCommaCount(currentCommaCount);
     },
     innerRef: function innerRef(e) {
-      if (isComposingRef.current) {
-        refs.fxInput.current = null;
-        return;
-      }
       refs.fxInput.current = e;
     },
     className: "fortune-fx-input",

package/lib/components/SheetOverlay/InputBox.js

@@ -74,7 +74,24 @@ 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 ensureNotEmpty = function ensureNotEmpty() {
+    var el = rootRef.current;
+    if (!el) return;
+    if (el.textContent === "") {
+      el.innerHTML = "\u200B";
+      placeCursorAtEnd(el);
+    }
+  };
+  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 handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
@@ -248,7 +265,7 @@ var InputBox = function InputBox() {
   }, [getActiveFormula, insertSelectedFormula]);
   var selectActiveFormulaOnClick = (0, _react.useCallback)(function (e) {
     var _a, _b;
-    if (isComposingRef.current) return;
+    if (isComposingRef.current || !inputRef.current) return;
     if (e.target.className.includes("sign-fortune")) return;
     preText.current = inputRef.current.innerText;
     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;
@@ -265,7 +282,10 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
-    if (isComposingRef.current) return;
+    if (isComposingRef.current || !inputRef.current) {
+      ensureNotEmpty();
+      return;
+    }
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
     if (e.metaKey) {
@@ -283,8 +303,10 @@ var InputBox = function InputBox() {
         stopPropagation(e);
       }
     }
-    var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-    setCommaCount(currentCommaCount);
+    if (!isComposingRef.current) {
+      var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+      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 () {
@@ -411,8 +433,10 @@ var InputBox = function InputBox() {
     } else {
       setShowSearchHint(false);
     }
-    var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-    setCommaCount(currentCommaCount);
+    if (!isComposingRef.current) {
+      var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+      setCommaCount(currentCommaCount);
+    }
     var e = lastKeyDownEventRef.current;
     if (!e) return;
     var kcode = e.keyCode;
@@ -584,6 +608,7 @@ var InputBox = function InputBox() {
       console.log("onCompositionUpdate", e.currentTarget.innerText);
     },
     onCompositionEnd: function onCompositionEnd(e) {
+      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);
@@ -599,10 +624,13 @@ var InputBox = function InputBox() {
         return;
       }
       handleHideShowHint();
-      var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
-      setCommaCount(currentCommaCount);
+      if (!isComposingRef.current) {
+        var currentCommaCount = (0, _helper.countCommasBeforeCursor)(inputRef === null || inputRef === void 0 ? void 0 : inputRef.current);
+        setCommaCount(currentCommaCount);
+      }
     },
     innerRef: function innerRef(e) {
+      rootRef.current = e;
       if (isComposingRef.current) {
         inputRef.current = null;
         refs.cellInput.current = null;

package/package.json

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