fix: fix unbind method issue. #470

jaywcjlove · Jan 14, 2024 · bb1046c · bb1046c
1 parent 7f389ce
commit bb1046c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/dist/hotkeys.common.js b/dist/hotkeys.common.js
@@ -285,7 +285,10 @@ function clearModifier(event) {
 function unbind(keysInfo) {
   // unbind(), unbind all keys
   if (typeof keysInfo === 'undefined') {
-    Object.keys(_handlers).forEach(key => delete _handlers[key]);
+    Object.keys(_handlers).forEach(key => {
+      Array.isArray(_handlers[key]) && _handlers[key].forEach(info => eachUnbind(info));
+      delete _handlers[key];
+    });
     removeKeyEvent(null);
   } else if (Array.isArray(keysInfo)) {
     // support like : unbind([{key: 'ctrl+a', scope: 's1'}, {key: 'ctrl-a', scope: 's2', splitKey: '-'}])

diff --git a/dist/hotkeys.common.min.js b/dist/hotkeys.common.min.js
diff --git a/dist/hotkeys.esm.js b/dist/hotkeys.esm.js
@@ -283,7 +283,10 @@ function clearModifier(event) {
 function unbind(keysInfo) {
   // unbind(), unbind all keys
   if (typeof keysInfo === 'undefined') {
-    Object.keys(_handlers).forEach(key => delete _handlers[key]);
+    Object.keys(_handlers).forEach(key => {
+      Array.isArray(_handlers[key]) && _handlers[key].forEach(info => eachUnbind(info));
+      delete _handlers[key];
+    });
     removeKeyEvent(null);
   } else if (Array.isArray(keysInfo)) {
     // support like : unbind([{key: 'ctrl+a', scope: 's1'}, {key: 'ctrl-a', scope: 's2', splitKey: '-'}])

diff --git a/dist/hotkeys.js b/dist/hotkeys.js
@@ -289,7 +289,10 @@
   function unbind(keysInfo) {
     // unbind(), unbind all keys
     if (typeof keysInfo === 'undefined') {
-      Object.keys(_handlers).forEach(key => delete _handlers[key]);
+      Object.keys(_handlers).forEach(key => {
+        Array.isArray(_handlers[key]) && _handlers[key].forEach(info => eachUnbind(info));
+        delete _handlers[key];
+      });
       removeKeyEvent(null);
     } else if (Array.isArray(keysInfo)) {
       // support like : unbind([{key: 'ctrl+a', scope: 's1'}, {key: 'ctrl-a', scope: 's2', splitKey: '-'}])