fix: useHotkeyListener not work under mac

orca-team · Jul 26, 2023 · a52acbd · a52acbd · vercel · Jul 26, 2023
1 parent 6f9ce73
commit a52acbd
Show file tree

Hide file tree

Showing 15 changed files with 81 additions and 30 deletions.
diff --git a/packages/antd-plus/CHANGELOG.md b/packages/antd-plus/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @orca-fe/painter
 
+## 0.1.9
+
+### Patch Changes
+
+- update dependencies
+- Updated dependencies
+  - @orca-fe/pocket@3.1.8
+
 ## 0.1.8
 
 ### Patch Changes

diff --git a/packages/antd-plus/package.json b/packages/antd-plus/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/antd-plus",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "Transformer Container",
   "keywords": [
     "react",
@@ -36,9 +36,9 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.8.5",
+    "@orca-fe/hooks": "^1.8.6",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/pocket": "^3.1.7",
+    "@orca-fe/pocket": "^3.1.8",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @orca-fe/hooks
 
+## 1.8.6
+
+### Patch Changes
+
+- fix: useHotkeyListener not work under mac
+
 ## 1.8.5
 
 ### Patch Changes

diff --git a/packages/hooks/package.json b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/hooks",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "description": "React Hooks Collections",
   "keywords": [
     "react",

diff --git a/packages/hooks/src/hotkey-manager/utils.ts b/packages/hooks/src/hotkey-manager/utils.ts
@@ -42,12 +42,12 @@ export function toHotkeyStr(event: React.KeyboardEvent | KeyboardEvent) {
     if (metaKey) {
       keyArr.push('Command');
     }
-    if (shiftKey) {
-      keyArr.push('Shift');
-    }
     if (ctrlKey) {
       keyArr.push('Ctrl');
     }
+    if (shiftKey) {
+      keyArr.push('Shift');
+    }
     if (/^[a-z]$/.test(key)) {
       keyArr.push(key.toUpperCase());
     } else {
@@ -69,7 +69,7 @@ export function toHotkeyStr(event: React.KeyboardEvent | KeyboardEvent) {
       keyArr.push(key);
     }
   }
-  return keyArr.join('+');
+  return formatHotKeyStr(keyArr.join('+'));
 }
 
 export function divOnlyFilter(e: KeyboardEvent) {

diff --git a/packages/hooks/src/useHotkeyListener.ts b/packages/hooks/src/useHotkeyListener.ts
@@ -48,9 +48,15 @@ export const actionStack: HotkeyActionType[] = [];
 
 const handleKeyDown = (e: KeyboardEvent) => {
   const hotkeyStr = toHotkeyStr(e);
+  if (!hotkeyStr) return;
   const keyMapping = isMac() ? mapping.macHotkeyMapping : mapping.hotkeyMapping;
   const hotkeyName = keyMapping.get(hotkeyStr);
 
+  if (window.sessionStorage.useHotkeyListenerDebug) {
+    console.warn('hotkeyStr', hotkeyStr);
+    console.warn('hotkeyName', hotkeyName);
+  }
+
   // 在监听器中查找 action
   for (const action of actionStack) {
     // 禁用的监听器，跳过

diff --git a/packages/painter/CHANGELOG.md b/packages/painter/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @orca-fe/painter
 
+## 1.4.33
+
+### Patch Changes
+
+- update dependencies
+- Updated dependencies
+  - @orca-fe/transformer@0.3.21
+  - @orca-fe/pocket@3.1.8
+
 ## 1.4.32
 
 ### Patch Changes

diff --git a/packages/painter/package.json b/packages/painter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/painter",
-  "version": "1.4.32",
+  "version": "1.4.33",
   "description": "Konva Painter",
   "keywords": [
     "react",
@@ -37,17 +37,17 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.8.5",
+    "@orca-fe/hooks": "^1.8.6",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/pocket": "^3.1.7",
+    "@orca-fe/pocket": "^3.1.8",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",
     "classnames": "^2.3.2",
     "color": "^4.2.3",
     "react-colorful": "^5.6.1",
     "tslib": "^2.6.0",
-    "@orca-fe/transformer": "^0.3.20"
+    "@orca-fe/transformer": "^0.3.21"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",

diff --git a/packages/pdf-viewer/CHANGELOG.md b/packages/pdf-viewer/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @orca-fe/pdf-viewer
 
+## 1.16.12
+
+### Patch Changes
+
+- update dependencies
+- Updated dependencies
+  - @orca-fe/painter@1.4.33
+  - @orca-fe/pocket@3.1.8
+
 ## 1.16.11
 
 ### Patch Changes

diff --git a/packages/pdf-viewer/package.json b/packages/pdf-viewer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/pdf-viewer",
-  "version": "1.16.11",
+  "version": "1.16.12",
   "description": "PDF Viewer",
   "keywords": [
     "react",
@@ -38,11 +38,11 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.8.5",
+    "@orca-fe/hooks": "^1.8.6",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
-    "@orca-fe/painter": "^1.4.32",
+    "@orca-fe/painter": "^1.4.33",
     "@orca-fe/pdfjs-dist-browserify": "^3.8.24",
-    "@orca-fe/pocket": "^3.1.7",
+    "@orca-fe/pocket": "^3.1.8",
     "@orca-fe/simple-jss": "^0.0.3",
     "@orca-fe/tools": "^0.10.0",
     "ahooks": "^3.7.8",

diff --git a/packages/pocket/CHANGELOG.md b/packages/pocket/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @orca-fe/pocket
 
+## 3.1.8
+
+### Patch Changes
+
+- update dependencies
+
 ## 3.1.7
 
 ### Patch Changes

diff --git a/packages/pocket/package.json b/packages/pocket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/pocket",
-  "version": "3.1.7",
+  "version": "3.1.8",
   "description": "UI components by orca-team",
   "keywords": [
     "react",
@@ -39,7 +39,7 @@
     "clear": "rimraf lib es"
   },
   "dependencies": {
-    "@orca-fe/hooks": "^1.8.5",
+    "@orca-fe/hooks": "^1.8.6",
     "@orca-fe/jss-plugin-auto-prefix": "^0.0.1",
     "@orca-fe/tools": "^0.10.0",
     "@rc-component/trigger": "^1.13.3",

diff --git a/packages/transformer/CHANGELOG.md b/packages/transformer/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @orca-fe/painter
 
+## 0.3.21
+
+### Patch Changes
+
+- update dependencies
+
 ## 0.3.20
 
 ### Patch Changes

diff --git a/packages/transformer/package.json b/packages/transformer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@orca-fe/transformer",
-  "version": "0.3.20",
+  "version": "0.3.21",
   "description": "Transformer Container",
   "keywords": [
     "react",
@@ -42,7 +42,7 @@
     "gl-matrix": "^3.4.3",
     "prefix-classnames": "^0.0.7",
     "tslib": "^2.6.0",
-    "@orca-fe/hooks": "^1.8.5",
+    "@orca-fe/hooks": "^1.8.6",
     "@orca-fe/tools": "^0.10.0"
   },
   "peerDependencies": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml