Skip to content

Commit 43afc44

Browse files
committed
refactor: ensures data arrays are always initialized
1 parent 757d9e0 commit 43afc44

File tree

6 files changed

+12
-18
lines changed

6 files changed

+12
-18
lines changed

packages/antd/src/hooks/table/useTable/useTable.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ export const useTable = <
9393
createLinkForSyncWithLocation,
9494
pageCount,
9595
overtime,
96+
result,
9697
} = useTableCore<TQueryFnData, TError, TData>({
9798
pagination: paginationFromProp,
9899
filters: filtersFromProp,
@@ -264,9 +265,6 @@ export const useTable = <
264265
pageCount,
265266
createLinkForSyncWithLocation,
266267
overtime,
267-
result: {
268-
data: tableQuery.data?.data,
269-
total: tableQuery.data?.total,
270-
},
268+
result,
271269
};
272270
};

packages/antd/src/hooks/useSimpleList/useSimpleList.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export const useSimpleList = <
8181
createLinkForSyncWithLocation,
8282
tableQuery,
8383
overtime,
84+
result,
8485
} = useTableCore({
8586
resource,
8687
pagination: paginationFromProp,
@@ -198,9 +199,6 @@ export const useSimpleList = <
198199
pageCount,
199200
createLinkForSyncWithLocation,
200201
overtime,
201-
result: {
202-
data: tableQuery.data?.data,
203-
total: tableQuery.data?.total || 0,
204-
},
202+
result,
205203
};
206204
};

packages/core/src/hooks/data/useList.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export type UseListProps<TQueryFnData, TError, TData> = {
9696
export type UseListReturnType<TData, TError> = {
9797
query: QueryObserverResult<GetListResponse<TData>, TError>;
9898
result: {
99-
data: TData[] | undefined;
99+
data: TData[];
100100
total: number | undefined;
101101
};
102102
} & UseLoadingOvertimeReturnType;
@@ -312,7 +312,7 @@ export const useList = <
312312
return {
313313
query: queryResponse,
314314
result: {
315-
data: queryResponse?.data?.data,
315+
data: queryResponse?.data?.data || [],
316316
total: queryResponse?.data?.total,
317317
},
318318
overtime: { elapsedTime },

packages/core/src/hooks/data/useMany.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export type UseManyReturnType<
5454
> = {
5555
query: QueryObserverResult<GetManyResponse<TData>, TError>;
5656
result: {
57-
data: TData[] | undefined;
57+
data: TData[];
5858
};
5959
} & UseLoadingOvertimeReturnType;
6060

@@ -253,7 +253,7 @@ export const useMany = <
253253
return {
254254
query: queryResponse,
255255
result: {
256-
data: queryResponse?.data?.data,
256+
data: queryResponse?.data?.data || [],
257257
},
258258
overtime: { elapsedTime },
259259
};

packages/core/src/hooks/useTable/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ export type useTableReturnType<
156156
setPageSize: ReactSetState<useTableReturnType["pageSize"]>;
157157
pageCount: number;
158158
result: {
159-
data: TData[] | undefined;
159+
data: TData[];
160160
total: number | undefined;
161161
};
162162
} & UseLoadingOvertimeReturnType;
@@ -432,7 +432,7 @@ export function useTable<
432432
createLinkForSyncWithLocation,
433433
overtime: queryResult.overtime,
434434
result: {
435-
data: queryResult.result?.data,
435+
data: queryResult.result?.data || [],
436436
total: queryResult.result?.total,
437437
},
438438
};

packages/mui/src/hooks/useDataGrid/index.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ export function useDataGrid<
168168
pageCount,
169169
createLinkForSyncWithLocation,
170170
overtime,
171+
result,
171172
} = useTableCore<TQueryFnData, TError, TData>({
172173
pagination: {
173174
...pagination,
@@ -347,9 +348,6 @@ export function useDataGrid<
347348
search,
348349
createLinkForSyncWithLocation,
349350
overtime,
350-
result: {
351-
data: tableQuery.data?.data,
352-
total: tableQuery.data?.total,
353-
},
351+
result,
354352
};
355353
}

0 commit comments

Comments
 (0)