@zhenliang/sheet 0.1.74 → 0.1.75

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/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/package.json

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