@leankylin-sheet/react 4.0.35 → 4.0.36

package/dist/index.css

@@ -273,6 +273,7 @@ html::-webkit-scrollbar-button {
   background: rgba(1, 136, 251, 0.15);
   display: none;
   box-sizing: content-box;
+  transition: width 0.05s linear, height 0.05s linear;
 }
 
 .luckysheet-cs-inner-border {

package/dist/index.esm.css

@@ -273,6 +273,7 @@ html::-webkit-scrollbar-button {
   background: rgba(1, 136, 251, 0.15);
   display: none;
   box-sizing: content-box;
+  transition: width 0.05s linear, height 0.05s linear;
 }
 
 .luckysheet-cs-inner-border {

package/dist/index.esm.js

@@ -1,4 +1,4 @@
-import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, functionHTMLGenerate, locale, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, moveToEnd, isShowHidenCR, cancelNormalSelected, moveHighlightCell, updateCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellAreaDragOver, handleCellDrop, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getDataBySelectionNoCopy, getInlineStringNoStyle, rangeHightlightselected, editSheetName, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, insertRowCol, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePasteByLeanklin, groupValuesRefresh } from '@leankylin-sheet/core';
+import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fixPositionOnFrozenCells, colLocation, getFlowdata, isAllowEdit, handleColumnHeaderMouseDown, handleColSizeHandleMouseDown, handleColFreezeHandleMouseDown, handleContextMenu, selectTitlesMap, selectTitlesRange, fixColumnStyleOverflowInFreeze, rowLocationByIndex, rowLocation, handleRowHeaderMouseDown, handleRowSizeHandleMouseDown, handleRowFreezeHandleMouseDown, fixRowStyleOverflowInFreeze, functionHTMLGenerate, locale, getCellValue, createRangeHightlight, isInlineStringCell, getInlineStringHTML, valueShowEs, escapeHTMLTag, escapeScriptTag, isShowHidenCR, cancelNormalSelected, moveHighlightCell, updateCell, israngeseleciton, handleFormulaInput, onSearchDialogMoveStart, replaceAll, replace, searchAll, searchNext, normalizeSelection, scrollToHighlightCell, isLinkValid, getRangetxt, goToLink, replaceHtml, removeHyperlink, onRangeSelectionModalMoveStart, saveHyperlink, createFilterOptions, onImageMoveStart, onImageResizeStart, showComments, setEditingComment, onCommentBoxMoveStart, onCommentBoxResizeStart, confirmMessage, getRangeByTxt, getDropdownList, setCellValue, setConditionRules, mergeBorder, setDropcownValue, handleCellAreaMouseDown, handleCellAreaMouseMove, handleCellAreaDragOver, handleCellDrop, handleCellAreaDoubleClick, selectAll, showLinkCard, getCellRowColumn, getCellHyperlink, handleOverlayMouseMove, handleOverlayMouseUp, handleKeydownForZoom, handleOverlayTouchStart, handleOverlayTouchMove, handleOverlayTouchEnd, onCellsMoveStart, createDropCellRange, updateContextWithSheetData, updateContextWithCanvas, initFreeze, Canvas, handleGlobalWheel, setCaretPosition, getDataArr, updateMoreCell, getRegStr, getOptionValue, getSelectRange, applyLocation, updateItem, update, normalizedCellAttr, updateFormat, handleTextSize, handleHorizontalAlign, handleVerticalAlign, handleScreenShot, showImgChooser, insertImage, editComment, deleteComment, showHideComment, showHideAllComments, newComment, handleSum, autoSelectionFormula, handleMerge, handleBorder, handleFreeze, handleSort, createFilter, clearFilter, toolbarItemSelectedFunc, toolbarItemClickHandler, handleTextColor, handleTextBackground, getDataBySelectionNoCopy, getInlineStringNoStyle, rangeHightlightselected, editSheetName, moveToEnd, cancelActiveImgItem, MAX_ZOOM_RATIO, MIN_ZOOM_RATIO, addSheet, indexToColumnChar, sortSelection, handleCopy, insertRowCol, deleteRowCol, hideSelected, showSelected, api, removeActiveImage, deleteSelectedCellText, jfrefreshgrid, handleLink, deleteSheet, opToPatch, orderbydatafiler, getFilterColumnValues, getFilterColumnColors, saveFilter, patchToOp, filterPatch, inverseRowColOptions, ensureSheetIndex, initSheetIndex, handleGlobalKeyDown, handlePasteByLeanklin, groupValuesRefresh } from '@leankylin-sheet/core';
 import React, { useContext, useRef, useState, useMemo, useCallback, useEffect, useLayoutEffect, useImperativeHandle } from 'react';
 import produce, { applyPatches, enablePatches, produceWithPatches } from 'immer';
 import _ from 'lodash';
@@ -1165,9 +1165,6 @@ var InputBox = function InputBox() {
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = useRef("");
-  var inputBoxStyle = useMemo(function () {
-    return {};
-  }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, firstSelection]);
   useLayoutEffect(function () {
     if (!context.allowEdit) {
       setContext(function (ctx) {
@@ -1209,20 +1206,18 @@ var InputBox = function InputBox() {
       if (!refs.globalCache.ignoreWriteCell) inputRef.current.innerHTML = escapeHTMLTag(escapeScriptTag(value));
       refs.globalCache.ignoreWriteCell = false;
       if (!refs.globalCache.doNotFocus) {
-        setTimeout(function () {
-          moveToEnd(inputRef.current);
-        });
+        setTimeout(function () {});
       }
       delete refs.globalCache.doNotFocus;
     }
   }, [context.luckysheetCellUpdate, context.luckysheetfile, context.currentSheetId, firstSelection]);
   useEffect(function () {
-    if (_.isEmpty(context.luckysheetCellUpdate)) {
+    if (_.isEmpty(context.luckysheetCellUpdate) && !context.active_f) {
       if (inputRef.current) {
         inputRef.current.innerHTML = "";
       }
     }
-  }, [context.luckysheetCellUpdate]);
+  }, [context.luckysheetCellUpdate, context.active_f]);
   useEffect(function () {
     setIsHidenRC(isShowHidenCR(context));
   }, [context.luckysheet_select_save]);
@@ -1264,6 +1259,7 @@ var InputBox = function InputBox() {
         handleFormulaInput(draftCtx, refs.fxInput.current, refs.cellInput.current, kcode, preText.current);
       });
     }
+    lastKeyDownEventRef.current = undefined;
   }, [refs.cellInput, refs.fxInput, setContext]);
   var onPaste = useCallback(function (e) {
     if (_.isEmpty(context.luckysheetCellUpdate)) {
@@ -1297,10 +1293,10 @@ var InputBox = function InputBox() {
     }
   }, /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-input-box-inner",
-    style: firstSelection ? _objectSpread2({
+    style: firstSelection ? {
       minWidth: firstSelection.width,
       minHeight: firstSelection.height
-    }, inputBoxStyle) : {}
+    } : {}
   }, /*#__PURE__*/React.createElement(ContentEditable, {
     innerRef: function innerRef(e) {
       inputRef.current = e;
@@ -2099,6 +2095,17 @@ var FilterOptions = function FilterOptions(_ref) {
     frozenColumns = (frozen === null || frozen === void 0 ? void 0 : (_frozen$range = frozen.range) === null || _frozen$range === void 0 ? void 0 : _frozen$range.column_focus) || -1;
     frozenRows = (frozen === null || frozen === void 0 ? void 0 : (_frozen$range2 = frozen.range) === null || _frozen$range2 === void 0 ? void 0 : _frozen$range2.row_focus) || -1;
   }
+  function hiddenFilter(index) {
+    var _context$config$colhi;
+    if (!filterOptions) {
+      return true;
+    }
+    var col = filterOptions.startCol + index;
+    if (((_context$config$colhi = context.config.colhidden) === null || _context$config$colhi === void 0 ? void 0 : _context$config$colhi[col]) === 0) {
+      return true;
+    }
+    return false;
+  }
   return filterOptions == null ? ( /*#__PURE__*/React.createElement("div", null)) : ( /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     id: "luckysheet-filter-selected-sheet",
     className: "luckysheet-cell-selected luckysheet-filter-selected",
@@ -2122,6 +2129,9 @@ var FilterOptions = function FilterOptions(_ref) {
       left: left,
       top: top
     });
+    if (hiddenFilter(i)) {
+      return null;
+    }
     if (settings.renderFilter) {
       return settings.renderFilter({
         style: _.assign(rowOverflowFreezeStyle, columnOverflowFreezeStyle, {
@@ -6955,6 +6965,9 @@ var FxEditor = function FxEditor() {
       return;
     }
     var d = getFlowdata(context);
+    if (context.active_f) {
+      return;
+    }
     var value = "";
     if (firstSelection) {
       var _d$r;
@@ -6975,12 +6988,17 @@ var FxEditor = function FxEditor() {
     } else {
       refs.fxInput.current.innerHTML = "";
     }
-  }, [context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
+  }, [context.active_f, context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
   var onFocus = useCallback(function () {
     var _context$luckysheet_s2, _context$luckysheet_s3;
     if (context.allowEdit === false) {
       return;
     }
+    if (context.active_f) {
+      setFocused(true);
+      refs.globalCache.doNotFocus = true;
+      return;
+    }
     if (((_context$luckysheet_s2 = (_context$luckysheet_s3 = context.luckysheet_select_save) === null || _context$luckysheet_s3 === void 0 ? void 0 : _context$luckysheet_s3.length) !== null && _context$luckysheet_s2 !== void 0 ? _context$luckysheet_s2 : 0) > 0 && !context.luckysheet_cell_selected_move && isAllowEdit(context, context.luckysheet_select_save)) {
       setFocused(true);
       setContext(function (draftCtx) {
@@ -6991,7 +7009,7 @@ var FxEditor = function FxEditor() {
         refs.globalCache.doNotFocus = true;
       });
     }
-  }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, refs.globalCache, setContext]);
+  }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, refs.globalCache, context.active_f, setContext]);
   var onKeyDown = useCallback(function (e) {
     if (context.allowEdit === false) {
       return;
@@ -7002,6 +7020,9 @@ var FxEditor = function FxEditor() {
     if (key === "ArrowLeft" || key === "ArrowRight") {
       e.stopPropagation();
     }
+    if (!["Enter", "Escape", "ArrowLeft", "ArrowRight"].includes(key)) {
+      return;
+    }
     setContext(function (draftCtx) {
       if (context.luckysheetCellUpdate.length > 0) {
         switch (key) {
@@ -7210,6 +7231,57 @@ var SheetItem = function SheetItem(_ref) {
     setDragOver(false);
     e.stopPropagation();
   }, [context.allowEdit, isDropPlaceholder, setContext, sheet.id]);
+  var onChangeSheet = useMemoizedFn(function () {
+    if (isDropPlaceholder) return;
+    setContext(function (draftCtx) {
+      var _luckysheetCellUpdate;
+      draftCtx.sheetScrollRecord[draftCtx.currentSheetId] = {
+        scrollLeft: draftCtx.scrollLeft,
+        scrollTop: draftCtx.scrollTop,
+        luckysheet_select_status: draftCtx.luckysheet_select_status,
+        luckysheet_select_save: draftCtx.luckysheet_select_save,
+        luckysheet_selection_range: draftCtx.luckysheet_selection_range
+      };
+      var isBack = false;
+      var luckysheetCellUpdate = [];
+      var sheetId = sheet.id;
+      if ((israngeseleciton(draftCtx) || draftCtx.formulaCache.rangestart) && !draftCtx.active_f) {
+        var _refs$fxInput$current, _draftCtx$sheetScroll;
+        draftCtx.active_f = {
+          r: draftCtx.luckysheet_select_save[0].row_focus,
+          c: draftCtx.luckysheet_select_save[0].column_focus,
+          sheetId: draftCtx.currentSheetId,
+          text: (_refs$fxInput$current = refs.fxInput.current) === null || _refs$fxInput$current === void 0 ? void 0 : _refs$fxInput$current.innerText
+        };
+        if ((_draftCtx$sheetScroll = draftCtx.sheetScrollRecord[sheet.id]) === null || _draftCtx$sheetScroll === void 0 ? void 0 : _draftCtx$sheetScroll.luckysheet_select_save) {
+          draftCtx.sheetScrollRecord[sheet.id].luckysheet_select_save = undefined;
+        }
+        moveToEnd(refs.fxInput.current);
+      } else if (draftCtx.active_f && draftCtx.active_f.sheetId === sheet.id) {
+        var _refs$fxInput$current2;
+        luckysheetCellUpdate = [draftCtx.active_f.r, draftCtx.active_f.c];
+        isBack = true;
+        refs.cellInput.current.innerHTML = ((_refs$fxInput$current2 = refs.fxInput.current) === null || _refs$fxInput$current2 === void 0 ? void 0 : _refs$fxInput$current2.innerHTML) || "";
+        moveToEnd(refs.cellInput.current);
+      }
+      if (draftCtx.active_f) {
+        sheetId = draftCtx.active_f.sheetId;
+      }
+      var _update = ((_luckysheetCellUpdate = luckysheetCellUpdate) === null || _luckysheetCellUpdate === void 0 ? void 0 : _luckysheetCellUpdate.length) > 0 ? luckysheetCellUpdate : draftCtx.luckysheetCellUpdate;
+      if ((_update === null || _update === void 0 ? void 0 : _update.length) > 0) {
+        updateCell(draftCtx, _update[0], _update[1], refs.cellInput.current, undefined, refs.canvas.current.getContext("2d"), sheetId);
+      }
+      draftCtx.dataVerificationDropDownList = false;
+      draftCtx.currentSheetId = sheet.id;
+      draftCtx.zoomRatio = sheet.zoomRatio || 1;
+      cancelActiveImgItem(draftCtx, refs.globalCache);
+      cancelNormalSelected(draftCtx);
+      if (isBack) {
+        draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
+        draftCtx.active_f = undefined;
+      }
+    });
+  });
   return /*#__PURE__*/React.createElement("div", {
     onDragOver: function onDragOver(e) {
       e.preventDefault();
@@ -7233,23 +7305,7 @@ var SheetItem = function SheetItem(_ref) {
     key: sheet.id,
     ref: containerRef,
     className: isDropPlaceholder ? "leankylin-sheettab-placeholder" : "luckysheet-sheets-item".concat(context.currentSheetId === sheet.id ? " luckysheet-sheets-item-active" : ""),
-    onClick: function onClick() {
-      if (isDropPlaceholder) return;
-      setContext(function (draftCtx) {
-        draftCtx.sheetScrollRecord[draftCtx.currentSheetId] = {
-          scrollLeft: draftCtx.scrollLeft,
-          scrollTop: draftCtx.scrollTop,
-          luckysheet_select_status: draftCtx.luckysheet_select_status,
-          luckysheet_select_save: draftCtx.luckysheet_select_save,
-          luckysheet_selection_range: draftCtx.luckysheet_selection_range
-        };
-        draftCtx.dataVerificationDropDownList = false;
-        draftCtx.currentSheetId = sheet.id;
-        draftCtx.zoomRatio = sheet.zoomRatio || 1;
-        cancelActiveImgItem(draftCtx, refs.globalCache);
-        cancelNormalSelected(draftCtx);
-      });
-    },
+    onClick: onChangeSheet,
     onContextMenu: function onContextMenu(e) {
       if (isDropPlaceholder) return;
       var rect = refs.workbookContainer.current.getBoundingClientRect();

package/dist/index.js

@@ -1175,9 +1175,6 @@ var InputBox = function InputBox() {
   var row_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.row_focus;
   var col_index = firstSelection === null || firstSelection === void 0 ? void 0 : firstSelection.column_focus;
   var preText = React.useRef("");
-  var inputBoxStyle = React.useMemo(function () {
-    return {};
-  }, [context.luckysheetfile, context.currentSheetId, context.luckysheetCellUpdate, firstSelection]);
   React.useLayoutEffect(function () {
     if (!context.allowEdit) {
       setContext(function (ctx) {
@@ -1219,20 +1216,18 @@ var InputBox = function InputBox() {
       if (!refs.globalCache.ignoreWriteCell) inputRef.current.innerHTML = core.escapeHTMLTag(core.escapeScriptTag(value));
       refs.globalCache.ignoreWriteCell = false;
       if (!refs.globalCache.doNotFocus) {
-        setTimeout(function () {
-          core.moveToEnd(inputRef.current);
-        });
+        setTimeout(function () {});
       }
       delete refs.globalCache.doNotFocus;
     }
   }, [context.luckysheetCellUpdate, context.luckysheetfile, context.currentSheetId, firstSelection]);
   React.useEffect(function () {
-    if (___default['default'].isEmpty(context.luckysheetCellUpdate)) {
+    if (___default['default'].isEmpty(context.luckysheetCellUpdate) && !context.active_f) {
       if (inputRef.current) {
         inputRef.current.innerHTML = "";
       }
     }
-  }, [context.luckysheetCellUpdate]);
+  }, [context.luckysheetCellUpdate, context.active_f]);
   React.useEffect(function () {
     setIsHidenRC(core.isShowHidenCR(context));
   }, [context.luckysheet_select_save]);
@@ -1274,6 +1269,7 @@ var InputBox = function InputBox() {
         core.handleFormulaInput(draftCtx, refs.fxInput.current, refs.cellInput.current, kcode, preText.current);
       });
     }
+    lastKeyDownEventRef.current = undefined;
   }, [refs.cellInput, refs.fxInput, setContext]);
   var onPaste = React.useCallback(function (e) {
     if (___default['default'].isEmpty(context.luckysheetCellUpdate)) {
@@ -1307,10 +1303,10 @@ var InputBox = function InputBox() {
     }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "luckysheet-input-box-inner",
-    style: firstSelection ? _objectSpread2({
+    style: firstSelection ? {
       minWidth: firstSelection.width,
       minHeight: firstSelection.height
-    }, inputBoxStyle) : {}
+    } : {}
   }, /*#__PURE__*/React__default['default'].createElement(ContentEditable, {
     innerRef: function innerRef(e) {
       inputRef.current = e;
@@ -2109,6 +2105,17 @@ var FilterOptions = function FilterOptions(_ref) {
     frozenColumns = (frozen === null || frozen === void 0 ? void 0 : (_frozen$range = frozen.range) === null || _frozen$range === void 0 ? void 0 : _frozen$range.column_focus) || -1;
     frozenRows = (frozen === null || frozen === void 0 ? void 0 : (_frozen$range2 = frozen.range) === null || _frozen$range2 === void 0 ? void 0 : _frozen$range2.row_focus) || -1;
   }
+  function hiddenFilter(index) {
+    var _context$config$colhi;
+    if (!filterOptions) {
+      return true;
+    }
+    var col = filterOptions.startCol + index;
+    if (((_context$config$colhi = context.config.colhidden) === null || _context$config$colhi === void 0 ? void 0 : _context$config$colhi[col]) === 0) {
+      return true;
+    }
+    return false;
+  }
   return filterOptions == null ? ( /*#__PURE__*/React__default['default'].createElement("div", null)) : ( /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
     id: "luckysheet-filter-selected-sheet",
     className: "luckysheet-cell-selected luckysheet-filter-selected",
@@ -2132,6 +2139,9 @@ var FilterOptions = function FilterOptions(_ref) {
       left: left,
       top: top
     });
+    if (hiddenFilter(i)) {
+      return null;
+    }
     if (settings.renderFilter) {
       return settings.renderFilter({
         style: ___default['default'].assign(rowOverflowFreezeStyle, columnOverflowFreezeStyle, {
@@ -6965,6 +6975,9 @@ var FxEditor = function FxEditor() {
       return;
     }
     var d = core.getFlowdata(context);
+    if (context.active_f) {
+      return;
+    }
     var value = "";
     if (firstSelection) {
       var _d$r;
@@ -6985,12 +6998,17 @@ var FxEditor = function FxEditor() {
     } else {
       refs.fxInput.current.innerHTML = "";
     }
-  }, [context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
+  }, [context.active_f, context.luckysheetfile, context.currentSheetId, context.luckysheet_select_save]);
   var onFocus = React.useCallback(function () {
     var _context$luckysheet_s2, _context$luckysheet_s3;
     if (context.allowEdit === false) {
       return;
     }
+    if (context.active_f) {
+      setFocused(true);
+      refs.globalCache.doNotFocus = true;
+      return;
+    }
     if (((_context$luckysheet_s2 = (_context$luckysheet_s3 = context.luckysheet_select_save) === null || _context$luckysheet_s3 === void 0 ? void 0 : _context$luckysheet_s3.length) !== null && _context$luckysheet_s2 !== void 0 ? _context$luckysheet_s2 : 0) > 0 && !context.luckysheet_cell_selected_move && core.isAllowEdit(context, context.luckysheet_select_save)) {
       setFocused(true);
       setContext(function (draftCtx) {
@@ -7001,7 +7019,7 @@ var FxEditor = function FxEditor() {
         refs.globalCache.doNotFocus = true;
       });
     }
-  }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, refs.globalCache, setContext]);
+  }, [context.config, context.luckysheet_select_save, context.luckysheetfile, context.currentSheetId, refs.globalCache, context.active_f, setContext]);
   var onKeyDown = React.useCallback(function (e) {
     if (context.allowEdit === false) {
       return;
@@ -7012,6 +7030,9 @@ var FxEditor = function FxEditor() {
     if (key === "ArrowLeft" || key === "ArrowRight") {
       e.stopPropagation();
     }
+    if (!["Enter", "Escape", "ArrowLeft", "ArrowRight"].includes(key)) {
+      return;
+    }
     setContext(function (draftCtx) {
       if (context.luckysheetCellUpdate.length > 0) {
         switch (key) {
@@ -7220,6 +7241,57 @@ var SheetItem = function SheetItem(_ref) {
     setDragOver(false);
     e.stopPropagation();
   }, [context.allowEdit, isDropPlaceholder, setContext, sheet.id]);
+  var onChangeSheet = ahooks.useMemoizedFn(function () {
+    if (isDropPlaceholder) return;
+    setContext(function (draftCtx) {
+      var _luckysheetCellUpdate;
+      draftCtx.sheetScrollRecord[draftCtx.currentSheetId] = {
+        scrollLeft: draftCtx.scrollLeft,
+        scrollTop: draftCtx.scrollTop,
+        luckysheet_select_status: draftCtx.luckysheet_select_status,
+        luckysheet_select_save: draftCtx.luckysheet_select_save,
+        luckysheet_selection_range: draftCtx.luckysheet_selection_range
+      };
+      var isBack = false;
+      var luckysheetCellUpdate = [];
+      var sheetId = sheet.id;
+      if ((core.israngeseleciton(draftCtx) || draftCtx.formulaCache.rangestart) && !draftCtx.active_f) {
+        var _refs$fxInput$current, _draftCtx$sheetScroll;
+        draftCtx.active_f = {
+          r: draftCtx.luckysheet_select_save[0].row_focus,
+          c: draftCtx.luckysheet_select_save[0].column_focus,
+          sheetId: draftCtx.currentSheetId,
+          text: (_refs$fxInput$current = refs.fxInput.current) === null || _refs$fxInput$current === void 0 ? void 0 : _refs$fxInput$current.innerText
+        };
+        if ((_draftCtx$sheetScroll = draftCtx.sheetScrollRecord[sheet.id]) === null || _draftCtx$sheetScroll === void 0 ? void 0 : _draftCtx$sheetScroll.luckysheet_select_save) {
+          draftCtx.sheetScrollRecord[sheet.id].luckysheet_select_save = undefined;
+        }
+        core.moveToEnd(refs.fxInput.current);
+      } else if (draftCtx.active_f && draftCtx.active_f.sheetId === sheet.id) {
+        var _refs$fxInput$current2;
+        luckysheetCellUpdate = [draftCtx.active_f.r, draftCtx.active_f.c];
+        isBack = true;
+        refs.cellInput.current.innerHTML = ((_refs$fxInput$current2 = refs.fxInput.current) === null || _refs$fxInput$current2 === void 0 ? void 0 : _refs$fxInput$current2.innerHTML) || "";
+        core.moveToEnd(refs.cellInput.current);
+      }
+      if (draftCtx.active_f) {
+        sheetId = draftCtx.active_f.sheetId;
+      }
+      var _update = ((_luckysheetCellUpdate = luckysheetCellUpdate) === null || _luckysheetCellUpdate === void 0 ? void 0 : _luckysheetCellUpdate.length) > 0 ? luckysheetCellUpdate : draftCtx.luckysheetCellUpdate;
+      if ((_update === null || _update === void 0 ? void 0 : _update.length) > 0) {
+        core.updateCell(draftCtx, _update[0], _update[1], refs.cellInput.current, undefined, refs.canvas.current.getContext("2d"), sheetId);
+      }
+      draftCtx.dataVerificationDropDownList = false;
+      draftCtx.currentSheetId = sheet.id;
+      draftCtx.zoomRatio = sheet.zoomRatio || 1;
+      core.cancelActiveImgItem(draftCtx, refs.globalCache);
+      core.cancelNormalSelected(draftCtx);
+      if (isBack) {
+        draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
+        draftCtx.active_f = undefined;
+      }
+    });
+  });
   return /*#__PURE__*/React__default['default'].createElement("div", {
     onDragOver: function onDragOver(e) {
       e.preventDefault();
@@ -7243,23 +7315,7 @@ var SheetItem = function SheetItem(_ref) {
     key: sheet.id,
     ref: containerRef,
     className: isDropPlaceholder ? "leankylin-sheettab-placeholder" : "luckysheet-sheets-item".concat(context.currentSheetId === sheet.id ? " luckysheet-sheets-item-active" : ""),
-    onClick: function onClick() {
-      if (isDropPlaceholder) return;
-      setContext(function (draftCtx) {
-        draftCtx.sheetScrollRecord[draftCtx.currentSheetId] = {
-          scrollLeft: draftCtx.scrollLeft,
-          scrollTop: draftCtx.scrollTop,
-          luckysheet_select_status: draftCtx.luckysheet_select_status,
-          luckysheet_select_save: draftCtx.luckysheet_select_save,
-          luckysheet_selection_range: draftCtx.luckysheet_selection_range
-        };
-        draftCtx.dataVerificationDropDownList = false;
-        draftCtx.currentSheetId = sheet.id;
-        draftCtx.zoomRatio = sheet.zoomRatio || 1;
-        core.cancelActiveImgItem(draftCtx, refs.globalCache);
-        core.cancelNormalSelected(draftCtx);
-      });
-    },
+    onClick: onChangeSheet,
     onContextMenu: function onContextMenu(e) {
       if (isDropPlaceholder) return;
       var rect = refs.workbookContainer.current.getBoundingClientRect();

package/dist/index.umd.css

@@ -273,6 +273,7 @@ html::-webkit-scrollbar-button {
   background: rgba(1, 136, 251, 0.15);
   display: none;
   box-sizing: content-box;
+  transition: width 0.05s linear, height 0.05s linear;
 }
 
 .luckysheet-cs-inner-border {