diff --git a/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index f7fdc3fd73..1f168ef8f2 100644 --- a/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -11,7 +11,6 @@ import { usePrefetchInfiniteQuery, useSuspenseInfiniteQuery, } from '..' -import type { InfiniteData, UseSuspenseInfiniteQueryOptions } from '..' import { renderWithClient } from './utils' const generateInfiniteQueryOptions = ( @@ -59,28 +58,6 @@ describe('usePrefetchInfiniteQuery', () => { const Fallback = vi.fn().mockImplementation(() =>
Loading...
) - function Suspended(props: { - queryOpts: UseSuspenseInfiniteQueryOptions< - T, - Error, - InfiniteData, - Array, - any - > - renderPage: (page: T) => VNode - }) { - const state = useSuspenseInfiniteQuery(props.queryOpts) - - return ( -
- {state.data.pages.map((page, index) => ( -
{props.renderPage(page)}
- ))} - -
- ) - } - it('should prefetch an infinite query if query state does not exist', async () => { const data = [ { data: 'Do you fetch on render?', currentPage: 1, totalPages: 3 }, @@ -97,15 +74,25 @@ describe('usePrefetchInfiniteQuery', () => { ...generateInfiniteQueryOptions(data), } + function Page() { + const state = useSuspenseInfiniteQuery(queryOpts) + + return ( +
+ {state.data.pages.map((page, index) => ( +
data: {page.data}
+ ))} + +
+ ) + } + function App() { usePrefetchInfiniteQuery({ ...queryOpts, pages: data.length }) return ( }> -
data: {page.data}
} - /> +
) } @@ -140,15 +127,25 @@ describe('usePrefetchInfiniteQuery', () => { await vi.advanceTimersByTimeAsync(30) ;(queryOpts.queryFn as Mock).mockClear() + function Page() { + const state = useSuspenseInfiniteQuery(queryOpts) + + return ( +
+ {state.data.pages.map((page, index) => ( +
data: {page.data}
+ ))} + +
+ ) + } + function App() { usePrefetchInfiniteQuery(queryOpts) return ( }> -
data: {page.data}
} - /> +
) } @@ -179,14 +176,24 @@ describe('usePrefetchInfiniteQuery', () => { return <>{children} } + function Page() { + const state = useSuspenseInfiniteQuery(queryOpts) + + return ( +
+ {state.data.pages.map((page, index) => ( +
data: {page.data}
+ ))} + +
+ ) + } + function App() { return ( }> -
data: {page.data}
} - /> +
) diff --git a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index a6ea6a6751..1dd2ea1525 100644 --- a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -9,7 +9,6 @@ import { useSuspenseInfiniteQuery, } from '..' import { renderWithClient } from './utils' -import type { InfiniteData, UseSuspenseInfiniteQueryOptions } from '..' import type { Mock } from 'vitest' const createFallback = () => @@ -57,28 +56,6 @@ describe('usePrefetchInfiniteQuery', () => { vi.useRealTimers() }) - function Suspended(props: { - queryOpts: UseSuspenseInfiniteQueryOptions< - T, - Error, - InfiniteData, - Array, - any - > - renderPage: (page: T) => React.JSX.Element - }) { - const state = useSuspenseInfiniteQuery(props.queryOpts) - - return ( -
- {state.data.pages.map((page, index) => ( -
{props.renderPage(page)}
- ))} - -
- ) - } - it('should prefetch an infinite query if query state does not exist', async () => { const Fallback = createFallback() const data = [ @@ -96,15 +73,25 @@ describe('usePrefetchInfiniteQuery', () => { ...generateInfiniteQueryOptions(data), } + function Page() { + const state = useSuspenseInfiniteQuery(queryOpts) + + return ( +
+ {state.data.pages.map((page, index) => ( +
data: {page.data}
+ ))} + +
+ ) + } + function App() { usePrefetchInfiniteQuery({ ...queryOpts, pages: data.length }) return ( }> -
data: {page.data}
} - /> +
) } @@ -140,15 +127,25 @@ describe('usePrefetchInfiniteQuery', () => { await vi.advanceTimersByTimeAsync(30) ;(queryOpts.queryFn as Mock).mockClear() + function Page() { + const state = useSuspenseInfiniteQuery(queryOpts) + + return ( +
+ {state.data.pages.map((page, index) => ( +
data: {page.data}
+ ))} + +
+ ) + } + function App() { usePrefetchInfiniteQuery(queryOpts) return ( }> -
data: {page.data}
} - /> +
) } @@ -179,14 +176,24 @@ describe('usePrefetchInfiniteQuery', () => { return <>{children} } + function Page() { + const state = useSuspenseInfiniteQuery(queryOpts) + + return ( +
+ {state.data.pages.map((page, index) => ( +
data: {page.data}
+ ))} + +
+ ) + } + function App() { return ( -
data: {page.data}
} - /> +
)