feat: fix ref useOutsideClick

gravity-ui · Sep 15, 2023 · 7b009f2 · 7b009f2
1 parent 672226f
commit 7b009f2
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/src/components/utils/useOutsideClick/useOutsideClick.tsx b/src/components/utils/useOutsideClick/useOutsideClick.tsx
@@ -17,24 +17,20 @@ type UseOutsideClickType = <K extends HTMLElement>(props: UseOutsideClickProps<K
  */
 export const useOutsideClick: UseOutsideClickType = ({ref, handler}) => {
     React.useEffect(() => {
-        if (ref) {
-            const callback = (e: MouseEvent | TouchEvent) => {
-                const elem = ref?.current;
+        const callback = (e: MouseEvent | TouchEvent) => {
+            const elem = ref?.current;
 
-                if (elem && !elem.contains(e.target as Node) && handler) {
-                    handler();
-                }
-            };
+            if (elem && !elem.contains(e.target as Node) && handler) {
+                handler();
+            }
+        };
 
-            window.addEventListener('click', callback, {capture: true});
-            window.addEventListener('touchstart', callback, {capture: true});
+        window.addEventListener('click', callback, {capture: true});
+        window.addEventListener('touchstart', callback, {capture: true});
 
-            return () => {
-                window.removeEventListener('click', callback, {capture: true});
-                window.removeEventListener('touchstart', callback, {capture: true});
-            };
-        }
-
-        return undefined;
+        return () => {
+            window.removeEventListener('click', callback, {capture: true});
+            window.removeEventListener('touchstart', callback, {capture: true});
+        };
     }, [handler, ref]);
 };