@zhenliang/sheet 0.1.74 → 0.1.76-beta.2

package/dist/core/reducers/sideEffectReducer.js

@@ -35,7 +35,7 @@ export var sideEffectReducer = {
             cell: cell
           }
         });
-        cellChangeHandler && cellChangeHandler([cell]);
+        cellChangeHandler && cellChangeHandler([cell], undefined, 'Edit');
       });
     });
     eventBus.on('cell-create', function (_ref) {
@@ -307,7 +307,7 @@ export var sideEffectReducer = {
                 }
               }
             });
-            cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : []);
+            cellChangeHandler && cellChangeHandler(legalChanges, freePaste ? legalExtChanges : [], 'Paste');
           case 18:
           case "end":
             return _context.stop();
@@ -361,18 +361,19 @@ export var sideEffectReducer = {
     dispatch({
       type: 'changes',
       payload: {
-        history: newHistory
+        history: newHistory,
+        recoverHistory: []
       }
     });
-    cellChangeHandler && cellChangeHandler(changes);
+    cellChangeHandler && cellChangeHandler(changes, undefined, 'Delete');
   },
   reverse: function reverse(dispatch, getState) {
     var _getState10 = getState(),
       start = _getState10.start,
       end = _getState10.end,
       history = _getState10.history,
-      _getState10$recoverHi = _getState10.recoverHisotry,
-      recoverHisotry = _getState10$recoverHi === void 0 ? [] : _getState10$recoverHi,
+      _getState10$recoverHi = _getState10.recoverHistory,
+      recoverHistory = _getState10$recoverHi === void 0 ? [] : _getState10$recoverHi,
       cellChangeHandler = _getState10.cellChangeHandler,
       eventBus = _getState10.eventBus,
       data = _getState10.data;
@@ -386,12 +387,12 @@ export var sideEffectReducer = {
         type: 'changes',
         payload: {
           history: changeHistory,
-          recoverHisotry: [].concat(_toConsumableArray(recoverHisotry), [change])
+          recoverHistory: [].concat(_toConsumableArray(recoverHistory), [change])
         }
       });
       return;
     }
-    cellChangeHandler && cellChangeHandler(change.changes);
+    cellChangeHandler && cellChangeHandler(change.changes, undefined, 'Reverse');
     var recoverChange = _objectSpread(_objectSpread({}, change), {}, {
       changes: change.changes.map(function (item) {
         var _item$row, _item$col;
@@ -410,23 +411,23 @@ export var sideEffectReducer = {
           end: end
         },
         history: changeHistory,
-        recoverHisotry: [].concat(_toConsumableArray(recoverHisotry), [recoverChange])
+        recoverHistory: [].concat(_toConsumableArray(recoverHistory), [recoverChange])
       }
     });
   },
   recover: function recover(dispatch, getState) {
     var _getState11 = getState(),
       eventBus = _getState11.eventBus,
-      _getState11$recoverHi = _getState11.recoverHisotry,
-      recoverHisotry = _getState11$recoverHi === void 0 ? [] : _getState11$recoverHi,
+      _getState11$recoverHi = _getState11.recoverHistory,
+      recoverHistory = _getState11$recoverHi === void 0 ? [] : _getState11$recoverHi,
       _getState11$history = _getState11.history,
       history = _getState11$history === void 0 ? [] : _getState11$history,
       cellChangeHandler = _getState11.cellChangeHandler,
       start = _getState11.start,
       end = _getState11.end,
       data = _getState11.data;
-    if (!(recoverHisotry !== null && recoverHisotry !== void 0 && recoverHisotry.length)) return;
-    var changeHistory = _toConsumableArray(recoverHisotry);
+    if (!(recoverHistory !== null && recoverHistory !== void 0 && recoverHistory.length)) return;
+    var changeHistory = _toConsumableArray(recoverHistory);
     var change = changeHistory.pop();
     var type = change.type;
     if (!['Edit', 'Paste', 'Delete'].includes(type)) {
@@ -434,7 +435,7 @@ export var sideEffectReducer = {
       dispatch({
         type: 'changes',
         payload: {
-          recoverHisotry: changeHistory,
+          recoverHistory: changeHistory,
           history: [].concat(_toConsumableArray(history), [change])
         }
       });
@@ -448,7 +449,7 @@ export var sideEffectReducer = {
         });
       })
     });
-    cellChangeHandler && cellChangeHandler(change.changes);
+    cellChangeHandler && cellChangeHandler(change.changes, undefined, 'Recover');
     dispatch({
       type: 'changes',
       payload: {
@@ -459,7 +460,7 @@ export var sideEffectReducer = {
           end: end
         },
         history: [].concat(_toConsumableArray(history), [reverseChange]),
-        recoverHisotry: changeHistory
+        recoverHistory: changeHistory
       }
     });
   }

package/dist/core/reducers/stateReducer.js

@@ -10,12 +10,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { stripRowIndex } from "../util";
+import { noramlizeSearch, searchInclude, stripRowIndex } from "../util";
 export var searchReducer = {
   changeSearch: function changeSearch(state, payload) {
     var data = state.data;
     var count = 0;
     var searchResultList = [];
+    var normalSearchText = noramlizeSearch(payload);
     payload && (data === null || data === void 0 ? void 0 : data.forEach(function (row, i) {
       return row.forEach(function (item, j) {
         var _item$dataEditor, _item$value;
@@ -24,9 +25,8 @@ export var searchReducer = {
         }
         var formatterValue;
         if (item.searchKey) {
-          var _formatterValue;
           formatterValue = item.searchKey(item.record);
-          if ((_formatterValue = formatterValue) !== null && _formatterValue !== void 0 && _formatterValue.includes(payload)) {
+          if (searchInclude(normalSearchText, formatterValue)) {
             count++;
             searchResultList.push({
               row: i,
@@ -36,9 +36,9 @@ export var searchReducer = {
             });
           }
         } else if ((_item$dataEditor = item.dataEditor) !== null && _item$dataEditor !== void 0 && _item$dataEditor.formatter) {
-          var _item$dataEditor2, _formatterValue2;
+          var _item$dataEditor2;
           formatterValue = (_item$dataEditor2 = item.dataEditor) === null || _item$dataEditor2 === void 0 || (_item$dataEditor2 = _item$dataEditor2.formatter(item.value, item.record)) === null || _item$dataEditor2 === void 0 ? void 0 : _item$dataEditor2.toString();
-          if ((_formatterValue2 = formatterValue) !== null && _formatterValue2 !== void 0 && _formatterValue2.includes(payload)) {
+          if (searchInclude(normalSearchText, formatterValue)) {
             count++;
             searchResultList.push({
               row: i,
@@ -47,7 +47,7 @@ export var searchReducer = {
               formatterValue: formatterValue
             });
           }
-        } else if ((_item$value = item.value) !== null && _item$value !== void 0 && _item$value.toString().includes(payload)) {
+        } else if (searchInclude(normalSearchText, (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.toString())) {
           count++;
           searchResultList.push({
             row: i,
@@ -61,7 +61,8 @@ export var searchReducer = {
       searchText: payload,
       searchTotal: count,
       searchCurrent: -1,
-      searchResultList: searchResultList
+      searchResultList: searchResultList,
+      shouldSearchUpdate: false
     });
   },
   closeSearch: function closeSearch(state) {
@@ -145,11 +146,13 @@ export var stateReducer = _objectSpread({
       return _objectSpread(_objectSpread({}, state), {}, {
         editing: undefined,
         lastEditing: state.editing,
-        history: history
+        history: history,
+        recoverHistory: []
       });
     }
     return _objectSpread(_objectSpread({}, state), {}, {
-      history: history
+      history: history,
+      recoverHistory: []
     });
   },
   popHistory: function popHistory(state) {
@@ -162,8 +165,13 @@ export var stateReducer = _objectSpread({
     });
   },
   pushHistory: function pushHistory(state, payload) {
+    var newRecoverHistory = state.recoverHistory;
+    if (['DeleteRow', 'NewRow'].includes(payload.type)) {
+      newRecoverHistory = [];
+    }
     return _objectSpread(_objectSpread({}, state), {}, {
-      history: [].concat(_toConsumableArray(state.history || []), [payload])
+      history: [].concat(_toConsumableArray(state.history || []), [payload]),
+      recoverHistory: newRecoverHistory
     });
   },
   select: function select(state, payload) {

package/dist/core/sheet/index.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -202,6 +208,16 @@ var Sheet = function Sheet(props) {
         });
         return history !== null && history !== void 0 ? history : [];
       },
+      dropRecover: function dropRecover() {
+        var recoverHistory = state.recoverHistory;
+        dispatch({
+          type: 'changes',
+          payload: {
+            recoverHistory: []
+          }
+        });
+        return recoverHistory !== null && recoverHistory !== void 0 ? recoverHistory : [];
+      },
       call: function call(caller) {
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
@@ -231,6 +247,21 @@ var Sheet = function Sheet(props) {
   useMouseEvent(dispatch, sheetWrapperRef);
   useKeyBoardEvent(dispatch, sheetWrapperRef);
   var menu = useContextMenu(dispatch, sheetWrapperRef, !!ContextMenu, contextMenuRef);
+  var menuCell = useMemo(function () {
+    var _data$cellPosition$ro, _data$cellPosition$ro2, _data$cellPosition$ro3;
+    var cellPosition = menu.cellPosition,
+      showMenu = menu.showMenu;
+    if (!showMenu) {
+      return cellPosition;
+    }
+    var _ref2 = (_data$cellPosition$ro = data === null || data === void 0 || (_data$cellPosition$ro2 = data[cellPosition.row]) === null || _data$cellPosition$ro2 === void 0 ? void 0 : _data$cellPosition$ro2[cellPosition.col - 1 - ((_data$cellPosition$ro3 = data[cellPosition.row][0].col) !== null && _data$cellPosition$ro3 !== void 0 ? _data$cellPosition$ro3 : 0)]) !== null && _data$cellPosition$ro !== void 0 ? _data$cellPosition$ro : {},
+      id = _ref2.id,
+      dataIndex = _ref2.dataIndex;
+    return _objectSpread(_objectSpread({}, cellPosition), {}, {
+      id: id,
+      key: dataIndex
+    });
+  }, [data, menu.cellPosition]);
   var _useRemarkContainer = useRemarkContainer(sheetWrapperRef, state.start, state.editing, showRemark),
     remarkInfo = _useRemarkContainer.remarkInfo;
 
@@ -393,7 +424,7 @@ var Sheet = function Sheet(props) {
           }, "sheet"), /*#__PURE__*/_jsx(Menu, {
             ref: contextMenuRef,
             position: menu.position,
-            cell: menu.cellPosition,
+            cell: menuCell,
             showMenu: menu.showMenu,
             contextMenu: ContextMenu,
             onContextMenu: onContextMenu
@@ -441,6 +472,7 @@ var Sheet = function Sheet(props) {
         current: state.searchCurrent,
         calledCount: state.searchCalledCount,
         open: state.showSearch,
+        shouldUpdate: state.shouldSearchUpdate,
         goNext: goNext,
         goLast: goLast,
         onChange: changeSearch,

package/dist/core/sheet/index.less

@@ -349,16 +349,24 @@ span.harvest-sheet-container:focus {
   }
 }
 
+@keyframes pop{
+  0% {width:0px}
+  100% {width:290px}
+}
+
+
+
 .harvest-search-text {
   position: absolute;
   top: 0px;
   right: 0px;
-  width: 280px;
   z-index: 4;
   font-size: 14px;
   margin: 5px;
+  animation: pop .5s ease;
 }
 
+
 .harvest-search-text .search-text-suffix {
   .search-text-disabled {
     color: #a4a9b2;

package/dist/core/sheet/searchInput.d.ts

@@ -1,6 +1,7 @@
 import { CSSProperties } from 'react';
 interface SearchInputProps {
     open?: boolean;
+    shouldUpdate?: boolean;
     style?: Partial<CSSProperties>;
     value?: string;
     current?: number;

package/dist/core/sheet/searchInput.js

@@ -1,6 +1,7 @@
 import { CloseOutlined, DownOutlined, UpOutlined } from '@ant-design/icons';
 import { Divider, Input } from 'antd';
-import { useEffect, useRef } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
+import { getTextWidth } from "../util";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var SearchInput = function SearchInput(props) {
@@ -12,6 +13,8 @@ export var SearchInput = function SearchInput(props) {
     value = props.value,
     _onChange = props.onChange,
     open = props.open,
+    _props$shouldUpdate = props.shouldUpdate,
+    shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
     onClose = props.onClose,
     goLast = props.goLast,
     goNext = props.goNext,
@@ -23,6 +26,21 @@ export var SearchInput = function SearchInput(props) {
       inputRef.current.focus();
     }
   }, [calledCount]);
+  var inputWidth = useMemo(function () {
+    var otherWidth = 140;
+    var textWidth = 0;
+    if (!value) {
+      textWidth = 150;
+      return otherWidth + textWidth;
+    }
+    textWidth = getTextWidth(value);
+    if (textWidth > 350) {
+      textWidth = 350;
+    } else if (textWidth < 150) {
+      textWidth = 150;
+    }
+    return textWidth + otherWidth;
+  }, [value]);
   if (!open) {
     return null;
   }
@@ -33,14 +51,23 @@ export var SearchInput = function SearchInput(props) {
       ref: inputRef,
       placeholder: "\u67E5\u627E",
       autoFocus: true,
+      onFocus: function onFocus(e) {
+        return e.target.select();
+      },
+      contentEditable: true,
       style: {
-        height: 40
+        height: 40,
+        width: inputWidth,
+        minWidth: 250
       },
       value: value,
       onChange: function onChange(e) {
         return _onChange && _onChange(e.target.value);
       },
       onPressEnter: function onPressEnter(e) {
+        if (shouldUpdate) {
+          _onChange && _onChange(e.target.value);
+        }
         if (e.shiftKey) goLast && goLast();else goNext && goNext();
         setTimeout(function () {
           var _inputRef$current;

package/dist/core/sheet/useKeyBoardEvent.js

@@ -1,6 +1,6 @@
 import { useKeyBoard } from "../..";
 import { sideEffectReducer } from "../reducers/sideEffectReducer";
-import { ensureFocus, getRowHeight } from "../util";
+import { ensureFocus, getRowHeight, isSearchElement } from "../util";
 export var useKeyBoardEvent = function useKeyBoardEvent(dispatch, elementRef) {
   useKeyBoard({
     move: function move(e, value) {
@@ -63,13 +63,20 @@ export var useKeyBoardEvent = function useKeyBoardEvent(dispatch, elementRef) {
         }
       });
     },
-    copy: function copy() {
-      dispatch(sideEffectReducer.copy);
+    copy: function copy(e) {
+      var _elementRef$current2;
+      var isFromSearch = isSearchElement((_elementRef$current2 = elementRef.current) === null || _elementRef$current2 === void 0 ? void 0 : _elementRef$current2.parentElement, e.target);
+      isFromSearch ? null : dispatch(sideEffectReducer.copy);
     },
-    paste: function paste() {
-      dispatch(sideEffectReducer.paste);
+    paste: function paste(e) {
+      var _elementRef$current3;
+      var isFromSearch = isSearchElement((_elementRef$current3 = elementRef.current) === null || _elementRef$current3 === void 0 ? void 0 : _elementRef$current3.parentElement, e.target);
+      isFromSearch ? null : dispatch(sideEffectReducer.paste);
     },
-    cut: function cut() {
+    cut: function cut(e) {
+      var _elementRef$current4;
+      var isFromSearch = isSearchElement((_elementRef$current4 = elementRef.current) === null || _elementRef$current4 === void 0 ? void 0 : _elementRef$current4.parentElement, e.target);
+      if (isFromSearch) return;
       dispatch(sideEffectReducer.copy);
       dispatch(sideEffectReducer.delete);
     },

package/dist/core/sheet/useMouseEvent.js

@@ -1,6 +1,6 @@
 import { useMouse } from "../..";
 import { useCallback, useEffect, useRef } from 'react';
-import { extractDataRowAndCol, findParentTd } from "../util";
+import { extractDataRowAndCol, findParentTd, isSearchElement } from "../util";
 var rowCount = 10; //每秒10行
 var colCount = 5; //每秒5列
 
@@ -267,7 +267,8 @@ export var useMouseEvent = function useMouseEvent(dispatch, elementRef) {
   }, []);
   var loseFocus = useCallback(function (e) {
     var _elementRef$current10, _elementRef$current11;
-    var isSearch = (_elementRef$current10 = elementRef.current) === null || _elementRef$current10 === void 0 || (_elementRef$current10 = _elementRef$current10.parentElement) === null || _elementRef$current10 === void 0 || (_elementRef$current10 = _elementRef$current10.nextSibling) === null || _elementRef$current10 === void 0 ? void 0 : _elementRef$current10.contains(e.target);
+    // todo 加一个root node
+    var isSearch = isSearchElement((_elementRef$current10 = elementRef.current) === null || _elementRef$current10 === void 0 ? void 0 : _elementRef$current10.parentElement, e.target);
     var isTableAControl = (_elementRef$current11 = elementRef.current) === null || _elementRef$current11 === void 0 || (_elementRef$current11 = _elementRef$current11.parentElement) === null || _elementRef$current11 === void 0 ? void 0 : _elementRef$current11.contains(e.target);
     if (!(isTableAControl || isSearch)) {
       dispatch({

package/dist/core/sheet/useSearchInput.js

@@ -48,6 +48,16 @@ export var useSearchInput = function useSearchInput(state, dispatch, handlerRef)
       payload: value
     });
   }, [state.data]);
+  useEffect(function () {
+    if (state.searchText) {
+      dispatch({
+        type: 'changes',
+        payload: {
+          shouldSearchUpdate: true
+        }
+      });
+    }
+  }, [state.data]);
   useEffect(function () {
     var _state$searchResultLi2;
     if (!((_state$searchResultLi2 = state.searchResultList) !== null && _state$searchResultLi2 !== void 0 && _state$searchResultLi2.length)) {

package/dist/core/table/index.js

@@ -140,7 +140,7 @@ var Table = function Table(_ref) {
       setData([[]]);
     }
   }, [dataSource, columns]);
-  var handleChanges = useCallback(function (changes, extChange) {
+  var handleChanges = useCallback(function (changes, extChange, type) {
     if (freeze) return;
     onChange && onChange(changes.map(function (item) {
       return {
@@ -158,7 +158,7 @@ var Table = function Table(_ref) {
         key: item.key || columns[item.col - offset].dataIndex,
         value: item.value
       };
-    }));
+    }), type);
   }, [columns, onChange, hasControl, freeze]);
   var handleReverse = useCallback(function (value) {
     var _ref2 = value,

package/dist/core/util.d.ts

@@ -62,3 +62,7 @@ export declare const stripRowIndex: (data: SheetType.Cell[][]) => {
     endIndex: number;
 };
 export declare const ensureFocus: (container?: HTMLElement | null) => void;
+export declare const isSearchElement: (tableRootNode: HTMLDivElement, target: HTMLElement) => boolean | undefined;
+export declare const noramlizeSearch: (target: string) => string;
+export declare const searchInclude: (search: string, compare: string) => boolean;
+export declare const getTextWidth: (text: any) => number;

package/dist/core/util.js

@@ -495,4 +495,39 @@ export var ensureFocus = function ensureFocus(container) {
     clearInterval(focusInterval);
     focusInterval = undefined;
   }, 1000);
+};
+export var isSearchElement = function isSearchElement(tableRootNode, target) {
+  var _tableRootNode$nextSi;
+  return (_tableRootNode$nextSi = tableRootNode.nextSibling) === null || _tableRootNode$nextSi === void 0 || (_tableRootNode$nextSi = _tableRootNode$nextSi.nextSibling) === null || _tableRootNode$nextSi === void 0 ? void 0 : _tableRootNode$nextSi.contains(target);
+};
+var punctuationMap = new Map([["，", ","], ["：", ":"], ["；", ";"]]);
+export var noramlizeSearch = function noramlizeSearch(target) {
+  if (!target) {
+    return target;
+  }
+  var lower = target.toLowerCase();
+  // 逗号分号
+  punctuationMap.forEach(function (value, key) {
+    lower = lower.replace(new RegExp(key, "g"), value);
+  });
+  return lower;
+};
+export var searchInclude = function searchInclude(search, compare) {
+  if (!compare) {
+    return false;
+  }
+  var normalCompare = noramlizeSearch(compare);
+  return normalCompare.includes(search);
+};
+export var getTextWidth = function getTextWidth(text) {
+  // 创建隐藏的临时元素
+  var tempElement = document.createElement("span");
+  tempElement.style.visibility = "hidden";
+  tempElement.style.whiteSpace = "pre"; // 保持空格和换行的格式
+  tempElement.style.display = "inline-block";
+  tempElement.textContent = text;
+  document.body.appendChild(tempElement);
+  var width = tempElement.offsetWidth;
+  document.body.removeChild(tempElement);
+  return width;
 };

package/dist/example/antComponent.js

@@ -160,19 +160,22 @@ var columns = [{
   width: 200,
   dataIndex: 'address5',
   key: '6'
-}, {
-  title: 'Column 7',
-  width: 200,
-  dataIndex: 'address6',
-  key: '7',
-  fixed: 'right'
-}, {
-  title: 'Column 8',
-  width: 200,
-  dataIndex: 'address7',
-  key: '8',
-  fixed: 'right'
-}, {
+},
+// {
+//   title: 'Column 7',
+//   width: 200,
+//   dataIndex: 'address6',
+//   key: '7',
+//   fixed: 'right',
+// },
+// {
+//   title: 'Column 8',
+//   width: 200,
+//   dataIndex: 'address7',
+//   key: '8',
+//   fixed: 'right',
+// },
+{
   title: 'Action',
   align: SheetType.CellAlign.center,
   key: 'operation',
@@ -218,7 +221,6 @@ var App = function App() {
     setOptions = _useState4[1];
   var sheetInstance = useRef(null);
   var handleChange = useCallback(function (changes, extChange) {
-    // console.log(extChange);
     var newState = cloneDeep(state);
     changes.forEach(function (change) {
       var row = change.row,

package/dist/hooks/useKeyboard.js

@@ -1,6 +1,6 @@
 import { useCallback, useEffect } from 'react';
 import { A_KEY, BACKSPACE_KEY, C_KEY, DELETE_KEY, DOWN_KEY, ENTER_KEY, ESCAPE_KEY, F_KEY, LEFT_KEY, RIGHT_KEY, TAB_KEY, UP_KEY, V_KEY, X_KEY, Y_KEY, Z_KEY } from "../core/config";
-import { isInputKey } from "../core/util";
+import { isInputKey, isSearchElement } from "../core/util";
 var ua = window.navigator.userAgent;
 var isIE = /MSIE|Trident/.test(ua);
 export function move(keyCode, isShiftKey) {
@@ -38,7 +38,8 @@ export function move(keyCode, isShiftKey) {
 }
 export var useKeyBoard = function useKeyBoard(handler, listenElement) {
   var handleKey = useCallback(function (e) {
-    if (e.defaultPrevented) {
+    var isFromSearch = isSearchElement(listenElement === null || listenElement === void 0 ? void 0 : listenElement.parentElement, e.target);
+    if (e.defaultPrevented || isFromSearch) {
       return;
     }
     var ctrlKey = e.ctrlKey,

package/dist/type/sheet.d.ts

@@ -69,8 +69,9 @@ export type CellData = {
     key?: string;
     value?: string;
 };
+export type ChangeType = 'Edit' | 'Paste' | 'Delete' | 'Reverse' | 'Recover';
 export type CellNavigable = (cell?: Cell, row?: number, col?: number) => boolean;
-export type CellChangeHandler = (cells: CellData[], additions?: CellData[]) => void;
+export type CellChangeHandler = (cells: CellData[], additions: CellData[] | undefined, type: ChangeType) => void;
 export type RowGroup = {
     groupName: string;
     groupStart: number;
@@ -90,7 +91,7 @@ export type MenuRenderProps = {
         top: number;
         left: number;
     };
-    cell?: CellPosition;
+    cell?: CellPosition & Partial<Cell>;
     onContextMenu?: (event: any) => void;
     children?: ReactNode | ReactNode[];
     target?: any;
@@ -195,6 +196,7 @@ export type CellProps = {
 };
 export type SearchState = {
     showSearch: boolean;
+    shouldSearchUpdate: boolean;
     searchText: string;
     searchTotal: number;
     searchCurrent: number;
@@ -212,7 +214,7 @@ export type UpdateStateType = {
         value?: string;
     };
     history: OperateHistory[];
-    recoverHisotry: OperateHistory[];
+    recoverHistory: OperateHistory[];
     freePaste?: boolean;
     data: Cell[][];
     mouseDown: boolean;
@@ -233,7 +235,7 @@ export type UpdateStateType = {
     lastEditing: CellPosition & {
         confirm?: boolean;
     };
-    cellChangeHandler: (cells: CellData[], additions?: CellData[]) => void;
+    cellChangeHandler: (cells: CellData[], additions: CellData[] | undefined, type: ChangeType) => void;
     fixedInfo: SheetType.FixedInfo[];
 } & SearchState;
 export type UpdateFocus = (start: CellPosition, end: CellPosition) => void;

package/dist/type/sheetTable.d.ts

@@ -1,5 +1,6 @@
 import { CSSProperties, ReactNode } from 'react';
 import { SheetType } from '.';
+import { ChangeType } from './sheet';
 export type refAssertion = {
     contains?: (target: EventTarget | null) => boolean;
     focus?: () => boolean;
@@ -100,7 +101,7 @@ export type TableProps = {
     groupConfig?: TableGroupConfig;
     menuRenderer?: React.FC<SheetType.MenuRenderProps>;
     onContextMenu?: (event: any) => void;
-    onChange: (changes: TableChange[], extChanges?: TableChange[]) => void;
+    onChange: (changes: TableChange[], extChanges: TableChange[] | undefined, type: ChangeType) => void;
     handleAdd?: () => void;
     handleBatchAdd?: (value: number) => void;
     eventHandler?: Record<'reverse' | 'btn-click' | 'cell-edit' | 'cell-switch' | string, undefined | EventHandler>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhenliang/sheet",
-  "version": "0.1.74",
+  "version": "0.1.76-beta.2",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -85,4 +85,4 @@
     "fizz.zhou@ap.jll.com"
   ],
   "preid": "beta"
-}
+}