fix: [useClickOutside] fix types

alibaba · May 19, 2021 · 0ca4d86 · 0ca4d86
1 parent 290b90d
commit 0ca4d86
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/components/Chat/index.tsx b/src/components/Chat/index.tsx
@@ -4,7 +4,6 @@ import { Navbar, NavbarProps } from '../Navbar';
 import { MessageContainer, MessageContainerProps } from '../MessageContainer';
 import { QuickReplies, QuickReplyItemProps } from '../QuickReplies';
 import { Composer as DComposer, ComposerProps } from '../Composer';
-import { MessageProps } from '../Message/Message';
 
 export type ChatProps = ComposerProps &
   MessageContainerProps & {

diff --git a/src/components/Popover/index.tsx b/src/components/Popover/index.tsx
@@ -19,6 +19,8 @@ export const Popover: React.FC<PopoverProps> = (props) => {
   const [style, setStyle] = useState({});
 
   const updatePos = useCallback(() => {
+    if (!wrapper.current) return;
+
     const targetRect = target.getBoundingClientRect();
     const rect = wrapper.current.getBoundingClientRect();
 

diff --git a/src/hooks/useClickOutside.ts b/src/hooks/useClickOutside.ts
@@ -1,12 +1,10 @@
 import { useEffect, useRef } from 'react';
 
-type EventType = MouseEvent | TouchEvent;
-
-export default function useClickOutside(
-  handler: (event: EventType) => void,
+export default function useClickOutside<T extends HTMLElement = any>(
+  handler: (event: any) => void,
   eventName: string = 'click',
 ) {
-  const ref = useRef<HTMLElement>(null);
+  const ref = useRef<T>();
 
   useEffect(() => {
     const listener = (e: any) => {
@@ -25,7 +23,7 @@ export default function useClickOutside(
     return () => {
       document.removeEventListener(eventName, listener);
     };
-  }, [handler, eventName]);
+  }, [eventName, handler]);
 
   return ref;
 }