Skip to content

Commit 6ad37da

Browse files
committed
SQUASHME Fix selector skiptoken usage
1 parent f1755db commit 6ad37da

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

packages/toolkit/src/query/core/buildSelectors.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -238,17 +238,20 @@ export function buildSelectors<
238238
) => T & RequestStatusFlags,
239239
) {
240240
return (queryArgs: any) => {
241+
// Avoid calling serializeQueryArgs if the arg is skipToken
242+
if (queryArgs === skipToken) {
243+
return createSelector(selectSkippedQuery, combiner)
244+
}
245+
241246
const serializedArgs = serializeQueryArgs({
242247
queryArgs,
243248
endpointDefinition,
244249
endpointName,
245250
})
246251
const selectQuerySubstate = (state: RootState) =>
247252
selectQueryEntry(state, serializedArgs) ?? defaultQuerySubState
248-
const finalSelectQuerySubState =
249-
queryArgs === skipToken ? selectSkippedQuery : selectQuerySubstate
250253

251-
return createSelector(finalSelectQuerySubState, combiner)
254+
return createSelector(selectQuerySubstate, combiner)
252255
}
253256
}
254257

0 commit comments

Comments
 (0)