fix: options at removeEventListener

juliencrn · Nov 21, 2024 · c77ba5f · c77ba5f
1 parent 5026898
commit c77ba5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/packages/usehooks-ts/src/useEventListener/useEventListener.test.ts b/packages/usehooks-ts/src/useEventListener/useEventListener.test.ts
@@ -65,6 +65,7 @@ describe('useEventListener()', () => {
     expect(windowRemoveEventListenerSpy).toHaveBeenCalledWith(
       eventName,
       expect.any(Function),
+      options,
     )
   })
 
@@ -90,16 +91,17 @@ describe('useEventListener()', () => {
     expect(refRemoveEventListenerSpy).toHaveBeenCalledWith(
       eventName,
       expect.any(Function),
+      options,
     )
   })
 
   it('should bind/unbind the event listener to the document when document is provided', () => {
     const eventName = 'test-event'
-    const listener = vitest.fn()
+    const handler = vitest.fn()
     const options = undefined
 
     const { unmount } = renderHook(() => {
-      useEventListener(eventName, listener, { element: docRef, options })
+      useEventListener(eventName, handler, { element: docRef, options })
     })
 
     expect(docAddEventListenerSpy).toHaveBeenCalledTimes(1)
@@ -115,6 +117,7 @@ describe('useEventListener()', () => {
     expect(docRemoveEventListenerSpy).toHaveBeenCalledWith(
       eventName,
       expect.any(Function),
+      options,
     )
   })
 

diff --git a/packages/usehooks-ts/src/useEventListener/useEventListener.ts b/packages/usehooks-ts/src/useEventListener/useEventListener.ts
@@ -92,11 +92,7 @@ function useEventListener<
 
   useEffect(() => {
     // Define the listening target
-    const targetElement: E | Window = config.element
-      ? 'current' in config.element
-        ? config.element.current ?? window
-        : config.element
-      : window
+    const targetElement: E | Window = config.element ? 'current' in config.element ? config.element.current ?? window : config.element : window
 
     if (!targetElement) return