@leankylin-sheet/react 5.2.76 → 6.0.0

package/dist/context/index.d.ts

@@ -17,6 +17,7 @@ export type SetContextOptions = {
 declare const WorkbookContext: React.Context<{
     context: Context;
     setContext: (recipe: (ctx: Context) => void, options?: SetContextOptions) => void;
+    setScrollContext: (recipe: (ctx: Context) => void) => void;
     settings: Required<Settings>;
     refs: RefValues;
     handleUndo: () => void;

package/dist/index.esm.js

@@ -556,6 +556,7 @@ var defaultRefs = {
 var WorkbookContext = /*#__PURE__*/React.createContext({
   context: defaultContext(defaultRefs),
   setContext: function setContext() {},
+  setScrollContext: function setScrollContext() {},
   settings: defaultSettings,
   handleUndo: function handleUndo() {},
   handleRedo: function handleRedo() {},
@@ -1670,7 +1671,7 @@ var ScrollBar = function ScrollBar(_ref) {
   var _useContext = useContext(WorkbookContext),
     context = _useContext.context,
     refs = _useContext.refs,
-    setContext = _useContext.setContext;
+    setScrollContext = _useContext.setScrollContext;
   var ref = axis === "x" ? refs.scrollbarX : refs.scrollbarY;
   var _useInViewport = useInViewport(ref),
     _useInViewport2 = _slicedToArray(_useInViewport, 1),
@@ -1703,11 +1704,11 @@ var ScrollBar = function ScrollBar(_ref) {
     className: "luckysheet-scrollbars luckysheet-scrollbar-ltr luckysheet-scrollbar-".concat(axis),
     onScroll: function onScroll() {
       if (axis === "x") {
-        setContext(function (draftCtx) {
+        setScrollContext(function (draftCtx) {
           draftCtx.scrollLeft = refs.scrollbarX.current.scrollLeft;
         });
       } else {
-        setContext(function (draftCtx) {
+        setScrollContext(function (draftCtx) {
           draftCtx.scrollTop = refs.scrollbarY.current.scrollTop;
         });
       }
@@ -4350,9 +4351,7 @@ var SheetOverlay = function SheetOverlay() {
   }, [setContext, refs.globalCache, refs.cellInput, refs.cellArea, refs.fxInput, refs.canvas]);
   var debounceMouseMove = useMemoizedFn(function (e) {
     var nativeEvent = e.nativeEvent;
-    setContext(function (draftCtx) {
-      handleCellAreaMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
-    });
+    handleCellAreaMouseMove(context, refs.globalCache, nativeEvent, refs.cellArea.current);
   });
   var debounceDragOver = useMemoizedFn(function (e) {
     var nativeEvent = e.nativeEvent;
@@ -4422,12 +4421,29 @@ var SheetOverlay = function SheetOverlay() {
       debouncedShowLinkCard(globalCache, rc.r, rc.c, false, true);
     }
   }, [debouncedShowLinkCard]);
+  var lastHoverCellRef = useRef(null);
   var onMouseMove = useCallback(function (nativeEvent) {
+    var _gc$commentBox, _gc$commentBox2, _gc$searchDialog, _gc$linkCard;
+    var container = containerRef.current;
+    var scrollX = refs.scrollbarX.current;
+    var scrollY = refs.scrollbarY.current;
+    if (!container || !scrollX || !scrollY) return;
+    var gc = refs.globalCache;
+    var isInteracting = !!context.luckysheet_scroll_status || !!context.luckysheet_select_status || !!context.luckysheet_rows_selected_status || !!context.luckysheet_cols_selected_status || !!context.luckysheet_cell_selected_move || !!context.luckysheet_cell_selected_extend || !!context.luckysheet_cols_change_size || !!context.luckysheet_rows_change_size || ((_gc$commentBox = gc.commentBox) === null || _gc$commentBox === void 0 ? void 0 : _gc$commentBox.movingId) != null || ((_gc$commentBox2 = gc.commentBox) === null || _gc$commentBox2 === void 0 ? void 0 : _gc$commentBox2.resizingId) != null || gc.image != null || ((_gc$searchDialog = gc.searchDialog) === null || _gc$searchDialog === void 0 ? void 0 : _gc$searchDialog.moveProps) != null || ((_gc$linkCard = gc.linkCard) === null || _gc$linkCard === void 0 ? void 0 : _gc$linkCard.rangeSelectionModal) != null;
+    if (!isInteracting) {
+      var rc = getCellRowColumn(context, nativeEvent, container, scrollX, scrollY);
+      var last = lastHoverCellRef.current;
+      var hoverChanged = rc == null ? last != null : last == null || last.r !== rc.r || last.c !== rc.c;
+      if (!hoverChanged) {
+        return;
+      }
+      lastHoverCellRef.current = rc !== null && rc !== void 0 ? rc : null;
+    }
     setContext(function (draftCtx) {
-      overShowLinkCard(draftCtx, refs.globalCache, nativeEvent, containerRef.current, refs.scrollbarX.current, refs.scrollbarY.current);
-      handleOverlayMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, refs.scrollbarX.current, refs.scrollbarY.current, containerRef.current, refs.fxInput.current);
+      overShowLinkCard(draftCtx, refs.globalCache, nativeEvent, container, scrollX, scrollY);
+      handleOverlayMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, scrollX, scrollY, container, refs.fxInput.current);
     });
-  }, [overShowLinkCard, refs.cellInput, refs.fxInput, refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
+  }, [overShowLinkCard, context, refs.cellInput, refs.fxInput, refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
   var onMouseUp = useCallback(function (nativeEvent) {
     setContext(function (draftCtx) {
       try {
@@ -5014,9 +5030,7 @@ var Sheet = function Sheet(_ref) {
     return false;
   }
   var onWheel = useCallback(function (e) {
-    setContext(function (draftCtx) {
-      handleGlobalWheel(draftCtx, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
-    });
+    handleGlobalWheel(context, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
     if (e.deltaY === 0 && e.deltaX === 0) {
       return;
     }
@@ -5037,7 +5051,7 @@ var Sheet = function Sheet(_ref) {
         e.preventDefault();
       }
     }
-  }, [refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
+  }, [context, refs.globalCache, refs.scrollbarX, refs.scrollbarY]);
   useEffect(function () {
     var container = containerRef.current;
     container === null || container === void 0 ? void 0 : container.addEventListener("wheel", onWheel);
@@ -12119,60 +12133,77 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       }
     }
     contextRef.current = result;
-    setContext(result);
+    setContext(function (prev) {
+      if (prev === ctx_) {
+        return result;
+      }
+      var merged = applyPatches(prev, patches);
+      contextRef.current = merged;
+      return merged;
+    });
+  });
+  var setScrollContext = useMemoizedFn(function (recipe) {
+    setContext(function (ctx_) {
+      var result = produce(ctx_, recipe);
+      if (result === ctx_) {
+        return ctx_;
+      }
+      contextRef.current = result;
+      return result;
+    });
   });
   var handleUndo = useCallback(function () {
     var history = globalCache.current.undoList.pop();
     if (history) {
-      var _history$options, _history$options3;
-      var ctx_ = contextRef.current;
-      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;
-        var order = (_history$options$dele = history.options.deletedSheet) === null || _history$options$dele === void 0 ? void 0 : (_history$options$dele2 = _history$options$dele.value) === null || _history$options$dele2 === void 0 ? void 0 : _history$options$dele2.order;
-        var sheetsRight = ctx_.luckysheetfile.filter(function (sheet) {
-          var _history$options2, _history$options2$del;
-          return (sheet === null || sheet === void 0 ? void 0 : sheet.order) >= order && sheet.id !== (history === null || history === void 0 ? void 0 : (_history$options2 = history.options) === null || _history$options2 === void 0 ? void 0 : (_history$options2$del = _history$options2.deleteSheetOp) === null || _history$options2$del === void 0 ? void 0 : _history$options2$del.id);
-        });
-        _.forEach(sheetsRight, function (sheet) {
-          history.inversePatches.push({
-            op: "replace",
-            path: ["luckysheetfile", getSheetIndex(ctx_, sheet.id), "order"],
-            value: (sheet === null || sheet === void 0 ? void 0 : sheet.order) + 1
+      setContext(function (ctx_) {
+        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;
+          var order = (_history$options$dele = history.options.deletedSheet) === null || _history$options$dele === void 0 ? void 0 : (_history$options$dele2 = _history$options$dele.value) === null || _history$options$dele2 === void 0 ? void 0 : _history$options$dele2.order;
+          var sheetsRight = ctx_.luckysheetfile.filter(function (sheet) {
+            var _history$options2, _history$options2$del;
+            return (sheet === null || sheet === void 0 ? void 0 : sheet.order) >= order && sheet.id !== (history === null || history === void 0 ? void 0 : (_history$options2 = history.options) === null || _history$options2 === void 0 ? void 0 : (_history$options2$del = _history$options2.deleteSheetOp) === null || _history$options2$del === void 0 ? void 0 : _history$options2$del.id);
           });
-        });
-      }
-      var newContext = applyPatches(ctx_, history.inversePatches);
-      globalCache.current.redoList.push(history);
-      var inversedOptions = inverseRowColOptions(history.options);
-      if (inversedOptions === null || inversedOptions === void 0 ? void 0 : inversedOptions.insertRowColOp) {
-        inversedOptions.restoreDeletedCells = true;
-      }
-      if ((_history$options3 = history.options) === null || _history$options3 === void 0 ? void 0 : _history$options3.addSheetOp) {
-        var _inversedOptions$addS;
-        var index = getSheetIndex(ctx_, history.options.addSheet.id);
-        inversedOptions.addSheet = {
-          id: history.options.addSheet.id,
-          index: index,
-          value: _.cloneDeep(ctx_.luckysheetfile[index])
-        };
-        inversedOptions.addSheet.value.celldata = dataToCelldata((_inversedOptions$addS = inversedOptions.addSheet.value) === null || _inversedOptions$addS === void 0 ? void 0 : _inversedOptions$addS.data);
-        delete inversedOptions.addSheet.value.data;
-      }
-      emitOp(newContext, history.inversePatches, inversedOptions, true);
-      contextRef.current = newContext;
-      setContext(newContext);
+          _.forEach(sheetsRight, function (sheet) {
+            history.inversePatches.push({
+              op: "replace",
+              path: ["luckysheetfile", getSheetIndex(ctx_, sheet.id), "order"],
+              value: (sheet === null || sheet === void 0 ? void 0 : sheet.order) + 1
+            });
+          });
+        }
+        var newContext = applyPatches(ctx_, history.inversePatches);
+        globalCache.current.redoList.push(history);
+        var inversedOptions = inverseRowColOptions(history.options);
+        if (inversedOptions === null || inversedOptions === void 0 ? void 0 : inversedOptions.insertRowColOp) {
+          inversedOptions.restoreDeletedCells = true;
+        }
+        if ((_history$options3 = history.options) === null || _history$options3 === void 0 ? void 0 : _history$options3.addSheetOp) {
+          var _inversedOptions$addS;
+          var index = getSheetIndex(ctx_, history.options.addSheet.id);
+          inversedOptions.addSheet = {
+            id: history.options.addSheet.id,
+            index: index,
+            value: _.cloneDeep(ctx_.luckysheetfile[index])
+          };
+          inversedOptions.addSheet.value.celldata = dataToCelldata((_inversedOptions$addS = inversedOptions.addSheet.value) === null || _inversedOptions$addS === void 0 ? void 0 : _inversedOptions$addS.data);
+          delete inversedOptions.addSheet.value.data;
+        }
+        emitOp(newContext, history.inversePatches, inversedOptions, true);
+        return newContext;
+      });
     }
   }, [emitOp]);
   var handleRedo = useCallback(function () {
     var history = globalCache.current.redoList.pop();
     if (history) {
-      var ctx_ = contextRef.current;
-      var newContext = applyPatches(ctx_, history.patches);
-      globalCache.current.undoList.push(history);
-      emitOp(newContext, history.patches, history.options);
-      contextRef.current = newContext;
-      setContext(newContext);
+      setContext(function (ctx_) {
+        var newContext = applyPatches(ctx_, history.patches);
+        globalCache.current.undoList.push(history);
+        emitOp(newContext, history.patches, history.options);
+        return newContext;
+      });
     }
   }, [emitOp]);
   useEffect(function () {
@@ -12193,12 +12224,13 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     return {
       context: context,
       setContext: setContextWithProduce,
+      setScrollContext: setScrollContext,
       settings: mergedSettings,
       handleUndo: handleUndo,
       handleRedo: handleRedo,
       refs: refs
     };
-  }, [context, handleRedo, handleUndo, mergedSettings, refs, setContextWithProduce]);
+  }, [context, handleRedo, handleUndo, mergedSettings, refs, setContextWithProduce, setScrollContext]);
   useEffect(function () {
     if (!_.isEmpty(context.luckysheetfile)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(context.luckysheetfile);

package/dist/index.js

@@ -566,6 +566,7 @@ var defaultRefs = {
 var WorkbookContext = /*#__PURE__*/React__default['default'].createContext({
   context: core.defaultContext(defaultRefs),
   setContext: function setContext() {},
+  setScrollContext: function setScrollContext() {},
   settings: core.defaultSettings,
   handleUndo: function handleUndo() {},
   handleRedo: function handleRedo() {},
@@ -1680,7 +1681,7 @@ var ScrollBar = function ScrollBar(_ref) {
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context,
     refs = _useContext.refs,
-    setContext = _useContext.setContext;
+    setScrollContext = _useContext.setScrollContext;
   var ref = axis === "x" ? refs.scrollbarX : refs.scrollbarY;
   var _useInViewport = ahooks.useInViewport(ref),
     _useInViewport2 = _slicedToArray(_useInViewport, 1),
@@ -1713,11 +1714,11 @@ var ScrollBar = function ScrollBar(_ref) {
     className: "luckysheet-scrollbars luckysheet-scrollbar-ltr luckysheet-scrollbar-".concat(axis),
     onScroll: function onScroll() {
       if (axis === "x") {
-        setContext(function (draftCtx) {
+        setScrollContext(function (draftCtx) {
           draftCtx.scrollLeft = refs.scrollbarX.current.scrollLeft;
         });
       } else {
-        setContext(function (draftCtx) {
+        setScrollContext(function (draftCtx) {
           draftCtx.scrollTop = refs.scrollbarY.current.scrollTop;
         });
       }
@@ -4360,9 +4361,7 @@ var SheetOverlay = function SheetOverlay() {
   }, [setContext, refs.globalCache, refs.cellInput, refs.cellArea, refs.fxInput, refs.canvas]);
   var debounceMouseMove = ahooks.useMemoizedFn(function (e) {
     var nativeEvent = e.nativeEvent;
-    setContext(function (draftCtx) {
-      core.handleCellAreaMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellArea.current);
-    });
+    core.handleCellAreaMouseMove(context, refs.globalCache, nativeEvent, refs.cellArea.current);
   });
   var debounceDragOver = ahooks.useMemoizedFn(function (e) {
     var nativeEvent = e.nativeEvent;
@@ -4432,12 +4431,29 @@ var SheetOverlay = function SheetOverlay() {
       debouncedShowLinkCard(globalCache, rc.r, rc.c, false, true);
     }
   }, [debouncedShowLinkCard]);
+  var lastHoverCellRef = React.useRef(null);
   var onMouseMove = React.useCallback(function (nativeEvent) {
+    var _gc$commentBox, _gc$commentBox2, _gc$searchDialog, _gc$linkCard;
+    var container = containerRef.current;
+    var scrollX = refs.scrollbarX.current;
+    var scrollY = refs.scrollbarY.current;
+    if (!container || !scrollX || !scrollY) return;
+    var gc = refs.globalCache;
+    var isInteracting = !!context.luckysheet_scroll_status || !!context.luckysheet_select_status || !!context.luckysheet_rows_selected_status || !!context.luckysheet_cols_selected_status || !!context.luckysheet_cell_selected_move || !!context.luckysheet_cell_selected_extend || !!context.luckysheet_cols_change_size || !!context.luckysheet_rows_change_size || ((_gc$commentBox = gc.commentBox) === null || _gc$commentBox === void 0 ? void 0 : _gc$commentBox.movingId) != null || ((_gc$commentBox2 = gc.commentBox) === null || _gc$commentBox2 === void 0 ? void 0 : _gc$commentBox2.resizingId) != null || gc.image != null || ((_gc$searchDialog = gc.searchDialog) === null || _gc$searchDialog === void 0 ? void 0 : _gc$searchDialog.moveProps) != null || ((_gc$linkCard = gc.linkCard) === null || _gc$linkCard === void 0 ? void 0 : _gc$linkCard.rangeSelectionModal) != null;
+    if (!isInteracting) {
+      var rc = core.getCellRowColumn(context, nativeEvent, container, scrollX, scrollY);
+      var last = lastHoverCellRef.current;
+      var hoverChanged = rc == null ? last != null : last == null || last.r !== rc.r || last.c !== rc.c;
+      if (!hoverChanged) {
+        return;
+      }
+      lastHoverCellRef.current = rc !== null && rc !== void 0 ? rc : null;
+    }
     setContext(function (draftCtx) {
-      overShowLinkCard(draftCtx, refs.globalCache, nativeEvent, containerRef.current, refs.scrollbarX.current, refs.scrollbarY.current);
-      core.handleOverlayMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, refs.scrollbarX.current, refs.scrollbarY.current, containerRef.current, refs.fxInput.current);
+      overShowLinkCard(draftCtx, refs.globalCache, nativeEvent, container, scrollX, scrollY);
+      core.handleOverlayMouseMove(draftCtx, refs.globalCache, nativeEvent, refs.cellInput.current, scrollX, scrollY, container, refs.fxInput.current);
     });
-  }, [overShowLinkCard, refs.cellInput, refs.fxInput, refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
+  }, [overShowLinkCard, context, refs.cellInput, refs.fxInput, refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
   var onMouseUp = React.useCallback(function (nativeEvent) {
     setContext(function (draftCtx) {
       try {
@@ -5024,9 +5040,7 @@ var Sheet = function Sheet(_ref) {
     return false;
   }
   var onWheel = React.useCallback(function (e) {
-    setContext(function (draftCtx) {
-      core.handleGlobalWheel(draftCtx, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
-    });
+    core.handleGlobalWheel(context, e, refs.globalCache, refs.scrollbarX.current, refs.scrollbarY.current);
     if (e.deltaY === 0 && e.deltaX === 0) {
       return;
     }
@@ -5047,7 +5061,7 @@ var Sheet = function Sheet(_ref) {
         e.preventDefault();
       }
     }
-  }, [refs.globalCache, refs.scrollbarX, refs.scrollbarY, setContext]);
+  }, [context, refs.globalCache, refs.scrollbarX, refs.scrollbarY]);
   React.useEffect(function () {
     var container = containerRef.current;
     container === null || container === void 0 ? void 0 : container.addEventListener("wheel", onWheel);
@@ -12129,60 +12143,77 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
       }
     }
     contextRef.current = result;
-    setContext(result);
+    setContext(function (prev) {
+      if (prev === ctx_) {
+        return result;
+      }
+      var merged = produce.applyPatches(prev, patches);
+      contextRef.current = merged;
+      return merged;
+    });
+  });
+  var setScrollContext = ahooks.useMemoizedFn(function (recipe) {
+    setContext(function (ctx_) {
+      var result = produce__default['default'](ctx_, recipe);
+      if (result === ctx_) {
+        return ctx_;
+      }
+      contextRef.current = result;
+      return result;
+    });
   });
   var handleUndo = React.useCallback(function () {
     var history = globalCache.current.undoList.pop();
     if (history) {
-      var _history$options, _history$options3;
-      var ctx_ = contextRef.current;
-      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;
-        var order = (_history$options$dele = history.options.deletedSheet) === null || _history$options$dele === void 0 ? void 0 : (_history$options$dele2 = _history$options$dele.value) === null || _history$options$dele2 === void 0 ? void 0 : _history$options$dele2.order;
-        var sheetsRight = ctx_.luckysheetfile.filter(function (sheet) {
-          var _history$options2, _history$options2$del;
-          return (sheet === null || sheet === void 0 ? void 0 : sheet.order) >= order && sheet.id !== (history === null || history === void 0 ? void 0 : (_history$options2 = history.options) === null || _history$options2 === void 0 ? void 0 : (_history$options2$del = _history$options2.deleteSheetOp) === null || _history$options2$del === void 0 ? void 0 : _history$options2$del.id);
-        });
-        ___default['default'].forEach(sheetsRight, function (sheet) {
-          history.inversePatches.push({
-            op: "replace",
-            path: ["luckysheetfile", core.getSheetIndex(ctx_, sheet.id), "order"],
-            value: (sheet === null || sheet === void 0 ? void 0 : sheet.order) + 1
+      setContext(function (ctx_) {
+        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;
+          var order = (_history$options$dele = history.options.deletedSheet) === null || _history$options$dele === void 0 ? void 0 : (_history$options$dele2 = _history$options$dele.value) === null || _history$options$dele2 === void 0 ? void 0 : _history$options$dele2.order;
+          var sheetsRight = ctx_.luckysheetfile.filter(function (sheet) {
+            var _history$options2, _history$options2$del;
+            return (sheet === null || sheet === void 0 ? void 0 : sheet.order) >= order && sheet.id !== (history === null || history === void 0 ? void 0 : (_history$options2 = history.options) === null || _history$options2 === void 0 ? void 0 : (_history$options2$del = _history$options2.deleteSheetOp) === null || _history$options2$del === void 0 ? void 0 : _history$options2$del.id);
           });
-        });
-      }
-      var newContext = produce.applyPatches(ctx_, history.inversePatches);
-      globalCache.current.redoList.push(history);
-      var inversedOptions = core.inverseRowColOptions(history.options);
-      if (inversedOptions === null || inversedOptions === void 0 ? void 0 : inversedOptions.insertRowColOp) {
-        inversedOptions.restoreDeletedCells = true;
-      }
-      if ((_history$options3 = history.options) === null || _history$options3 === void 0 ? void 0 : _history$options3.addSheetOp) {
-        var _inversedOptions$addS;
-        var index = core.getSheetIndex(ctx_, history.options.addSheet.id);
-        inversedOptions.addSheet = {
-          id: history.options.addSheet.id,
-          index: index,
-          value: ___default['default'].cloneDeep(ctx_.luckysheetfile[index])
-        };
-        inversedOptions.addSheet.value.celldata = dataToCelldata((_inversedOptions$addS = inversedOptions.addSheet.value) === null || _inversedOptions$addS === void 0 ? void 0 : _inversedOptions$addS.data);
-        delete inversedOptions.addSheet.value.data;
-      }
-      emitOp(newContext, history.inversePatches, inversedOptions, true);
-      contextRef.current = newContext;
-      setContext(newContext);
+          ___default['default'].forEach(sheetsRight, function (sheet) {
+            history.inversePatches.push({
+              op: "replace",
+              path: ["luckysheetfile", core.getSheetIndex(ctx_, sheet.id), "order"],
+              value: (sheet === null || sheet === void 0 ? void 0 : sheet.order) + 1
+            });
+          });
+        }
+        var newContext = produce.applyPatches(ctx_, history.inversePatches);
+        globalCache.current.redoList.push(history);
+        var inversedOptions = core.inverseRowColOptions(history.options);
+        if (inversedOptions === null || inversedOptions === void 0 ? void 0 : inversedOptions.insertRowColOp) {
+          inversedOptions.restoreDeletedCells = true;
+        }
+        if ((_history$options3 = history.options) === null || _history$options3 === void 0 ? void 0 : _history$options3.addSheetOp) {
+          var _inversedOptions$addS;
+          var index = core.getSheetIndex(ctx_, history.options.addSheet.id);
+          inversedOptions.addSheet = {
+            id: history.options.addSheet.id,
+            index: index,
+            value: ___default['default'].cloneDeep(ctx_.luckysheetfile[index])
+          };
+          inversedOptions.addSheet.value.celldata = dataToCelldata((_inversedOptions$addS = inversedOptions.addSheet.value) === null || _inversedOptions$addS === void 0 ? void 0 : _inversedOptions$addS.data);
+          delete inversedOptions.addSheet.value.data;
+        }
+        emitOp(newContext, history.inversePatches, inversedOptions, true);
+        return newContext;
+      });
     }
   }, [emitOp]);
   var handleRedo = React.useCallback(function () {
     var history = globalCache.current.redoList.pop();
     if (history) {
-      var ctx_ = contextRef.current;
-      var newContext = produce.applyPatches(ctx_, history.patches);
-      globalCache.current.undoList.push(history);
-      emitOp(newContext, history.patches, history.options);
-      contextRef.current = newContext;
-      setContext(newContext);
+      setContext(function (ctx_) {
+        var newContext = produce.applyPatches(ctx_, history.patches);
+        globalCache.current.undoList.push(history);
+        emitOp(newContext, history.patches, history.options);
+        return newContext;
+      });
     }
   }, [emitOp]);
   React.useEffect(function () {
@@ -12203,12 +12234,13 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
     return {
       context: context,
       setContext: setContextWithProduce,
+      setScrollContext: setScrollContext,
       settings: mergedSettings,
       handleUndo: handleUndo,
       handleRedo: handleRedo,
       refs: refs
     };
-  }, [context, handleRedo, handleUndo, mergedSettings, refs, setContextWithProduce]);
+  }, [context, handleRedo, handleUndo, mergedSettings, refs, setContextWithProduce, setScrollContext]);
   React.useEffect(function () {
     if (!___default['default'].isEmpty(context.luckysheetfile)) {
       onChange === null || onChange === void 0 ? void 0 : onChange(context.luckysheetfile);