Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions packages/query-core/src/queryClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -668,10 +668,7 @@ export class QueryClient {
defaultedOptions.networkMode = 'offlineFirst'
}

if (
defaultedOptions.enabled !== true &&
defaultedOptions.queryFn === skipToken
) {
if (defaultedOptions.queryFn === skipToken) {
defaultedOptions.enabled = false
}

Expand Down
33 changes: 33 additions & 0 deletions packages/react-query/src/__tests__/useQuery.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6422,6 +6422,39 @@ describe('useQuery', () => {
await waitFor(() => rendered.getByText('data: data'))
})

it('should allow enabled: true and queryFn: skipToken', async () => {
const consoleMock = vi
.spyOn(console, 'error')
.mockImplementation(() => undefined)
const key = queryKey()

function App() {
const query = useQuery({
queryKey: key,
queryFn: skipToken,
enabled: true,
})

return (
<div>
<div>
status: {query.status}, fetchStatus: {query.fetchStatus}
</div>
</div>
)
}

const rendered = renderWithClient(queryClient, <App />)

await waitFor(() =>
rendered.getByText('status: pending, fetchStatus: idle'),
)

// no warnings expected about skipToken / missing queryFn
expect(consoleMock).toHaveBeenCalledTimes(0)
consoleMock.mockRestore()
})

it('should return correct optimistic result when fetching after error', async () => {
const key = queryKey()
const error = new Error('oh no')
Expand Down
Loading