fix: 🐛 make sure all paths in usePageLeave return

streamich · Mar 27, 2019 · 6655092 · 6655092
1 parent 33ac91b
commit 6655092
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/usePageLeave.ts b/src/usePageLeave.ts
@@ -2,18 +2,18 @@ import {useEffect} from 'react';
 
 const usePageLeave = (onPageLeave, args = []) => {
   useEffect(() => {
-    if (onPageLeave) {
-      const handler = (event) => {
-        event = event ? event : (window.event as any);
-        const from = event.relatedTarget || event.toElement;
-        if (!from || (from as any).nodeName === 'HTML') onPageLeave();
-      };
+    if (!onPageLeave) return;
 
-      document.addEventListener('mouseout', handler);
-      return () => {
-        document.removeEventListener('mouseout', handler);
-      };
-    }
+    const handler = (event) => {
+      event = event ? event : (window.event as any);
+      const from = event.relatedTarget || event.toElement;
+      if (!from || (from as any).nodeName === 'HTML') onPageLeave();
+    };
+
+    document.addEventListener('mouseout', handler);
+    return () => {
+      document.removeEventListener('mouseout', handler);
+    };
   }, args);
 };