@zhenliang/sheet 0.1.74 → 0.1.76

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();
@@ -364,7 +364,7 @@ export var sideEffectReducer = {
         history: newHistory
       }
     });
-    cellChangeHandler && cellChangeHandler(changes);
+    cellChangeHandler && cellChangeHandler(changes, undefined, 'Delete');
   },
   reverse: function reverse(dispatch, getState) {
     var _getState10 = getState(),
@@ -391,7 +391,7 @@ export var sideEffectReducer = {
       });
       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;
@@ -448,7 +448,7 @@ export var sideEffectReducer = {
         });
       })
     });
-    cellChangeHandler && cellChangeHandler(change.changes);
+    cellChangeHandler && cellChangeHandler(change.changes, undefined, 'Recover');
     dispatch({
       type: 'changes',
       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); }
@@ -231,6 +237,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 +414,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

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/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,4 @@ 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;

package/dist/core/util.js

@@ -495,4 +495,8 @@ 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);
 };

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;
@@ -233,7 +234,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",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -85,4 +85,4 @@
     "fizz.zhou@ap.jll.com"
   ],
   "preid": "beta"
-}
+}