Merge branch 'master' of github.com:alibaba/hooks

alibaba · Nov 17, 2021 · 09014d4 · 09014d4
2 parents c84ae31 + 2c00eff
commit 09014d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/packages/hooks/src/useMount/index.ts b/packages/hooks/src/useMount/index.ts
@@ -3,12 +3,12 @@ import { useEffect } from 'react';
 const useMount = (fn: () => void) => {
   if (process.env.NODE_ENV === 'development') {
     if (typeof fn !== 'function') {
-      console.error(`useUnmount expected parameter is a function, got ${typeof fn}`);
+      console.error(`useMount: parameter \`fn\` expected to be a function, but got "${typeof fn}".`);
     }
   }
 
   useEffect(() => {
-    fn();
+    fn?.();
   }, []);
 };
 

diff --git a/packages/hooks/src/utils/domTarget.ts b/packages/hooks/src/utils/domTarget.ts
@@ -1,11 +1,16 @@
 import type { MutableRefObject } from 'react';
 import isBrowser from './isBrowser';
 
-type Target<T> = T | undefined | null;
+type TargetValue<T> = T | undefined | null;
 
-export type BasicTarget<T = Element> = (() => Target<T>) | Target<T> | MutableRefObject<Target<T>>;
+type TargetType = HTMLElement | Element | Window | Document;
 
-export function getTargetElement<T>(target: BasicTarget<T>, defaultElement?: T) {
+export type BasicTarget<T extends TargetType = Element> =
+  | (() => TargetValue<T>)
+  | TargetValue<T>
+  | MutableRefObject<TargetValue<T>>;
+
+export function getTargetElement<T extends TargetType>(target: BasicTarget<T>, defaultElement?: T) {
   if (!isBrowser) {
     return undefined;
   }
@@ -14,10 +19,9 @@ export function getTargetElement<T>(target: BasicTarget<T>, defaultElement?: T)
     return defaultElement;
   }
 
-  let targetElement: Target<T>;
+  let targetElement: TargetValue<T>;
 
   if (typeof target === 'function') {
-    // @ts-ignore
     targetElement = target();
   } else if ('current' in target) {
     targetElement = target.current;