Skip to content

Commit c7ff322

Browse files
chore: improve needpolling type (#741)
1 parent 3f656db commit c7ff322

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

packages/use-dataloader/src/DataLoaderProvider.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ type GetReloadsFn = {
4343

4444
export interface IDataLoaderContext {
4545
addRequest: (key: string, args: UseDataLoaderInitializerArgs) => DataLoader
46-
getOrAddRequest: (
46+
getOrAddRequest: <T>(
4747
key: string,
48-
args: UseDataLoaderInitializerArgs,
49-
) => DataLoader
48+
args: UseDataLoaderInitializerArgs<T>,
49+
) => DataLoader<T>
5050
cacheKeyPrefix?: string
5151
onError?: (error: Error) => void | Promise<void>
5252
clearAllCachedData: () => void

packages/use-dataloader/src/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface UseDataLoaderConfig<T = unknown> {
3030
* Max time before data from previous success is considered as outdated (in millisecond)
3131
*/
3232
maxDataLifetime?: number
33-
needPolling?: NeedPollingType
33+
needPolling?: NeedPollingType<T>
3434
}
3535

3636
/**
@@ -76,7 +76,7 @@ export type UsePaginatedDataLoaderConfig<T = unknown> = {
7676
* Max time before data from previous success is considered as outdated (in millisecond)
7777
*/
7878
maxDataLifetime?: number
79-
needPolling?: NeedPollingType
79+
needPolling?: NeedPollingType<T>
8080
initialPage?: number
8181
perPage?: number
8282
}

packages/use-dataloader/src/useDataLoader.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
} from 'react'
99
import { useDataLoaderContext } from './DataLoaderProvider'
1010
import { StatusEnum } from './constants'
11-
import DataLoader from './dataloader'
1211
import { PromiseType, UseDataLoaderConfig, UseDataLoaderResult } from './types'
1312

1413
/**
@@ -52,7 +51,7 @@ const useDataLoader = <T>(
5251
method,
5352
needPolling,
5453
pollingInterval,
55-
}) as DataLoader<T>
54+
})
5655

5756
unsubscribeRequestRef.current = () => newRequest.removeObserver(subscribeFn)
5857
newRequest.addObserver(subscribeFn)
@@ -82,7 +81,9 @@ const useDataLoader = <T>(
8281
}
8382
}, [onSuccess, onError, onErrorProvider, method, request])
8483

85-
const cancelMethodRef = useRef<(() => Promise<void>) | undefined>(request?.cancel)
84+
const cancelMethodRef = useRef<(() => Promise<void>) | undefined>(
85+
request?.cancel,
86+
)
8687

8788
const isLoading = useMemo(
8889
() =>

0 commit comments

Comments
 (0)