remove event listener + cancel animation frame in handler

streamich · Mar 25, 2019 · 81cf157 · 81cf157
1 parent 8e2f342
commit 81cf157
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/useMouse.ts b/src/useMouse.ts
@@ -26,6 +26,7 @@ const useMouse = (ref: RefObject<HTMLElement>): State => {
 
   useEffect(() => {
     const handler = (event: MouseEvent) => {
+      cancelAnimationFrame(frame.current)
       frame.current = requestAnimationFrame(() => {
         if (ref && ref.current) {
           const {left, top} = ref.current.getBoundingClientRect()
@@ -49,11 +50,8 @@ const useMouse = (ref: RefObject<HTMLElement>): State => {
     document.addEventListener('mousemove', handler);
 
     return () => {
-      if (frame.current) {
-        cancelAnimationFrame(frame.current);
-      }
-
-      document.addEventListener('mousemove', handler);
+      cancelAnimationFrame(frame.current);
+      document.removeEventListener('mousemove', handler);
     };
   }, []);