@leankylin-sheet/react 5.1.15 → 5.1.16

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, 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 { 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, setNextSheet, 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, cancelActiveImgItem, 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';
@@ -7241,53 +7241,7 @@ var SheetItem = function SheetItem(_ref) {
   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;
-        if ((_refs$fxInput$current2 = refs.fxInput.current) === null || _refs$fxInput$current2 === void 0 ? void 0 : _refs$fxInput$current2.innerHTML) {
-          var _refs$fxInput$current3;
-          refs.cellInput.current.innerHTML = ((_refs$fxInput$current3 = refs.fxInput.current) === null || _refs$fxInput$current3 === void 0 ? void 0 : _refs$fxInput$current3.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;
-      draftCtx.currentSheetId = sheet.id;
-      if ((_update === null || _update === void 0 ? void 0 : _update.length) > 0) ;
-      draftCtx.dataVerificationDropDownList = false;
-      draftCtx.zoomRatio = sheet.zoomRatio || 1;
-      cancelActiveImgItem(draftCtx, refs.globalCache);
-      cancelNormalSelected(draftCtx);
-      if (isBack) {
-        draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
-        draftCtx.active_f = undefined;
-      }
+      setNextSheet(draftCtx, sheet.id, refs);
     });
   });
   return /*#__PURE__*/React.createElement("div", {
@@ -11480,7 +11434,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       return;
     }
     setContextWithProduce(function (draftCtx) {
-      handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
+      handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"), refs);
     });
   }, [handleRedo, handleUndo, setContextWithProduce, mergedSettings.disabledKeyboardCodes]);
   var onPaste = useCallback(function (e) {

package/dist/index.js

@@ -7251,53 +7251,7 @@ var SheetItem = function SheetItem(_ref) {
   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;
-        if ((_refs$fxInput$current2 = refs.fxInput.current) === null || _refs$fxInput$current2 === void 0 ? void 0 : _refs$fxInput$current2.innerHTML) {
-          var _refs$fxInput$current3;
-          refs.cellInput.current.innerHTML = ((_refs$fxInput$current3 = refs.fxInput.current) === null || _refs$fxInput$current3 === void 0 ? void 0 : _refs$fxInput$current3.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;
-      draftCtx.currentSheetId = sheet.id;
-      if ((_update === null || _update === void 0 ? void 0 : _update.length) > 0) ;
-      draftCtx.dataVerificationDropDownList = false;
-      draftCtx.zoomRatio = sheet.zoomRatio || 1;
-      core.cancelActiveImgItem(draftCtx, refs.globalCache);
-      core.cancelNormalSelected(draftCtx);
-      if (isBack) {
-        draftCtx.luckysheetCellUpdate = luckysheetCellUpdate;
-        draftCtx.active_f = undefined;
-      }
+      core.setNextSheet(draftCtx, sheet.id, refs);
     });
   });
   return /*#__PURE__*/React__default['default'].createElement("div", {
@@ -11490,7 +11444,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
       return;
     }
     setContextWithProduce(function (draftCtx) {
-      core.handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
+      core.handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"), refs);
     });
   }, [handleRedo, handleUndo, setContextWithProduce, mergedSettings.disabledKeyboardCodes]);
   var onPaste = React.useCallback(function (e) {