@fileverse-dev/fortune-react 1.2.90-ydoc-14 → 1.2.91

package/es/components/LinkEidtCard/index.js

@@ -280,7 +280,7 @@ export var LinkEditCard = function LinkEditCard(_a) {
       if (isButtonDisabled) return;
       _.set(refs.globalCache, "linkCard.mouseEnter", false);
       setContext(function (draftCtx) {
-        saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
+        return saveHyperlink(draftCtx, r, c, linkText, linkType, linkAddress);
       });
     }
   }, "Insert link"));

package/es/components/SheetOverlay/InputBox.js

@@ -268,13 +268,9 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = useCallback(function (e) {
     var _a, _b;
-    if (isComposingRef.current || !inputRef.current) {
-      ensureNotEmpty();
-      return;
-    }
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
-    if (e.metaKey) {
+    if (e.metaKey && context.luckysheetCellUpdate.length > 0) {
       if (e.code === "KeyB") {
         handleBold(context, inputRef.current);
         stopPropagation(e);
@@ -295,7 +291,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     if (e.key === "Delete" || e.key === "Backspace") {
-      requestAnimationFrame(ensureNotEmpty);
+      if (isComposingRef.current) 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);
@@ -589,7 +585,11 @@ var InputBox = function InputBox() {
     onCompositionUpdate: function onCompositionUpdate() {
       isComposingRef.current = true;
     },
-    onCompositionEnd: function onCompositionEnd() {
+    onCompositionEnd: function onCompositionEnd(e) {
+      if (e.data === "" && e.currentTarget.value === "") {
+        isComposingRef.current = true;
+        return;
+      }
       ensureNotEmpty();
       isComposingRef.current = false;
     },

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

@@ -51,7 +51,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
     getCellsByRange: (range: Selection, options?: api.CommonOptions) => (Cell | null)[][];
     getHtmlByRange: (range: Range, options?: api.CommonOptions) => string | null;
     setSelection: (range: Range, options?: api.CommonOptions) => void;
-    setCellValuesByRange: (data: any[][], range: SingleRange, options?: api.CommonOptions, cellAfter?: boolean) => void;
+    setCellValuesByRange: (data: any[][], range: SingleRange, options?: api.CommonOptions) => void;
     setCellFormatByRange: (attr: keyof Cell, value: any, range: Range | SingleRange, options?: api.CommonOptions) => void;
     mergeCells: (ranges: Range, type: string, options?: api.CommonOptions) => void;
     cancelMerge: (ranges: Range, options?: api.CommonOptions) => void;

package/es/components/Workbook/api.js

@@ -276,12 +276,12 @@ export function generateAPIs(context, setContext, handleUndo, handleRedo, settin
         return api.setSelection(draftCtx, range, options);
       });
     },
-    setCellValuesByRange: function setCellValuesByRange(data, range, options, cellAfter) {
+    setCellValuesByRange: function setCellValuesByRange(data, range, options) {
       if (options === void 0) {
         options = {};
       }
       return setContext(function (draftCtx) {
-        return api.setCellValuesByRange(draftCtx, data, range, cellInput, options, cellAfter);
+        return api.setCellValuesByRange(draftCtx, data, range, cellInput, options);
       });
     },
     setCellFormatByRange: function setCellFormatByRange(attr, value, range, options) {

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

@@ -58,7 +58,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     getCellsByRange: (range: import("@fileverse-dev/fortune-core").Selection, options?: api.CommonOptions) => (import("@fileverse-dev/fortune-core").Cell | null)[][];
     getHtmlByRange: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => string | null;
     setSelection: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
-    setCellValuesByRange: (data: any[][], range: import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions, cellAfter?: boolean | undefined) => void;
+    setCellValuesByRange: (data: any[][], range: import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
     setCellFormatByRange: (attr: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, range: import("@fileverse-dev/fortune-core").Range | import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
     mergeCells: (ranges: import("@fileverse-dev/fortune-core").Range, type: string, options?: api.CommonOptions) => void;
     cancelMerge: (ranges: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;

package/es/components/Workbook/index.js

@@ -390,66 +390,6 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       refs: refs
     };
   }, [context, handleRedo, handleUndo, mergedSettings, refs, setContextWithProduce]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.sheetLengthChange) {
-      context.hooks.sheetLengthChange();
-    }
-  }, [context.luckysheetfile.length]);
-  var currentSheet = useMemo(function () {
-    var _a;
-    return (_a = context === null || context === void 0 ? void 0 : context.luckysheetfile) === null || _a === void 0 ? void 0 : _a.find(function (sheet) {
-      return sheet.id === (context === null || context === void 0 ? void 0 : context.currentSheetId);
-    });
-  }, [context === null || context === void 0 ? void 0 : context.luckysheetfile, context === null || context === void 0 ? void 0 : context.currentSheetId]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.calcChainChange) {
-      context.hooks.calcChainChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.calcChain]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.dataVerificationChange) {
-      context.hooks.dataVerificationChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.dataVerification]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.liveQueryChange) {
-      context.hooks.liveQueryChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.liveQueryList]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.imageListChange) {
-      context.hooks.imageListChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.images]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.iframeListChange) {
-      context.hooks.iframeListChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.iframes]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.conditionRulesChange) {
-      context.hooks.conditionRulesChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.conditionRules]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.conditionFormatChange) {
-      context.hooks.conditionFormatChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.luckysheet_conditionformat_save]);
-  useEffect(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.hyperlinkChange) {
-      context.hooks.hyperlinkChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.hyperlink]);
   useEffect(function () {
     if (!_.isEmpty(context.luckysheetfile)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(context.luckysheetfile);

package/lib/components/LinkEidtCard/index.js

@@ -289,7 +289,7 @@ var LinkEditCard = exports.LinkEditCard = function LinkEditCard(_a) {
       if (isButtonDisabled) return;
       _lodash.default.set(refs.globalCache, "linkCard.mouseEnter", false);
       setContext(function (draftCtx) {
-        (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress);
+        return (0, _fortuneCore.saveHyperlink)(draftCtx, r, c, linkText, linkType, linkAddress);
       });
     }
   }, "Insert link"));

package/lib/components/SheetOverlay/InputBox.js

@@ -277,13 +277,9 @@ var InputBox = function InputBox() {
   };
   var onKeyDown = (0, _react.useCallback)(function (e) {
     var _a, _b;
-    if (isComposingRef.current || !inputRef.current) {
-      ensureNotEmpty();
-      return;
-    }
     lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
     preText.current = inputRef.current.innerText;
-    if (e.metaKey) {
+    if (e.metaKey && context.luckysheetCellUpdate.length > 0) {
       if (e.code === "KeyB") {
         (0, _fortuneCore.handleBold)(context, inputRef.current);
         stopPropagation(e);
@@ -304,7 +300,7 @@ var InputBox = function InputBox() {
     }
     var allowListNavigation = true;
     if (e.key === "Delete" || e.key === "Backspace") {
-      requestAnimationFrame(ensureNotEmpty);
+      if (isComposingRef.current) 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);
@@ -598,7 +594,11 @@ var InputBox = function InputBox() {
     onCompositionUpdate: function onCompositionUpdate() {
       isComposingRef.current = true;
     },
-    onCompositionEnd: function onCompositionEnd() {
+    onCompositionEnd: function onCompositionEnd(e) {
+      if (e.data === "" && e.currentTarget.value === "") {
+        isComposingRef.current = true;
+        return;
+      }
       ensureNotEmpty();
       isComposingRef.current = false;
     },

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

@@ -51,7 +51,7 @@ export declare function generateAPIs(context: Context, setContext: (recipe: (ctx
     getCellsByRange: (range: Selection, options?: api.CommonOptions) => (Cell | null)[][];
     getHtmlByRange: (range: Range, options?: api.CommonOptions) => string | null;
     setSelection: (range: Range, options?: api.CommonOptions) => void;
-    setCellValuesByRange: (data: any[][], range: SingleRange, options?: api.CommonOptions, cellAfter?: boolean) => void;
+    setCellValuesByRange: (data: any[][], range: SingleRange, options?: api.CommonOptions) => void;
     setCellFormatByRange: (attr: keyof Cell, value: any, range: Range | SingleRange, options?: api.CommonOptions) => void;
     mergeCells: (ranges: Range, type: string, options?: api.CommonOptions) => void;
     cancelMerge: (ranges: Range, options?: api.CommonOptions) => void;

package/lib/components/Workbook/api.js

@@ -283,12 +283,12 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
         return _fortuneCore.api.setSelection(draftCtx, range, options);
       });
     },
-    setCellValuesByRange: function setCellValuesByRange(data, range, options, cellAfter) {
+    setCellValuesByRange: function setCellValuesByRange(data, range, options) {
       if (options === void 0) {
         options = {};
       }
       return setContext(function (draftCtx) {
-        return _fortuneCore.api.setCellValuesByRange(draftCtx, data, range, cellInput, options, cellAfter);
+        return _fortuneCore.api.setCellValuesByRange(draftCtx, data, range, cellInput, options);
       });
     },
     setCellFormatByRange: function setCellFormatByRange(attr, value, range, options) {

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

@@ -58,7 +58,7 @@ declare const Workbook: React.ForwardRefExoticComponent<Settings & AdditionalPro
     getCellsByRange: (range: import("@fileverse-dev/fortune-core").Selection, options?: api.CommonOptions) => (import("@fileverse-dev/fortune-core").Cell | null)[][];
     getHtmlByRange: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => string | null;
     setSelection: (range: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;
-    setCellValuesByRange: (data: any[][], range: import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions, cellAfter?: boolean | undefined) => void;
+    setCellValuesByRange: (data: any[][], range: import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
     setCellFormatByRange: (attr: "error" | "rt" | "f" | "m" | "v" | "mc" | "ct" | "qp" | "spl" | "bg" | "lo" | "baseValue" | "baseCurrency" | "baseCurrencyPrice" | "isDataBlockFormula" | "ps" | "hl" | keyof import("@fileverse-dev/fortune-core").CellStyle, value: any, range: import("@fileverse-dev/fortune-core").Range | import("@fileverse-dev/fortune-core").SingleRange, options?: api.CommonOptions) => void;
     mergeCells: (ranges: import("@fileverse-dev/fortune-core").Range, type: string, options?: api.CommonOptions) => void;
     cancelMerge: (ranges: import("@fileverse-dev/fortune-core").Range, options?: api.CommonOptions) => void;

package/lib/components/Workbook/index.js

@@ -399,66 +399,6 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
       refs: refs
     };
   }, [context, handleRedo, handleUndo, mergedSettings, refs, setContextWithProduce]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.sheetLengthChange) {
-      context.hooks.sheetLengthChange();
-    }
-  }, [context.luckysheetfile.length]);
-  var currentSheet = (0, _react.useMemo)(function () {
-    var _a;
-    return (_a = context === null || context === void 0 ? void 0 : context.luckysheetfile) === null || _a === void 0 ? void 0 : _a.find(function (sheet) {
-      return sheet.id === (context === null || context === void 0 ? void 0 : context.currentSheetId);
-    });
-  }, [context === null || context === void 0 ? void 0 : context.luckysheetfile, context === null || context === void 0 ? void 0 : context.currentSheetId]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.calcChainChange) {
-      context.hooks.calcChainChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.calcChain]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.dataVerificationChange) {
-      context.hooks.dataVerificationChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.dataVerification]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.liveQueryChange) {
-      context.hooks.liveQueryChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.liveQueryList]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.imageListChange) {
-      context.hooks.imageListChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.images]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.iframeListChange) {
-      context.hooks.iframeListChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.iframes]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.conditionRulesChange) {
-      context.hooks.conditionRulesChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.conditionRules]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.conditionFormatChange) {
-      context.hooks.conditionFormatChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.luckysheet_conditionformat_save]);
-  (0, _react.useEffect)(function () {
-    var _a;
-    if ((_a = context === null || context === void 0 ? void 0 : context.hooks) === null || _a === void 0 ? void 0 : _a.hyperlinkChange) {
-      context.hooks.hyperlinkChange();
-    }
-  }, [currentSheet === null || currentSheet === void 0 ? void 0 : currentSheet.hyperlink]);
   (0, _react.useEffect)(function () {
     if (!_lodash.default.isEmpty(context.luckysheetfile)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(context.luckysheetfile);

package/package.json

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