properly wrap the actual event handler in the tap function

ndelvalle · Aug 29, 2019 · c8e2acc · c8e2acc
1 parent 3b7c57f
commit c8e2acc
Showing 1 changed file with 13 additions and 11 deletions.
diff --git a/lib/v-click-outside.js b/lib/v-click-outside.js
@@ -38,19 +38,21 @@ function onEvent({ el, event, handler, middleware }) {
 }
 
 function createInstance({ el, events, handler, middleware }) {
-  const instance = {
+  return {
     el,
-    eventHandlers: events.map((eventName) => ({
-      event: eventName,
-      handler: (event) => onEvent({ event, el, handler, middleware }),
-    })),
+    eventHandlers: events.map((eventName) => {
+      const eventHandler = {
+        event: eventName,
+        handler: (event) => onEvent({ event, el, handler, middleware }),
+      }
+
+      if (IS_TOUCH) {
+        eventHandler.handler = tap(eventHandler.handler)
+      }
+
+      return eventHandler
+    }),
   }
-
-  if (IS_TOUCH) {
-    instance.eventHandlers.handler = tap(handler)
-  }
-
-  return instance
 }
 
 function removeInstance(el) {