refactor: use ReturnType<typeof setTimeout> instead of `NodeJS.Time…

…out` (alibaba#1384)
lily7129 · Dec 15, 2021 · 322a381 · 322a381
1 parent d84a254
commit 322a381
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/packages/hooks/src/useLongPress/index.ts b/packages/hooks/src/useLongPress/index.ts
@@ -23,7 +23,7 @@ function useLongPress(
 ) {
   const onLongPressRef = useLatest(onLongPress);
 
-  const timerRef = useRef<NodeJS.Timeout>();
+  const timerRef = useRef<ReturnType<typeof setTimeout>>();
   const isTriggeredRef = useRef(false);
 
   useEffectWithTarget(

diff --git a/packages/hooks/src/useRequest/src/plugins/useLoadingDelayPlugin.ts b/packages/hooks/src/useRequest/src/plugins/useLoadingDelayPlugin.ts
@@ -1,8 +1,8 @@
 import { useRef } from 'react';
-import type { Plugin } from '../types';
+import type { Plugin, Timeout } from '../types';
 
 const useLoadingDelayPlugin: Plugin<any, any[]> = (fetchInstance, { loadingDelay }) => {
-  const timerRef = useRef<NodeJS.Timeout>();
+  const timerRef = useRef<Timeout>();
 
   if (!loadingDelay) {
     return {};

diff --git a/packages/hooks/src/useRequest/src/plugins/usePollingPlugin.ts b/packages/hooks/src/useRequest/src/plugins/usePollingPlugin.ts
@@ -1,14 +1,14 @@
 import { useRef } from 'react';
 import useUpdateEffect from '../../../useUpdateEffect';
-import type { Plugin } from '../types';
+import type { Plugin, Timeout } from '../types';
 import isDocumentVisible from '../utils/isDocumentVisible';
 import subscribeReVisible from '../utils/subscribeReVisible';
 
 const usePollingPlugin: Plugin<any, any[]> = (
   fetchInstance,
   { pollingInterval, pollingWhenHidden = true },
 ) => {
-  const timerRef = useRef<NodeJS.Timeout>();
+  const timerRef = useRef<Timeout>();
   const unsubscribeRef = useRef<() => void>();
 
   const stopPolling = () => {

diff --git a/packages/hooks/src/useRequest/src/plugins/useRetryPlugin.ts b/packages/hooks/src/useRequest/src/plugins/useRetryPlugin.ts
@@ -1,8 +1,8 @@
 import { useRef } from 'react';
-import type { Plugin } from '../types';
+import type { Plugin, Timeout } from '../types';
 
 const useRetryPlugin: Plugin<any, any[]> = (fetchInstance, { retryInterval, retryCount }) => {
-  const timerRef = useRef<NodeJS.Timeout>();
+  const timerRef = useRef<Timeout>();
   const countRef = useRef(0);
 
   const triggerByRetry = useRef(false);

diff --git a/packages/hooks/src/useRequest/src/types.ts b/packages/hooks/src/useRequest/src/types.ts
@@ -116,3 +116,5 @@ export interface Result<TData, TParams extends any[]> {
   runAsync: Fetch<TData, TParams>['runAsync'];
   mutate: Fetch<TData, TParams>['mutate'];
 }
+
+export type Timeout = ReturnType<typeof setTimeout>;
diff --git a/packages/hooks/src/useWebSocket/index.ts b/packages/hooks/src/useWebSocket/index.ts
@@ -49,7 +49,7 @@ export default function useWebSocket(socketUrl: string, options: Options = {}):
   const onErrorRef = useLatest(onError);
 
   const reconnectTimesRef = useRef(0);
-  const reconnectTimerRef = useRef<NodeJS.Timeout>();
+  const reconnectTimerRef = useRef<ReturnType<typeof setTimeout>>();
   const websocketRef = useRef<WebSocket>();
 
   const unmountedRef = useRef(false);