@fileverse-dev/fortune-react 1.0.2-mod-12 → 1.0.2-mod-10-test

package/dist/index.js

@@ -640,7 +640,7 @@ var ColumnHeader = function ColumnHeader() {
     className: "fortune-cols-freeze-handle",
     onMouseDown: onColFreezeHandleMouseDown,
     style: {
-      left: freezeHandleLeft || 0
+      left: freezeHandleLeft
     }
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-cols-change-size",
@@ -843,7 +843,7 @@ var RowHeader = function RowHeader() {
     className: "fortune-rows-freeze-handle",
     onMouseDown: onRowFreezeHandleMouseDown,
     style: {
-      top: freezeHandleTop || 0
+      top: freezeHandleTop
     }
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-rows-change-size",
@@ -1250,7 +1250,7 @@ var InputBox = function InputBox() {
       }
       e.preventDefault();
     }
-  }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext]);
+  }, [clearSearchItemActiveClass, context.luckysheetCellUpdate.length, selectActiveFormula, setContext, firstSelection]);
   var onChange = React.useCallback(function (__, isBlur) {
     var e = lastKeyDownEventRef.current;
     if (!e) return;
@@ -1296,8 +1296,8 @@ var InputBox = function InputBox() {
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "luckysheet-input-box-inner",
     style: firstSelection ? _objectSpread2({
-      minWidth: (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.width) || 0,
-      minHeight: (firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.height) || 0
+      minWidth: firstSelection.width,
+      minHeight: firstSelection.height
     }, inputBoxStyle) : {}
   }, /*#__PURE__*/React__default['default'].createElement(ContentEditable, {
     innerRef: function innerRef(e) {
@@ -1312,6 +1312,7 @@ var InputBox = function InputBox() {
       width: "".concat(100 / context.zoomRatio, "%"),
       height: "".concat(100 / context.zoomRatio, "%")
     },
+    "aria-autocomplete": "list",
     onChange: onChange,
     onKeyDown: onKeyDown,
     onPaste: onPaste,
@@ -2580,7 +2581,7 @@ var DataVerification = function DataVerification() {
       setContext(function (ctx) {
         var isPass = fortuneCore.confirmMessage(ctx, generalDialog, dataVerification);
         if (isPass) {
-          var _ctx$dataVerification, _ctx$dataVerification2, _ctx$luckysheetfile$g, _range, _range2, _range3, _range4;
+          var _ctx$dataVerification, _ctx$dataVerification2, _ctx$luckysheetfile$g;
           var range = fortuneCore.getRangeByTxt(ctx, (_ctx$dataVerification = ctx.dataVerification) === null || _ctx$dataVerification === void 0 ? void 0 : (_ctx$dataVerification2 = _ctx$dataVerification.dataRegulation) === null || _ctx$dataVerification2 === void 0 ? void 0 : _ctx$dataVerification2.rangeTxt);
           if (range.length === 0) {
             return;
@@ -2596,12 +2597,12 @@ var DataVerification = function DataVerification() {
             item.value1 = list.join(",");
           }
           var currentDataVerification = (_ctx$luckysheetfile$g = ctx.luckysheetfile[fortuneCore.getSheetIndex(ctx, ctx.currentSheetId)].dataVerification) !== null && _ctx$luckysheetfile$g !== void 0 ? _ctx$luckysheetfile$g : {};
-          var str = (_range = range[range.length - 1]) === null || _range === void 0 ? void 0 : _range.row[0];
-          var edr = (_range2 = range[range.length - 1]) === null || _range2 === void 0 ? void 0 : _range2.row[1];
-          var stc = (_range3 = range[range.length - 1]) === null || _range3 === void 0 ? void 0 : _range3.column[0];
-          var edc = (_range4 = range[range.length - 1]) === null || _range4 === void 0 ? void 0 : _range4.column[1];
+          var str = range[range.length - 1].row[0];
+          var edr = range[range.length - 1].row[1];
+          var stc = range[range.length - 1].column[0];
+          var edc = range[range.length - 1].column[1];
           var d = fortuneCore.getFlowdata(ctx);
-          if (!d || ___default['default'].isNil(str) || ___default['default'].isNil(stc) || ___default['default'].isNil(edr) || ___default['default'].isNil(edc)) return;
+          if (!d) return;
           for (var r = str; r <= edr; r += 1) {
             for (var c = stc; c <= edc; c += 1) {
               var key = "".concat(r, "_").concat(c);
@@ -2616,18 +2617,17 @@ var DataVerification = function DataVerification() {
       });
     } else if (type === "delete") {
       setContext(function (ctx) {
-        var _ctx$dataVerification3, _ctx$dataVerification4, _ctx$luckysheetfile$g2, _range5, _range6, _range7, _range8;
+        var _ctx$dataVerification3, _ctx$dataVerification4, _ctx$luckysheetfile$g2;
         var range = fortuneCore.getRangeByTxt(ctx, (_ctx$dataVerification3 = ctx.dataVerification) === null || _ctx$dataVerification3 === void 0 ? void 0 : (_ctx$dataVerification4 = _ctx$dataVerification3.dataRegulation) === null || _ctx$dataVerification4 === void 0 ? void 0 : _ctx$dataVerification4.rangeTxt);
         if (range.length === 0) {
           showDialog(generalDialog.noSeletionError, "ok");
           return;
         }
         var currentDataVerification = (_ctx$luckysheetfile$g2 = ctx.luckysheetfile[fortuneCore.getSheetIndex(ctx, ctx.currentSheetId)].dataVerification) !== null && _ctx$luckysheetfile$g2 !== void 0 ? _ctx$luckysheetfile$g2 : {};
-        var str = (_range5 = range[range.length - 1]) === null || _range5 === void 0 ? void 0 : _range5.row[0];
-        var edr = (_range6 = range[range.length - 1]) === null || _range6 === void 0 ? void 0 : _range6.row[1];
-        var stc = (_range7 = range[range.length - 1]) === null || _range7 === void 0 ? void 0 : _range7.column[0];
-        var edc = (_range8 = range[range.length - 1]) === null || _range8 === void 0 ? void 0 : _range8.column[1];
-        if (___default['default'].isNil(str) || ___default['default'].isNil(stc) || ___default['default'].isNil(edr) || ___default['default'].isNil(edc)) return;
+        var str = range[range.length - 1].row[0];
+        var edr = range[range.length - 1].row[1];
+        var stc = range[range.length - 1].column[0];
+        var edc = range[range.length - 1].column[1];
         for (var r = str; r <= edr; r += 1) {
           for (var c = stc; c <= edc; c += 1) {
             delete currentDataVerification["".concat(r, "_").concat(c)];
@@ -2639,41 +2639,56 @@ var DataVerification = function DataVerification() {
   }, [dataVerification, generalDialog, hideDialog, setContext, showDialog]);
   React.useEffect(function () {
     setContext(function (ctx) {
-      var _defaultItem$value, _ctx$rangeDialog, _ctx$rangeDialog2;
       var rangeT = "";
       if (ctx.luckysheet_select_save) {
         var range = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
         rangeT = fortuneCore.getRangetxt(context, context.currentSheetId, range, context.currentSheetId);
       }
       var index = fortuneCore.getSheetIndex(ctx, ctx.currentSheetId);
-      var ctxDataVerification = ctx.luckysheetfile[index].dataVerification || {};
-      if (!ctx.luckysheet_select_save) return;
-      var last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
-      var rowIndex = last.row_focus;
-      var colIndex = last.column_focus;
-      if (rowIndex == null || colIndex == null) return;
-      var item = ctxDataVerification["".concat(rowIndex, "_").concat(colIndex)];
-      var defaultItem = item !== null && item !== void 0 ? item : {};
-      var rangValue = (_defaultItem$value = defaultItem.value1) !== null && _defaultItem$value !== void 0 ? _defaultItem$value : "";
-      if (((_ctx$rangeDialog = ctx.rangeDialog) === null || _ctx$rangeDialog === void 0 ? void 0 : _ctx$rangeDialog.type) === "dropDown" && ctx.dataVerification && ctx.dataVerification.dataRegulation && ctx.dataVerification.dataRegulation.rangeTxt) {
-        rangeT = ctx.dataVerification.dataRegulation.rangeTxt;
-        rangValue = ctx.rangeDialog.rangeTxt;
-      } else if (((_ctx$rangeDialog2 = ctx.rangeDialog) === null || _ctx$rangeDialog2 === void 0 ? void 0 : _ctx$rangeDialog2.type) === "rangeTxt" && ctx.dataVerification && ctx.dataVerification.dataRegulation && ctx.dataVerification.dataRegulation.value1) {
-        rangValue = ctx.dataVerification.dataRegulation.value1;
-        rangeT = ctx.rangeDialog.rangeTxt;
-      }
-      ctx.rangeDialog.type = "";
-      if (item) {
-        ctx.dataVerification.dataRegulation = _objectSpread2(_objectSpread2({}, item), {}, {
-          value1: rangValue,
-          rangeTxt: rangeT
-        });
+      var ctxDataVerification = ctx.luckysheetfile[index].dataVerification;
+      if (ctxDataVerification) {
+        var _defaultItem$value, _ctx$rangeDialog, _ctx$rangeDialog2;
+        if (!ctx.luckysheet_select_save) return;
+        var last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
+        var rowIndex = last.row_focus;
+        var colIndex = last.column_focus;
+        if (rowIndex == null || colIndex == null) return;
+        var item = ctxDataVerification["".concat(rowIndex, "_").concat(colIndex)];
+        var defaultItem = item !== null && item !== void 0 ? item : {};
+        var rangValue = (_defaultItem$value = defaultItem.value1) !== null && _defaultItem$value !== void 0 ? _defaultItem$value : "";
+        if (((_ctx$rangeDialog = ctx.rangeDialog) === null || _ctx$rangeDialog === void 0 ? void 0 : _ctx$rangeDialog.type) === "dropDown" && ctx.dataVerification && ctx.dataVerification.dataRegulation && ctx.dataVerification.dataRegulation.rangeTxt) {
+          rangeT = ctx.dataVerification.dataRegulation.rangeTxt;
+          rangValue = ctx.rangeDialog.rangeTxt;
+        } else if (((_ctx$rangeDialog2 = ctx.rangeDialog) === null || _ctx$rangeDialog2 === void 0 ? void 0 : _ctx$rangeDialog2.type) === "rangeTxt" && ctx.dataVerification && ctx.dataVerification.dataRegulation && ctx.dataVerification.dataRegulation.value1) {
+          rangValue = ctx.dataVerification.dataRegulation.value1;
+          rangeT = ctx.rangeDialog.rangeTxt;
+        }
+        ctx.rangeDialog.type = "";
+        if (item) {
+          ctx.dataVerification.dataRegulation = _objectSpread2(_objectSpread2({}, item), {}, {
+            value1: rangValue,
+            rangeTxt: rangeT
+          });
+        } else {
+          ctx.dataVerification.dataRegulation = {
+            type: "dropdown",
+            type2: "",
+            rangeTxt: rangeT,
+            value1: rangValue,
+            value2: "",
+            validity: "",
+            remote: false,
+            prohibitInput: false,
+            hintShow: false,
+            hintValue: ""
+          };
+        }
       } else {
         ctx.dataVerification.dataRegulation = {
           type: "dropdown",
           type2: "",
           rangeTxt: rangeT,
-          value1: rangValue,
+          value1: "",
           value2: "",
           validity: "",
           remote: false,
@@ -3517,7 +3532,7 @@ var DropDownList = function DropDownList() {
 };
 
 var SheetOverlay = function SheetOverlay() {
-  var _refs$cellArea$curren, _refs$cellArea$curren2, _context$luckysheet_s4, _context$luckysheet_s5, _context$luckysheet_s6, _context$luckysheet_s7, _context$luckysheet_s8, _context$luckysheet_s9, _context$presences$le, _context$presences, _context$linkCard, _context$rangeDialog;
+  var _refs$cellArea$curren, _refs$cellArea$curren2, _context$luckysheet_s, _context$luckysheet_s2, _context$luckysheet_s3, _context$luckysheet_s4, _context$luckysheet_s5, _context$luckysheet_s6, _context$presences$le, _context$presences, _context$linkCard, _context$rangeDialog;
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context,
     setContext = _useContext.setContext,
@@ -3531,14 +3546,6 @@ var SheetOverlay = function SheetOverlay() {
   var containerRef = React.useRef(null);
   var bottomAddRowInputRef = React.useRef(null);
   var dataVerificationHintBoxRef = React.useRef(null);
-  var _useState = React.useState(""),
-    _useState2 = _slicedToArray(_useState, 2),
-    lastRangeText = _useState2[0],
-    setLastRangeText = _useState2[1];
-  var _useState3 = React.useState(""),
-    _useState4 = _slicedToArray(_useState3, 2),
-    lastCellValue = _useState4[0],
-    setLastCellValue = _useState4[1];
   var _useAlert = useAlert(),
     showAlert = _useAlert.showAlert;
   var cellAreaMouseDown = React.useCallback(function (e) {
@@ -3661,20 +3668,6 @@ var SheetOverlay = function SheetOverlay() {
       insertRowColOp: insertRowColOp
     });
   }, [context, rightclick.rowOverLimit, setContext, showAlert]);
-  React.useEffect(function () {
-    setContext(function (draftCtx) {
-      var _currentSheet$luckysh;
-      var sheetIndex = fortuneCore.getSheetIndex(draftCtx, draftCtx.currentSheetId);
-      if (sheetIndex === undefined || sheetIndex === null) return;
-      var currentSheet = draftCtx.luckysheetfile[sheetIndex];
-      if (!((_currentSheet$luckysh = currentSheet.luckysheet_select_save) === null || _currentSheet$luckysh === void 0 ? void 0 : _currentSheet$luckysh.length)) {
-        fortuneCore.api.setSelection(draftCtx, [{
-          row: [0],
-          column: [0]
-        }], {});
-      }
-    });
-  }, [context.currentSheetId, setContext]);
   React.useEffect(function () {
     if (context.warnDialog) {
       setTimeout(function () {
@@ -3717,43 +3710,7 @@ var SheetOverlay = function SheetOverlay() {
       document.removeEventListener("keydown", onKeyDownForZoom);
     };
   }, [onKeyDownForZoom]);
-  var rangeText = React.useMemo(function () {
-    var lastSelection = ___default['default'].last(context.luckysheet_select_save);
-    if (!(lastSelection && lastSelection.row_focus != null && lastSelection.column_focus != null)) return "";
-    var rf = lastSelection.row_focus;
-    var cf = lastSelection.column_focus;
-    if (context.config.merge != null && "".concat(rf, "_").concat(cf) in context.config.merge) {
-      return fortuneCore.getRangetxt(context, context.currentSheetId, {
-        column: [cf, cf],
-        row: [rf, rf]
-      });
-    }
-    var rawRangeTxt = fortuneCore.getRangetxt(context, context.currentSheetId, lastSelection);
-    return rawRangeTxt.replace(/([A-Z]+)(\d+)/g, "$1. $2");
-  }, [context.currentSheetId, context.luckysheet_select_save]);
-  var cellValue = function cellValue() {
-    var _context$luckysheet_s, _context$luckysheet_s2;
-    if (((_context$luckysheet_s = (_context$luckysheet_s2 = context.luckysheet_select_save) === null || _context$luckysheet_s2 === void 0 ? void 0 : _context$luckysheet_s2.length) !== null && _context$luckysheet_s !== void 0 ? _context$luckysheet_s : 0) > 0) {
-      var _context$luckysheet_s3, _selection$row_focus, _selection$column_foc, _context$luckysheetfi, _context$luckysheetfi2, _context$luckysheetfi3, _context$luckysheetfi4;
-      var selection = (_context$luckysheet_s3 = context.luckysheet_select_save) === null || _context$luckysheet_s3 === void 0 ? void 0 : _context$luckysheet_s3[context.luckysheet_select_save.length - 1];
-      if (!selection) return "";
-      var sheetIndex = fortuneCore.getSheetIndex(context, context.currentSheetId);
-      if (sheetIndex === undefined || sheetIndex === null) return "";
-      var rowFocus = (_selection$row_focus = selection.row_focus) !== null && _selection$row_focus !== void 0 ? _selection$row_focus : 0;
-      var columnFocus = (_selection$column_foc = selection.column_focus) !== null && _selection$column_foc !== void 0 ? _selection$column_foc : 0;
-      var cellVal = ((_context$luckysheetfi = context.luckysheetfile[sheetIndex]) === null || _context$luckysheetfi === void 0 ? void 0 : (_context$luckysheetfi2 = _context$luckysheetfi.data) === null || _context$luckysheetfi2 === void 0 ? void 0 : (_context$luckysheetfi3 = _context$luckysheetfi2[rowFocus]) === null || _context$luckysheetfi3 === void 0 ? void 0 : (_context$luckysheetfi4 = _context$luckysheetfi3[columnFocus]) === null || _context$luckysheetfi4 === void 0 ? void 0 : _context$luckysheetfi4.m) || "";
-      return cellVal;
-    }
-    return "";
-  };
-  var computedCellValue = cellValue();
-  React.useEffect(function () {
-    if (context.sheetFocused) {
-      setLastRangeText(String(rangeText));
-      setLastCellValue(String(cellValue()));
-    }
-  }, [context.sheetFocused]);
-  return /*#__PURE__*/React__default['default'].createElement("main", {
+  return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-sheet-overlay",
     ref: containerRef,
     onTouchStart: onTouchStart,
@@ -3856,20 +3813,20 @@ var SheetOverlay = function SheetOverlay() {
     hidden: !context.luckysheet_cols_freeze_drag && !context.luckysheet_rows_freeze_drag
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "luckysheet-cell-selected-focus",
-    style: ((_context$luckysheet_s4 = (_context$luckysheet_s5 = context.luckysheet_select_save) === null || _context$luckysheet_s5 === void 0 ? void 0 : _context$luckysheet_s5.length) !== null && _context$luckysheet_s4 !== void 0 ? _context$luckysheet_s4 : 0) > 0 ? function (_refs$globalCache$fre, _refs$globalCache$fre2) {
+    style: ((_context$luckysheet_s = (_context$luckysheet_s2 = context.luckysheet_select_save) === null || _context$luckysheet_s2 === void 0 ? void 0 : _context$luckysheet_s2.length) !== null && _context$luckysheet_s !== void 0 ? _context$luckysheet_s : 0) > 0 ? function (_refs$globalCache$fre, _refs$globalCache$fre2) {
       var selection = ___default['default'].last(context.luckysheet_select_save);
       return ___default['default'].assign({
         left: selection.left,
         top: selection.top,
-        width: (selection === null || selection === void 0 ? void 0 : selection.width) || 0,
-        height: (selection === null || selection === void 0 ? void 0 : selection.height) || 0,
+        width: selection.width,
+        height: selection.height,
         display: "block"
       }, fortuneCore.fixRowStyleOverflowInFreeze(context, selection.row_focus || 0, selection.row_focus || 0, (_refs$globalCache$fre = refs.globalCache.freezen) === null || _refs$globalCache$fre === void 0 ? void 0 : _refs$globalCache$fre[context.currentSheetId]), fortuneCore.fixColumnStyleOverflowInFreeze(context, selection.column_focus || 0, selection.column_focus || 0, (_refs$globalCache$fre2 = refs.globalCache.freezen) === null || _refs$globalCache$fre2 === void 0 ? void 0 : _refs$globalCache$fre2[context.currentSheetId]));
     }() : {},
     onMouseDown: function onMouseDown(e) {
       return e.preventDefault();
     }
-  }), ((_context$luckysheet_s6 = (_context$luckysheet_s7 = context.luckysheet_selection_range) === null || _context$luckysheet_s7 === void 0 ? void 0 : _context$luckysheet_s7.length) !== null && _context$luckysheet_s6 !== void 0 ? _context$luckysheet_s6 : 0) > 0 && (/*#__PURE__*/React__default['default'].createElement("div", {
+  }), ((_context$luckysheet_s3 = (_context$luckysheet_s4 = context.luckysheet_selection_range) === null || _context$luckysheet_s4 === void 0 ? void 0 : _context$luckysheet_s4.length) !== null && _context$luckysheet_s3 !== void 0 ? _context$luckysheet_s3 : 0) > 0 && (/*#__PURE__*/React__default['default'].createElement("div", {
     id: "fortune-selection-copy"
   }, context.luckysheet_selection_range.map(function (range) {
     var r1 = range.row[0];
@@ -3910,7 +3867,7 @@ var SheetOverlay = function SheetOverlay() {
     onMouseDown: function onMouseDown(e) {
       return e.preventDefault();
     }
-  }), ((_context$luckysheet_s8 = (_context$luckysheet_s9 = context.luckysheet_select_save) === null || _context$luckysheet_s9 === void 0 ? void 0 : _context$luckysheet_s9.length) !== null && _context$luckysheet_s8 !== void 0 ? _context$luckysheet_s8 : 0) > 0 && (/*#__PURE__*/React__default['default'].createElement("div", {
+  }), ((_context$luckysheet_s5 = (_context$luckysheet_s6 = context.luckysheet_select_save) === null || _context$luckysheet_s6 === void 0 ? void 0 : _context$luckysheet_s6.length) !== null && _context$luckysheet_s5 !== void 0 ? _context$luckysheet_s5 : 0) > 0 && (/*#__PURE__*/React__default['default'].createElement("div", {
     id: "luckysheet-cell-selected-boxs"
   }, context.luckysheet_select_save.map(function (selection, index) {
     var _refs$globalCache$fre3, _refs$globalCache$fre4;
@@ -3921,8 +3878,8 @@ var SheetOverlay = function SheetOverlay() {
       style: ___default['default'].assign({
         left: selection.left_move,
         top: selection.top_move,
-        width: (selection === null || selection === void 0 ? void 0 : selection.width_move) || 0,
-        height: (selection === null || selection === void 0 ? void 0 : selection.height_move) || 0,
+        width: selection.width_move,
+        height: selection.height_move,
         display: "block"
       }, fortuneCore.fixRowStyleOverflowInFreeze(context, selection.row[0], selection.row[1], (_refs$globalCache$fre3 = refs.globalCache.freezen) === null || _refs$globalCache$fre3 === void 0 ? void 0 : _refs$globalCache$fre3[context.currentSheetId]), fortuneCore.fixColumnStyleOverflowInFreeze(context, selection.column[0], selection.column[1], (_refs$globalCache$fre4 = refs.globalCache.freezen) === null || _refs$globalCache$fre4 === void 0 ? void 0 : _refs$globalCache$fre4[context.currentSheetId])),
       onMouseDown: function onMouseDown(e) {
@@ -4115,15 +4072,7 @@ var SheetOverlay = function SheetOverlay() {
       });
     },
     tabIndex: 0
-  }, info.backTop))))))), /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "sr-selection",
-    className: "sr-only",
-    role: "alert"
-  }, !rangeText.includes("NaN") ? "".concat(rangeText, " ").concat(computedCellValue) : "A1. ".concat(info.sheetSrIntro)), /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "sr-sheetFocus",
-    className: "sr-only",
-    role: "alert"
-  }, context.sheetFocused ? "".concat(lastRangeText, " ").concat(lastCellValue ? "".concat(lastCellValue, ".") : "", " ").concat(info.sheetIsFocused) : "Toolbar. ".concat(info.sheetNotFocused)));
+  }, info.backTop))))))));
 };
 
 var Sheet = function Sheet(_ref) {
@@ -4142,7 +4091,7 @@ var Sheet = function Sheet(_ref) {
       if (!data) return;
       setContext(function (draftCtx) {
         if (settings.devicePixelRatio === 0) {
-          draftCtx.devicePixelRatio = (typeof globalThis !== "undefined" ? globalThis : window).devicePixelRatio;
+          draftCtx.devicePixelRatio = (globalThis || window).devicePixelRatio;
         }
         fortuneCore.updateContextWithSheetData(draftCtx, data);
         fortuneCore.updateContextWithCanvas(draftCtx, refs.canvas.current, placeholderRef.current);
@@ -4292,8 +4241,7 @@ var Sheet = function Sheet(_ref) {
     className: "fortune-sheet-canvas-placeholder"
   }), /*#__PURE__*/React__default['default'].createElement("canvas", {
     className: "fortune-sheet-canvas",
-    ref: refs.canvas,
-    "aria-hidden": "true"
+    ref: refs.canvas
   }), /*#__PURE__*/React__default['default'].createElement(SheetOverlay, null));
 };
 
@@ -5583,17 +5531,16 @@ var FormatSearch = function FormatSearch(_ref) {
     button = _locale.button,
     format = _locale.format,
     currencyDetail = _locale.currencyDetail,
-    dateFmtList = _locale.dateFmtList,
-    numberFmtList = _locale.numberFmtList;
+    dateFmtList = _locale.dateFmtList;
   var _useDialog = useDialog(),
     showDialog = _useDialog.showDialog;
   var toolbarFormatAll = React.useMemo(function () {
     return {
       currency: currencyDetail,
       date: dateFmtList,
-      number: numberFmtList
+      number: []
     };
-  }, [currencyDetail, dateFmtList, numberFmtList]);
+  }, [currencyDetail, dateFmtList]);
   var toolbarFormat = React.useMemo(function () {
     return toolbarFormatAll[type];
   }, [toolbarFormatAll, type]);
@@ -5607,22 +5554,15 @@ var FormatSearch = function FormatSearch(_ref) {
     setContext(function (ctx) {
       var index = fortuneCore.getSheetIndex(ctx, ctx.currentSheetId);
       if (___default['default'].isNil(index)) return;
-      var selectedFormatVal = toolbarFormat[selectedFormatIndex].value;
-      var selectedFormatPos;
-      if ("pos" in toolbarFormat[selectedFormatIndex]) selectedFormatPos = toolbarFormat[selectedFormatIndex].pos || "before";
+      var selectedFormat = toolbarFormat[selectedFormatIndex].value;
       ___default['default'].forEach(ctx.luckysheet_select_save, function (selection) {
         for (var r = selection.row[0]; r <= selection.row[1]; r += 1) {
           for (var c = selection.column[0]; c <= selection.column[1]; c += 1) {
             var _ctx$luckysheetfile$i, _ctx$luckysheetfile$i2, _ctx$luckysheetfile$i3, _ctx$luckysheetfile$i4;
             if (((_ctx$luckysheetfile$i = ctx.luckysheetfile[index].data) === null || _ctx$luckysheetfile$i === void 0 ? void 0 : _ctx$luckysheetfile$i[r][c]) && ((_ctx$luckysheetfile$i2 = ctx.luckysheetfile[index].data) === null || _ctx$luckysheetfile$i2 === void 0 ? void 0 : (_ctx$luckysheetfile$i3 = _ctx$luckysheetfile$i2[r][c]) === null || _ctx$luckysheetfile$i3 === void 0 ? void 0 : (_ctx$luckysheetfile$i4 = _ctx$luckysheetfile$i3.ct) === null || _ctx$luckysheetfile$i4 === void 0 ? void 0 : _ctx$luckysheetfile$i4.t) === "n") {
               var zero = 0;
-              if (selectedFormatPos === "after") {
-                ctx.luckysheetfile[index].data[r][c].ct.fa = zero.toFixed(decimalPlace).concat("".concat(selectedFormatVal));
-                ctx.luckysheetfile[index].data[r][c].m = fortuneCore.update(zero.toFixed(decimalPlace).concat("".concat(selectedFormatVal)), ctx.luckysheetfile[index].data[r][c].v);
-              } else {
-                ctx.luckysheetfile[index].data[r][c].ct.fa = "".concat(selectedFormatVal).concat(zero.toFixed(decimalPlace));
-                ctx.luckysheetfile[index].data[r][c].m = fortuneCore.update("".concat(selectedFormatVal).concat(zero.toFixed(decimalPlace)), ctx.luckysheetfile[index].data[r][c].v);
-              }
+              ctx.luckysheetfile[index].data[r][c].ct.fa = "".concat(selectedFormat).concat(zero.toFixed(decimalPlace));
+              ctx.luckysheetfile[index].data[r][c].m = fortuneCore.update("".concat(selectedFormat).concat(zero.toFixed(decimalPlace)), ctx.luckysheetfile[index].data[r][c].v);
             }
           }
         }
@@ -5652,8 +5592,10 @@ var FormatSearch = function FormatSearch(_ref) {
     }
   }, tips, format.format, "\uFF1A"), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "inpbox",
-    style: {
+    style: type === "currency" ? {
       display: "block"
+    } : {
+      display: "none"
     }
   }, format.decimalPlaces, "\uFF1A", /*#__PURE__*/React__default['default'].createElement("input", {
     className: "decimal-places-input",
@@ -5678,8 +5620,10 @@ var FormatSearch = function FormatSearch(_ref) {
     }, /*#__PURE__*/React__default['default'].createElement("div", null, v.name), /*#__PURE__*/React__default['default'].createElement("div", null, v.value));
   }))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-dialog-box-button-container",
-    style: {
+    style: type === "currency" ? {
       marginTop: 40
+    } : {
+      marginTop: 30
     }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-message-box-button button-primary",
@@ -6862,7 +6806,8 @@ var LocationBox = function LocationBox() {
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-name-box",
     tabIndex: 0,
-    dir: "ltr"
+    dir: "ltr",
+    "aria-autocomplete": "list"
   }, rangeText));
 };
 
@@ -6886,8 +6831,6 @@ var FxEditor = function FxEditor() {
   var prevFirstSelection = usePrevious(firstSelection);
   var prevSheetId = usePrevious(context.currentSheetId);
   var recentText = React.useRef("");
-  var _locale = fortuneCore.locale(context),
-    info = _locale.info;
   React.useEffect(function () {
     setIsHidenRC(fortuneCore.isShowHidenCR(context));
     if (___default['default'].isEqual(prevFirstSelection, firstSelection) && context.currentSheetId === prevSheetId) {
@@ -7004,7 +6947,7 @@ var FxEditor = function FxEditor() {
     }
     return true;
   }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, isHidenRC]);
-  return /*#__PURE__*/React__default['default'].createElement("aside", null, /*#__PURE__*/React__default['default'].createElement("div", {
+  return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-fx-editor"
   }, /*#__PURE__*/React__default['default'].createElement(LocationBox, null), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-fx-icon"
@@ -7020,9 +6963,8 @@ var FxEditor = function FxEditor() {
       refs.fxInput.current = e;
     },
     className: "fortune-fx-input",
-    role: "textbox",
     id: "luckysheet-functionbox-cell",
-    "aria-label": info.currentCellInput,
+    "aria-autocomplete": "list",
     onFocus: onFocus,
     onKeyDown: onKeyDown,
     onChange: onChange,
@@ -7039,7 +6981,7 @@ var FxEditor = function FxEditor() {
     style: {
       top: inputContainerRef.current.clientHeight
     }
-  }))))));
+  })))));
 };
 
 var SheetItem = function SheetItem(_ref) {
@@ -7065,8 +7007,6 @@ var SheetItem = function SheetItem(_ref) {
     setSvgColor = _useState6[1];
   var _useAlert = useAlert(),
     showAlert = _useAlert.showAlert;
-  var _locale = fortuneCore.locale(context),
-    info = _locale.info;
   React.useEffect(function () {
     setContext(function (draftCtx) {
       var r = context.sheetScrollRecord[draftCtx === null || draftCtx === void 0 ? void 0 : draftCtx.currentSheetId];
@@ -7153,7 +7093,6 @@ var SheetItem = function SheetItem(_ref) {
     e.stopPropagation();
   }, [context.allowEdit, isDropPlaceholder, setContext, sheet.id]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
-    role: "button",
     onDragOver: function onDragOver(e) {
       e.preventDefault();
       e.stopPropagation();
@@ -7256,8 +7195,7 @@ var SheetItem = function SheetItem(_ref) {
         };
       });
     },
-    tabIndex: 0,
-    "aria-label": info.sheetOptions
+    tabIndex: 0
   }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
     name: "downArrow",
     width: 12,
@@ -7309,8 +7247,6 @@ var ZoomControl = function ZoomControl() {
     _useState2 = _slicedToArray(_useState, 2),
     radioMenuOpen = _useState2[0],
     setRadioMenuOpen = _useState2[1];
-  var _locale = fortuneCore.locale(context),
-    info = _locale.info;
   useOutsideClick(menuRef, function () {
     setRadioMenuOpen(false);
   }, []);
@@ -7330,18 +7266,15 @@ var ZoomControl = function ZoomControl() {
       noHistory: true
     });
   }, [setContext]);
-  return /*#__PURE__*/React__default['default'].createElement("aside", {
-    title: "Zoom settings",
+  return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-zoom-container"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-zoom-button",
-    "aria-label": info.zoomOut,
     onClick: function onClick(e) {
       zoomTo(context.zoomRatio - 0.1);
       e.stopPropagation();
     },
-    tabIndex: 0,
-    role: "button"
+    tabIndex: 0
   }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
     name: "minus",
     width: 16,
@@ -7371,13 +7304,11 @@ var ZoomControl = function ZoomControl() {
     }, v.text));
   })))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-zoom-button",
-    "aria-label": info.zoomIn,
     onClick: function onClick(e) {
       zoomTo(context.zoomRatio + 0.1);
       e.stopPropagation();
     },
-    tabIndex: 0,
-    role: "button"
+    tabIndex: 0
   }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
     name: "plus",
     width: 16,
@@ -7402,8 +7333,6 @@ var SheetTab = function SheetTab() {
     _useState4 = _slicedToArray(_useState3, 2),
     isShowBoundary = _useState4[0],
     setIsShowBoundary = _useState4[1];
-  var _locale = fortuneCore.locale(context),
-    info = _locale.info;
   var scrollDelta = 150;
   var scrollBy = React.useCallback(function (amount) {
     var _tabContainerRef$curr;
@@ -7446,10 +7375,7 @@ var SheetTab = function SheetTab() {
     id: "luckysheet-sheet-content"
   }, context.allowEdit && (/*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-sheettab-button",
-    onClick: onAddSheetClick,
-    tabIndex: 0,
-    "aria-label": info.newSheet,
-    role: "button"
+    onClick: onAddSheetClick
   }, /*#__PURE__*/React__default['default'].createElement(SVGIcon, {
     name: "plus",
     width: 16,
@@ -7534,12 +7460,6 @@ var Menu = function Menu(_ref) {
     _onMouseLeave = _ref.onMouseLeave,
     _onMouseEnter = _ref.onMouseEnter,
     children = _ref.children;
-  React.useEffect(function () {
-    var element = document.querySelector(".luckysheet-cols-menuitem");
-    if (element) {
-      element.focus();
-    }
-  }, []);
   var containerRef = React.useRef(null);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     ref: containerRef,
@@ -7720,34 +7640,23 @@ var ContextMenu = function ContextMenu() {
         key: name,
         onClick: function () {
           var _onClick = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-            var clipboardText, sessionClipboardText, finalText;
+            var clipboardText;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
-                  clipboardText = "";
-                  sessionClipboardText = sessionStorage.getItem("localClipboard") || "";
-                  _context.prev = 2;
-                  _context.next = 5;
+                  _context.next = 2;
                   return navigator.clipboard.readText();
-                case 5:
+                case 2:
                   clipboardText = _context.sent;
-                  _context.next = 11;
-                  break;
-                case 8:
-                  _context.prev = 8;
-                  _context.t0 = _context["catch"](2);
-                  console.warn("Clipboard access blocked. Attempting to use sessionStorage fallback.");
-                case 11:
-                  finalText = clipboardText || sessionClipboardText;
                   setContext(function (draftCtx) {
-                    fortuneCore.handlePasteByClick(draftCtx, finalText);
+                    fortuneCore.handlePasteByClick(draftCtx, clipboardText);
                     draftCtx.contextMenu = {};
                   });
-                case 13:
+                case 4:
                 case "end":
                   return _context.stop();
               }
-            }, _callee, null, [[2, 8]]);
+            }, _callee);
           }));
           function onClick() {
             return _onClick.apply(this, arguments);
@@ -10271,17 +10180,10 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       return fortuneCore.api.getSheetWithLatestCelldata(context, options);
     },
-    addSheet: function addSheet(sheetId) {
-      var existingSheetIds = fortuneCore.api.getAllSheets(context).map(function (sheet) {
-        return sheet.id || "";
+    addSheet: function addSheet() {
+      return setContext(function (draftCtx) {
+        return fortuneCore.api.addSheet(draftCtx, settings);
       });
-      if (sheetId && existingSheetIds.includes(sheetId)) {
-        console.error("Failed to add new sheet: A sheet with the id \"".concat(sheetId, "\" already exists. Please use a unique sheet id."));
-      } else {
-        setContext(function (draftCtx) {
-          return fortuneCore.api.addSheet(draftCtx, settings, sheetId);
-        });
-      }
     },
     deleteSheet: function deleteSheet() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -10332,9 +10234,11 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
     },
     handleUndo: handleUndo,
     handleRedo: handleRedo,
-    calculateFormula: function calculateFormula(id, range) {
+    calculateFormula: function calculateFormula() {
       setContext(function (draftCtx) {
-        fortuneCore.api.calculateFormula(draftCtx, id, range);
+        ___default['default'].forEach(draftCtx.luckysheetfile, function (sheet_obj) {
+          fortuneCore.api.calculateSheetFromula(draftCtx, sheet_obj.id);
+        });
       });
     },
     dataToCelldata: function dataToCelldata(data) {
@@ -10342,19 +10246,6 @@ function generateAPIs(context, setContext, handleUndo, handleRedo, settings, cel
     },
     celldataToData: function celldataToData(celldata, rowCount, colCount) {
       return fortuneCore.api.celldataToData(celldata, rowCount, colCount);
-    },
-    batchCallApis: function batchCallApis(apiCalls) {
-      setContext(function (draftCtx) {
-        apiCalls.forEach(function (apiCall) {
-          var name = apiCall.name,
-            args = apiCall.args;
-          if (typeof fortuneCore.api[name] === "function") {
-            fortuneCore.api[name].apply(fortuneCore.api, [draftCtx].concat(_toConsumableArray(args)));
-          } else {
-            console.warn("API ".concat(name, " does not exist"));
-          }
-        });
-      });
     }
   };
 }
@@ -11135,8 +11026,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
     context = _useState2[0],
     setContext = _useState2[1];
   var _locale = fortuneCore.locale(context),
-    formula = _locale.formula,
-    info = _locale.info;
+    formula = _locale.formula;
   var _useState3 = React.useState(null),
     _useState4 = _slicedToArray(_useState3, 2),
     moreToolbarItems = _useState4[0],
@@ -11322,7 +11212,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
     var history = globalCache.current.undoList.pop();
     if (history) {
       setContext(function (ctx_) {
-        var _history$options, _history$options3, _history$options4, _history$options5, _history$options6;
+        var _history$options, _history$options3;
         if ((_history$options = history.options) === null || _history$options === void 0 ? void 0 : _history$options.deleteSheetOp) {
           var _history$options$dele, _history$options$dele2;
           history.inversePatches[0].path[1] = ctx_.luckysheetfile.length;
@@ -11357,7 +11247,6 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
           delete inversedOptions.addSheet.value.data;
         }
         emitOp(newContext, history.inversePatches, inversedOptions, true);
-        if (((_history$options4 = history.options) === null || _history$options4 === void 0 ? void 0 : _history$options4.deleteRowColOp) || ((_history$options5 = history.options) === null || _history$options5 === void 0 ? void 0 : _history$options5.insertRowColOp) || ((_history$options6 = history.options) === null || _history$options6 === void 0 ? void 0 : _history$options6.restoreDeletedCells)) newContext.formulaCache.formulaCellInfoMap = null;else newContext.formulaCache.updateFormulaCache(newContext, history, "undo");
         return newContext;
       });
     }
@@ -11366,11 +11255,9 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
     var history = globalCache.current.redoList.pop();
     if (history) {
       setContext(function (ctx_) {
-        var _history$options7, _history$options8, _history$options9;
         var newContext = produce.applyPatches(ctx_, history.patches);
         globalCache.current.undoList.push(history);
         emitOp(newContext, history.patches, history.options);
-        if (((_history$options7 = history.options) === null || _history$options7 === void 0 ? void 0 : _history$options7.deleteRowColOp) || ((_history$options8 = history.options) === null || _history$options8 === void 0 ? void 0 : _history$options8.insertRowColOp) || ((_history$options9 = history.options) === null || _history$options9 === void 0 ? void 0 : _history$options9.restoreDeletedCells)) newContext.formulaCache.formulaCellInfoMap = null;else newContext.formulaCache.updateFormulaCache(newContext, history, "redo");
         return newContext;
       });
     }
@@ -11411,8 +11298,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
           var _draftCtx$luckysheetf;
           var index = fortuneCore.getSheetIndex(draftCtx, newDatum.id);
           var sheet = (_draftCtx$luckysheetf = draftCtx.luckysheetfile) === null || _draftCtx$luckysheetf === void 0 ? void 0 : _draftCtx$luckysheetf[index];
-          var cellMatrixData = initSheetData(draftCtx, sheet, index);
-          fortuneCore.setFormulaCellInfoMap(draftCtx, sheet.calcChain, cellMatrixData || undefined);
+          initSheetData(draftCtx, sheet, index);
         });
       }
       if (mergedSettings.devicePixelRatio > 0) {
@@ -11583,15 +11469,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
     className: "fortune-container",
     ref: workbookContainer,
     onKeyDown: onKeyDown
-  }, /*#__PURE__*/React__default['default'].createElement("section", {
-    "aria-labelledby": "shortcuts-heading",
-    id: "shortcut-list",
-    className: "sr-only",
-    tabIndex: 0,
-    "aria-live": "polite"
-  }, /*#__PURE__*/React__default['default'].createElement("h2", {
-    id: "shortcuts-heading"
-  }, info.shortcuts), /*#__PURE__*/React__default['default'].createElement("ul", null, /*#__PURE__*/React__default['default'].createElement("li", null, info.toggleSheetFocusShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.selectRangeShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.autoFillDownShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.autoFillRightShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.boldTextShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.copyShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.pasteShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.undoShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.redoShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.deleteCellContentShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.confirmCellEditShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.moveRightShortcut), /*#__PURE__*/React__default['default'].createElement("li", null, info.moveLeftShortcut))), /*#__PURE__*/React__default['default'].createElement(SVGDefines, {
+  }, /*#__PURE__*/React__default['default'].createElement(SVGDefines, {
     currency: mergedSettings.currency
   }), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "fortune-workarea"