@leankylin-sheet/react 1.2.9 → 1.2.11

package/dist/components/SearchReplace/index.d.ts

@@ -1,6 +1,4 @@
 import React from "react";
 import "./index.css";
-declare const SearchReplace: React.FC<{
-    getContainer: () => HTMLDivElement;
-}>;
+declare const SearchReplace: React.FC<{}>;
 export default SearchReplace;

package/dist/index.esm.js

@@ -2,6 +2,7 @@ import { defaultContext, defaultSettings, getSheetIndex, colLocationByIndex, fix
 import React, { useContext, useRef, useState, useMemo, useCallback, useEffect, useLayoutEffect, useImperativeHandle } from 'react';
 import produce, { applyPatches, enablePatches, produceWithPatches } from 'immer';
 import _ from 'lodash';
+import { createPortal } from 'react-dom';
 
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
@@ -1144,8 +1145,7 @@ function useAlert() {
   };
 }
 
-var SearchReplace = function SearchReplace(_ref) {
-  var getContainer = _ref.getContainer;
+var SearchReplace = function SearchReplace() {
   var _useContext = useContext(WorkbookContext),
     context = _useContext.context,
     setContext = _useContext.setContext,
@@ -1202,10 +1202,11 @@ var SearchReplace = function SearchReplace(_ref) {
       top: (rect.height - 200) / 3
     };
   }, []);
-  return /*#__PURE__*/React.createElement("div", {
+  var body = document.body;
+  return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
     id: "leankylin-search-replace",
     className: "leankylin-search-replace leankylin-dialog",
-    style: getInitialPosition(getContainer()),
+    style: getInitialPosition(body),
     onMouseEnter: function onMouseEnter() {
       _.set(refs.globalCache, "searchDialog.mouseEnter", true);
     },
@@ -1214,7 +1215,7 @@ var SearchReplace = function SearchReplace(_ref) {
     },
     onMouseDown: function onMouseDown(e) {
       var nativeEvent = e.nativeEvent;
-      onSearchDialogMoveStart(refs.globalCache, nativeEvent, getContainer());
+      onSearchDialogMoveStart(refs.globalCache, nativeEvent, body);
       e.stopPropagation();
     }
   }, /*#__PURE__*/React.createElement("div", {
@@ -1351,7 +1352,10 @@ var SearchReplace = function SearchReplace(_ref) {
     className: "close-button leankylin-message-box-button button-default",
     onClick: closeDialog
   }, button.close), searchResult.length > 0 && ( /*#__PURE__*/React.createElement("div", {
-    id: "searchAllbox"
+    id: "searchAllbox",
+    onScroll: function onScroll(e) {
+      return e.stopPropagation();
+    }
   }, /*#__PURE__*/React.createElement("div", {
     className: "boxTitle"
   }, /*#__PURE__*/React.createElement("span", null, findAndReplace.searchTargetSheet), /*#__PURE__*/React.createElement("span", null, findAndReplace.searchTargetCell), /*#__PURE__*/React.createElement("span", null, findAndReplace.searchTargetValue)), /*#__PURE__*/React.createElement("div", {
@@ -1377,7 +1381,7 @@ var SearchReplace = function SearchReplace(_ref) {
         });
       }
     }, /*#__PURE__*/React.createElement("span", null, v.sheetName), /*#__PURE__*/React.createElement("span", null, v.cellPosition), /*#__PURE__*/React.createElement("span", null, v.value));
-  }))))));
+  })))))), body);
 };
 
 var LinkEditCard = function LinkEditCard(_ref) {
@@ -3311,11 +3315,7 @@ var SheetOverlay = function SheetOverlay() {
       width: context.rowHeaderWidth - 1.5,
       height: context.columnHeaderHeight - 1.5
     }
-  }), /*#__PURE__*/React.createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && ( /*#__PURE__*/React.createElement(SearchReplace, {
-    getContainer: function getContainer() {
-      return containerRef.current;
-    }
-  })), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && /*#__PURE__*/React.createElement(SearchReplace, null), /*#__PURE__*/React.createElement("div", {
     className: "leankylin-row-body"
   }, /*#__PURE__*/React.createElement(RowHeader, null), /*#__PURE__*/React.createElement(ScrollBar, {
     axis: "x"
@@ -10683,6 +10683,9 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, [context.currentSheetId, context.luckysheetfile.length, originalData, mergedSettings.defaultRowHeight, mergedSettings.defaultColWidth, mergedSettings.column, mergedSettings.row, mergedSettings.defaultFontSize, mergedSettings.devicePixelRatio, mergedSettings.lang, mergedSettings.allowEdit, mergedSettings.hooks, mergedSettings.generateSheetId, setContextWithProduce, initSheetData, mergedSettings.rowHeaderWidth, mergedSettings.columnHeaderHeight, mergedSettings.addRows]);
   var onKeyDown = useCallback(function (e) {
     var nativeEvent = e.nativeEvent;
+    if ((e.ctrlKey || e.metaKey) && mergedSettings.disabledKeyboardCodes.includes(e.code)) {
+      return;
+    }
     if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ") {
       if (e.shiftKey) {
         handleRedo();
@@ -10701,7 +10704,7 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
     setContextWithProduce(function (draftCtx) {
       handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
     });
-  }, [handleRedo, handleUndo, setContextWithProduce]);
+  }, [handleRedo, handleUndo, setContextWithProduce, mergedSettings.disabledKeyboardCodes]);
   var onPaste = useCallback(function (e) {
     var _document$activeEleme;
     if (cellInput.current === document.activeElement || ((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.className) === "leankylin-sheet-overlay") {
@@ -10712,25 +10715,6 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
       var txtdata = clipboardData.getData("text/html") || clipboardData.getData("text/plain");
       var ele = document.createElement("div");
       ele.innerHTML = txtdata;
-      var trList = ele.querySelectorAll("table tr");
-      var maxRow = trList.length + context.luckysheet_select_save[0].row[0];
-      var rowToBeAdded = maxRow - context.luckysheetfile[getSheetIndex(context, context.currentSheetId)].data.length;
-      var range = context.luckysheet_select_save;
-      if (rowToBeAdded > 0) {
-        var insertRowColOp = {
-          type: "row",
-          index: context.luckysheetfile[getSheetIndex(context, context.currentSheetId)].data.length - 1,
-          count: rowToBeAdded,
-          direction: "rightbottom",
-          id: context.currentSheetId
-        };
-        setContextWithProduce(function (draftCtx) {
-          insertRowCol(draftCtx, insertRowColOp);
-          draftCtx.luckysheet_select_save = range;
-        }, {
-          insertRowColOp: insertRowColOp
-        });
-      }
       setContextWithProduce(function (draftCtx) {
         try {
           handlePaste(draftCtx, e);

package/dist/index.js

@@ -6,6 +6,7 @@ var core = require('@leankylin-sheet/core');
 var React = require('react');
 var produce = require('immer');
 var _ = require('lodash');
+var reactDom = require('react-dom');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1154,8 +1155,7 @@ function useAlert() {
   };
 }
 
-var SearchReplace = function SearchReplace(_ref) {
-  var getContainer = _ref.getContainer;
+var SearchReplace = function SearchReplace() {
   var _useContext = React.useContext(WorkbookContext),
     context = _useContext.context,
     setContext = _useContext.setContext,
@@ -1212,10 +1212,11 @@ var SearchReplace = function SearchReplace(_ref) {
       top: (rect.height - 200) / 3
     };
   }, []);
-  return /*#__PURE__*/React__default['default'].createElement("div", {
+  var body = document.body;
+  return /*#__PURE__*/reactDom.createPortal( /*#__PURE__*/React__default['default'].createElement("div", {
     id: "leankylin-search-replace",
     className: "leankylin-search-replace leankylin-dialog",
-    style: getInitialPosition(getContainer()),
+    style: getInitialPosition(body),
     onMouseEnter: function onMouseEnter() {
       ___default['default'].set(refs.globalCache, "searchDialog.mouseEnter", true);
     },
@@ -1224,7 +1225,7 @@ var SearchReplace = function SearchReplace(_ref) {
     },
     onMouseDown: function onMouseDown(e) {
       var nativeEvent = e.nativeEvent;
-      core.onSearchDialogMoveStart(refs.globalCache, nativeEvent, getContainer());
+      core.onSearchDialogMoveStart(refs.globalCache, nativeEvent, body);
       e.stopPropagation();
     }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -1361,7 +1362,10 @@ var SearchReplace = function SearchReplace(_ref) {
     className: "close-button leankylin-message-box-button button-default",
     onClick: closeDialog
   }, button.close), searchResult.length > 0 && ( /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "searchAllbox"
+    id: "searchAllbox",
+    onScroll: function onScroll(e) {
+      return e.stopPropagation();
+    }
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "boxTitle"
   }, /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchTargetSheet), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchTargetCell), /*#__PURE__*/React__default['default'].createElement("span", null, findAndReplace.searchTargetValue)), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -1387,7 +1391,7 @@ var SearchReplace = function SearchReplace(_ref) {
         });
       }
     }, /*#__PURE__*/React__default['default'].createElement("span", null, v.sheetName), /*#__PURE__*/React__default['default'].createElement("span", null, v.cellPosition), /*#__PURE__*/React__default['default'].createElement("span", null, v.value));
-  }))))));
+  })))))), body);
 };
 
 var LinkEditCard = function LinkEditCard(_ref) {
@@ -3321,11 +3325,7 @@ var SheetOverlay = function SheetOverlay() {
       width: context.rowHeaderWidth - 1.5,
       height: context.columnHeaderHeight - 1.5
     }
-  }), /*#__PURE__*/React__default['default'].createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && ( /*#__PURE__*/React__default['default'].createElement(SearchReplace, {
-    getContainer: function getContainer() {
-      return containerRef.current;
-    }
-  })), /*#__PURE__*/React__default['default'].createElement("div", {
+  }), /*#__PURE__*/React__default['default'].createElement(ColumnHeader, null)), (context.showSearch || context.showReplace) && /*#__PURE__*/React__default['default'].createElement(SearchReplace, null), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "leankylin-row-body"
   }, /*#__PURE__*/React__default['default'].createElement(RowHeader, null), /*#__PURE__*/React__default['default'].createElement(ScrollBar, {
     axis: "x"
@@ -10693,6 +10693,9 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
   }, [context.currentSheetId, context.luckysheetfile.length, originalData, mergedSettings.defaultRowHeight, mergedSettings.defaultColWidth, mergedSettings.column, mergedSettings.row, mergedSettings.defaultFontSize, mergedSettings.devicePixelRatio, mergedSettings.lang, mergedSettings.allowEdit, mergedSettings.hooks, mergedSettings.generateSheetId, setContextWithProduce, initSheetData, mergedSettings.rowHeaderWidth, mergedSettings.columnHeaderHeight, mergedSettings.addRows]);
   var onKeyDown = React.useCallback(function (e) {
     var nativeEvent = e.nativeEvent;
+    if ((e.ctrlKey || e.metaKey) && mergedSettings.disabledKeyboardCodes.includes(e.code)) {
+      return;
+    }
     if ((e.ctrlKey || e.metaKey) && e.code === "KeyZ") {
       if (e.shiftKey) {
         handleRedo();
@@ -10711,7 +10714,7 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
     setContextWithProduce(function (draftCtx) {
       core.handleGlobalKeyDown(draftCtx, cellInput.current, fxInput.current, nativeEvent, globalCache.current, handleUndo, handleRedo, canvas.current.getContext("2d"));
     });
-  }, [handleRedo, handleUndo, setContextWithProduce]);
+  }, [handleRedo, handleUndo, setContextWithProduce, mergedSettings.disabledKeyboardCodes]);
   var onPaste = React.useCallback(function (e) {
     var _document$activeEleme;
     if (cellInput.current === document.activeElement || ((_document$activeEleme = document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.className) === "leankylin-sheet-overlay") {
@@ -10722,25 +10725,6 @@ var Workbook = /*#__PURE__*/React__default['default'].forwardRef(function (_ref,
       var txtdata = clipboardData.getData("text/html") || clipboardData.getData("text/plain");
       var ele = document.createElement("div");
       ele.innerHTML = txtdata;
-      var trList = ele.querySelectorAll("table tr");
-      var maxRow = trList.length + context.luckysheet_select_save[0].row[0];
-      var rowToBeAdded = maxRow - context.luckysheetfile[core.getSheetIndex(context, context.currentSheetId)].data.length;
-      var range = context.luckysheet_select_save;
-      if (rowToBeAdded > 0) {
-        var insertRowColOp = {
-          type: "row",
-          index: context.luckysheetfile[core.getSheetIndex(context, context.currentSheetId)].data.length - 1,
-          count: rowToBeAdded,
-          direction: "rightbottom",
-          id: context.currentSheetId
-        };
-        setContextWithProduce(function (draftCtx) {
-          core.insertRowCol(draftCtx, insertRowColOp);
-          draftCtx.luckysheet_select_save = range;
-        }, {
-          insertRowColOp: insertRowColOp
-        });
-      }
       setContextWithProduce(function (draftCtx) {
         try {
           core.handlePaste(draftCtx, e);