Skip to content

fix(core): memoization of useList queryOptions.select #6763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arndom wants to merge 2 commits into from
Closed

fix(core): memoization of useList queryOptions.select #6763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f7f28a
fix(core): temp. push for "working" solution
arndom Apr 26, 2025
e724d29
Merge branch 'next' into fix/core/use-list-query-select
alicanerdurmaz May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions examples/app-crm-minimal/src/routes/tasks/list/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,18 @@ export const TasksListPage = ({ children }: React.PropsWithChildren) => {
meta: {
gqlQuery: TASK_STAGES_QUERY,
},
queryOptions: {
select: React.useCallback((data) => {
console.log("select", Math.random());
return data;
}, []),
},
// queryOptions: {
// select: (data) => {
// console.log("select", Math.random());
// return data;
// },
// },
});

const { data: tasks, isLoading: isLoadingTasks } = useList<
Expand Down
61 changes: 37 additions & 24 deletions packages/core/src/hooks/data/useList.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import {
type UseLoadingOvertimeReturnType,
useLoadingOvertime,
} from "../useLoadingOvertime";
import { useCallback, useMemo } from "react";

export interface UseListConfig {
pagination?: Pagination;
Expand Down Expand Up @@ -173,11 +174,15 @@ export const useList = <
hasPagination,
config?.hasPagination,
);
const prefferedPagination = handlePaginationParams({
pagination,
configPagination: config?.pagination,
hasPagination: prefferedHasPagination,
});
const prefferedPagination = useMemo(
() =>
handlePaginationParams({
pagination,
configPagination: config?.pagination,
hasPagination: prefferedHasPagination,
}),
[pagination, config?.pagination, prefferedHasPagination],
);
const isServerPagination = prefferedPagination.mode === "server";

const combinedMeta = getMeta({ resource, meta: preferredMeta });
Expand Down Expand Up @@ -225,6 +230,32 @@ export const useList = <
},
});

const querySelectCB = (rawData: GetListResponse<TQueryFnData>) => {
let data = rawData;

const { current, mode, pageSize } = prefferedPagination;

if (mode === "client") {
data = {
...data,
data: data.data.slice((current - 1) * pageSize, current * pageSize),
total: data.total,
};
}

if (queryOptions?.select) {
return queryOptions?.select?.(data);
}

return data as unknown as GetListResponse<TData>;
};
const querySelect = useCallback(querySelectCB, [
prefferedPagination,
queryOptions?.select,
]);

console.log([prefferedPagination, queryOptions?.select]);

const queryResponse = useQuery<
GetListResponse<TQueryFnData>,
TError,
Expand Down Expand Up @@ -270,25 +301,7 @@ export const useList = <
typeof queryOptions?.enabled !== "undefined"
? queryOptions?.enabled
: !!resource?.name,
select: (rawData) => {
let data = rawData;

const { current, mode, pageSize } = prefferedPagination;

if (mode === "client") {
data = {
...data,
data: data.data.slice((current - 1) * pageSize, current * pageSize),
total: data.total,
};
}

if (queryOptions?.select) {
return queryOptions?.select?.(data);
}

return data as unknown as GetListResponse<TData>;
},
select: querySelect,
onSuccess: (data) => {
queryOptions?.onSuccess?.(data);

Expand Down