feat: macos 支持 command w 关闭窗口

ayangweb · Aug 7, 2024 · 11a5476 · 11a5476
1 parent ffaf775
commit 11a5476
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -58,13 58,7 @@ const App = () => {
  open(href);
  });
 
- useEventListener("keydown", (event) => {
- if (event.code === "Escape") {
- event.preventDefault();
-
- hideWindow();
- }
- });
  useOSKeyPress(["esc", "meta.w"], hideWindow);
 
  return (
  <ConfigProvider

diff --git a/src/hooks/useOSKeyPress.ts b/src/hooks/useOSKeyPress.ts
@@ -0,0 1,19 @@
 export const useOSKeyPress: typeof useKeyPress = (
  keyFilter,
  handler,
  option,
 ) => {
  useKeyPress(
  keyFilter,
  (event, key) => {
  const { metaKey, ctrlKey } = event;
 
  if ((metaKey && !isMac()) || (ctrlKey && isMac())) return;
 
  event.preventDefault();
 
  handler(event, key);
  },
  option,
  );
 };
diff --git a/src/pages/Clipboard/History/components/Search/index.tsx b/src/pages/Clipboard/History/components/Search/index.tsx
@@ -44,9 44,7 @@ const Search: FC<InputProps> = (props) => {
  },
  );
 
- useKeyPress(["meta.f", "ctrl.f"], (event) => {
- event.preventDefault();
-
  useOSKeyPress(["meta.f", "ctrl.f"], () => {
  inputRef.current?.focus();
  });