@fileverse-dev/fortune-react 1.2.86-maitra-xl-1 → 1.2.86-pinyin-2

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 } from "@fileverse-dev/fortune-core";
+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 React, { useContext, useEffect, useMemo, useRef, useCallback, useLayoutEffect, useState } from "react";
 import _ from "lodash";
 import { Tooltip } from "@fileverse/ui";
@@ -65,6 +65,7 @@ var InputBox = function InputBox() {
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = useRef("");
   var placeRef = useRef("");
+  var isComposingRef = useRef(false);
   var handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
@@ -130,7 +131,7 @@ var InputBox = function InputBox() {
         }
       }
       refs.globalCache.overwriteCell = false;
-      if (!refs.globalCache.ignoreWriteCell) inputRef.current.innerHTML = escapeHTMLTag(escapeScriptTag(value_1));
+      if (!refs.globalCache.ignoreWriteCell && inputRef.current) inputRef.current.innerHTML = escapeHTMLTag(escapeScriptTag(value_1));
       refs.globalCache.ignoreWriteCell = false;
       if (!refs.globalCache.doNotFocus) {
         setTimeout(function () {
@@ -152,6 +153,7 @@ 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);
     }
@@ -161,6 +163,7 @@ 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;
@@ -225,6 +228,7 @@ 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)) {
@@ -235,6 +239,7 @@ var InputBox = function InputBox() {
   }, [getActiveFormula, insertSelectedFormula]);
   var selectActiveFormulaOnClick = useCallback(function (e) {
     var _a, _b;
+    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;
@@ -251,6 +256,7 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
+    if (isComposingRef.current || !inputRef.current) return;
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
     if (e.metaKey) {
@@ -268,8 +274,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 () {
@@ -386,6 +394,9 @@ 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())) {
@@ -393,8 +404,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;
@@ -410,6 +423,7 @@ var InputBox = function InputBox() {
     }
   }, [refs.cellInput, refs.fxInput, setContext]);
   var onPaste = useCallback(function (e) {
+    if (isComposingRef.current) return;
     if (_.isEmpty(context.luckysheetCellUpdate)) {
       e.preventDefault();
     }
@@ -555,12 +569,42 @@ var InputBox = function InputBox() {
       minHeight: firstSelection.height
     }, inputBoxStyle) : {}
   }, /*#__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;
+      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();
-      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) {
+      if (isComposingRef.current) {
+        inputRef.current = null;
+        refs.cellInput.current = null;
+        return;
+      }
       inputRef.current = e;
       refs.cellInput.current = e;
     },

package/es/components/Workbook/api.d.ts

@@ -140,7 +140,6 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
     handleRedo: () => void;
     calculateFormula: () => void;
     calculateSubSheetFormula: (id: string) => void;
-    calculateCellReferencedSubSheetFormula: (id: string, refCell?: string[]) => void;
     dataToCelldata: (data: CellMatrix | undefined) => CellWithRowAndCol[];
     celldataToData: (celldata: CellWithRowAndCol[], rowCount?: number, colCount?: number) => CellMatrix | null;
     insertFunction: (selectedFuncIndex: number, filteredFunctionList: any[], callback?: () => void) => void;

package/es/components/Workbook/api.js

@@ -389,12 +389,6 @@ export function generateAPIs(context, setContext, handleUndo, handleRedo, settin
         api.calculateSheetFromula(draftCtx, id);
       });
     },
-    calculateCellReferencedSubSheetFormula: function calculateCellReferencedSubSheetFormula(id, refCell) {
-      console.log("calculateCellReferencedSubSheetFormula", id, refCell);
-      setContext(function (draftCtx) {
-        api.calculateReferencedCellSheetFromula(draftCtx, id, refCell);
-      });
-    },
     dataToCelldata: function dataToCelldata(data) {
       return api.dataToCelldata(data);
     },

package/es/components/Workbook/index.d.ts

@@ -147,7 +147,6 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     handleRedo: () => void;
     calculateFormula: () => void;
     calculateSubSheetFormula: (id: string) => void;
-    calculateCellReferencedSubSheetFormula: (id: string, refCell?: string[] | undefined) => void;
     dataToCelldata: (data: CellMatrix | undefined) => CellWithRowAndCol[];
     celldataToData: (celldata: CellWithRowAndCol[], rowCount?: number | undefined, colCount?: number | undefined) => CellMatrix | null;
     insertFunction: (selectedFuncIndex: number, filteredFunctionList: any[], callback?: (() => void) | undefined) => void;

package/es/components/Workbook/index.js

@@ -288,7 +288,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
         return newContext;
       });
     }
-  }, [emitOp, globalCache]);
+  }, [emitOp]);
   var handleRedo = useCallback(function () {
     var history = globalCache.current.redoList.pop();
     if (history) {

package/lib/components/SheetOverlay/InputBox.js

@@ -74,6 +74,7 @@ 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 isComposingRef = (0, _react.useRef)(false);
   var handleShowFormulaHint = function handleShowFormulaHint() {
     localStorage.setItem("formulaMore", String(showFormulaHint));
     setShowFormulaHint(!showFormulaHint);
@@ -139,7 +140,7 @@ var InputBox = function InputBox() {
         }
       }
       refs.globalCache.overwriteCell = false;
-      if (!refs.globalCache.ignoreWriteCell) inputRef.current.innerHTML = (0, _fortuneCore.escapeHTMLTag)((0, _fortuneCore.escapeScriptTag)(value_1));
+      if (!refs.globalCache.ignoreWriteCell && inputRef.current) inputRef.current.innerHTML = (0, _fortuneCore.escapeHTMLTag)((0, _fortuneCore.escapeScriptTag)(value_1));
       refs.globalCache.ignoreWriteCell = false;
       if (!refs.globalCache.doNotFocus) {
         setTimeout(function () {
@@ -161,6 +162,7 @@ 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);
     }
@@ -170,6 +172,7 @@ 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;
@@ -234,6 +237,7 @@ 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)) {
@@ -244,6 +248,7 @@ var InputBox = function InputBox() {
   }, [getActiveFormula, insertSelectedFormula]);
   var selectActiveFormulaOnClick = (0, _react.useCallback)(function (e) {
     var _a, _b;
+    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;
@@ -260,6 +265,7 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
+    if (isComposingRef.current || !inputRef.current) return;
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
     if (e.metaKey) {
@@ -277,8 +283,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 () {
@@ -395,6 +403,9 @@ 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())) {
@@ -402,8 +413,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;
@@ -419,6 +432,7 @@ 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();
     }
@@ -564,12 +578,42 @@ var InputBox = function InputBox() {
       minHeight: firstSelection.height
     }, inputBoxStyle) : {}
   }, /*#__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;
+      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();
-      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) {
+      if (isComposingRef.current) {
+        inputRef.current = null;
+        refs.cellInput.current = null;
+        return;
+      }
       inputRef.current = e;
       refs.cellInput.current = e;
     },

package/lib/components/Workbook/api.d.ts

@@ -140,7 +140,6 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
     handleRedo: () => void;
     calculateFormula: () => void;
     calculateSubSheetFormula: (id: string) => void;
-    calculateCellReferencedSubSheetFormula: (id: string, refCell?: string[]) => void;
     dataToCelldata: (data: CellMatrix | undefined) => CellWithRowAndCol[];
     celldataToData: (celldata: CellWithRowAndCol[], rowCount?: number, colCount?: number) => CellMatrix | null;
     insertFunction: (selectedFuncIndex: number, filteredFunctionList: any[], callback?: () => void) => void;

package/lib/components/Workbook/api.js

@@ -396,12 +396,6 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
         _fortuneCore.api.calculateSheetFromula(draftCtx, id);
       });
     },
-    calculateCellReferencedSubSheetFormula: function calculateCellReferencedSubSheetFormula(id, refCell) {
-      console.log("calculateCellReferencedSubSheetFormula", id, refCell);
-      setContext(function (draftCtx) {
-        _fortuneCore.api.calculateReferencedCellSheetFromula(draftCtx, id, refCell);
-      });
-    },
     dataToCelldata: function dataToCelldata(data) {
       return _fortuneCore.api.dataToCelldata(data);
     },

package/lib/components/Workbook/index.d.ts

@@ -147,7 +147,6 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     handleRedo: () => void;
     calculateFormula: () => void;
     calculateSubSheetFormula: (id: string) => void;
-    calculateCellReferencedSubSheetFormula: (id: string, refCell?: string[] | undefined) => void;
     dataToCelldata: (data: CellMatrix | undefined) => CellWithRowAndCol[];
     celldataToData: (celldata: CellWithRowAndCol[], rowCount?: number | undefined, colCount?: number | undefined) => CellMatrix | null;
     insertFunction: (selectedFuncIndex: number, filteredFunctionList: any[], callback?: (() => void) | undefined) => void;

package/lib/components/Workbook/index.js

@@ -297,7 +297,7 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
         return newContext;
       });
     }
-  }, [emitOp, globalCache]);
+  }, [emitOp]);
   var handleRedo = (0, _react.useCallback)(function () {
     var history = globalCache.current.redoList.pop();
     if (history) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.2.86-maitra-xl-1",
+  "version": "1.2.86-pinyin-2",
   "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-maitra-xl-1",
+    "@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",