Fix trouble combining keyup event, key name and modificator "once"

alpinejs · Mar 5, 2022 · 88691ed · 88691ed
1 parent ca6ae29
commit 88691ed
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/alpinejs/src/utils/on.js b/packages/alpinejs/src/utils/on.js
@@ -38,6 +38,14 @@ export default function on (el, event, modifiers, callback) {
         })
     }
 
+    if (modifiers.includes('once')) {
+        handler = wrapHandler(handler, (next, e) => {
+            next(e)
+
+            listenerTarget.removeEventListener(event, handler, options)
+        })
+    }
+
     // Handle :keydown and :keyup listeners.
     handler = wrapHandler(handler, (next, e) => {
         if (isKeyEvent(event)) {
@@ -63,14 +71,6 @@ export default function on (el, event, modifiers, callback) {
         handler = throttle(handler, wait)
     }
 
-    if (modifiers.includes('once')) {
-        handler = wrapHandler(handler, (next, e) => {
-            next(e)
-
-            listenerTarget.removeEventListener(event, handler, options)
-        })
-    }
-
     listenerTarget.addEventListener(event, handler, options)
 
     return () => {