Skip to content

Commit 0e673bf

Browse files
committed
fix: useLoadMore types
1 parent b212e1f commit 0e673bf

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/core/config.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ export const clearGlobalOptions = () => {
2727

2828
export interface GlobalOptions
2929
// usePagination config
30-
extends Partial<PaginationExtendsOption>,
30+
extends PaginationExtendsOption,
3131
// useLoadMore config
32-
Partial<Omit<LoadMoreExtendsOption<any>, 'isNoMore'>> {
32+
LoadMoreExtendsOption {
3333
loadingDelay?: number;
3434
pollingInterval?: number;
3535
pollingWhenHidden?: boolean;

src/useLoadMore.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ export interface LoadMoreResult<R, P extends unknown[], LR extends unknown[]>
2121
reload: () => void;
2222
}
2323

24-
export interface LoadMoreExtendsOption<R> {
25-
isNoMore: (data: R) => boolean;
24+
export type LoadMoreExtendsOption = {
2625
listKey?: string;
27-
}
26+
};
27+
28+
export type LoadMoreGenericExtendsOption<R> = {
29+
isNoMore?: (data: R) => boolean;
30+
};
2831

2932
export type LoadMoreService<R, P extends unknown[], LR> =
3033
| ((r: { data: R; dataList: LR }, ...args: P) => Promise<R>)
@@ -34,13 +37,15 @@ export type LoadMoreFormatOptions<R, P extends unknown[], FR> = Omit<
3437
FormatOptions<R, P, FR>,
3538
'queryKey'
3639
> &
37-
LoadMoreExtendsOption<R>;
40+
LoadMoreGenericExtendsOption<R> &
41+
LoadMoreExtendsOption;
3842

3943
export type LoadMoreBaseOptions<R, P extends unknown[]> = Omit<
4044
BaseOptions<R, P>,
4145
'queryKey'
4246
> &
43-
LoadMoreExtendsOption<R>;
47+
LoadMoreGenericExtendsOption<R> &
48+
LoadMoreExtendsOption;
4449

4550
export type LoadMoreMixinOptions<R, P extends unknown[], FR> =
4651
| LoadMoreBaseOptions<R, P>

0 commit comments

Comments
 (0)