From fd814043ddfed414839a147e7e7fa7bc21ade7cc Mon Sep 17 00:00:00 2001 From: Wonsuk Choi Date: Tue, 13 Oct 2026 00:49:51 +0900 Subject: [PATCH] refactor(examples/react/suspense): share the project queries between prefetching and 'useSuspenseQuery' with 'queryOptions' (#11990) --- .../react/suspense/src/components/Project.tsx | 9 ++++----- .../react/suspense/src/components/Projects.tsx | 12 +++--------- examples/react/suspense/src/index.tsx | 9 ++------- examples/react/suspense/src/queries.ts | 17 +++++++++++++++-- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/examples/react/suspense/src/components/Project.tsx b/examples/react/suspense/src/components/Project.tsx index f9da7844d7..3b8b221ec0 100644 --- a/examples/react/suspense/src/components/Project.tsx +++ b/examples/react/suspense/src/components/Project.tsx @@ -1,6 +1,6 @@ import React from 'react' import { useSuspenseQuery } from '@tanstack/react-query' -import { fetchProject } from '../queries' +import { projectQueryOptions } from '../queries' import Button from './Button' import Spinner from './Spinner' @@ -11,10 +11,9 @@ export default function Project({ activeProject: string setActiveProject: React.Dispatch> }) { - const { data, isFetching } = useSuspenseQuery({ - queryKey: ['project', activeProject], - queryFn: () => fetchProject(activeProject), - }) + const { data, isFetching } = useSuspenseQuery( + projectQueryOptions(activeProject), + ) return (
diff --git a/examples/react/suspense/src/components/Projects.tsx b/examples/react/suspense/src/components/Projects.tsx index 46b21b8f48..369ca02e27 100644 --- a/examples/react/suspense/src/components/Projects.tsx +++ b/examples/react/suspense/src/components/Projects.tsx @@ -1,6 +1,6 @@ import React from 'react' import { noop, useQueryClient, useSuspenseQuery } from '@tanstack/react-query' -import { fetchProject, fetchProjects } from '../queries' +import { projectQueryOptions, projectsQueryOptions } from '../queries' import Button from './Button' import Spinner from './Spinner' @@ -10,10 +10,7 @@ export default function Projects({ setActiveProject: React.Dispatch> }) { const queryClient = useQueryClient() - const { data, isFetching } = useSuspenseQuery({ - queryKey: ['projects'], - queryFn: fetchProjects, - }) + const { data, isFetching } = useSuspenseQuery(projectsQueryOptions) return (
@@ -24,10 +21,7 @@ export default function Projects({ onClick={() => { // Prefetch the project query queryClient - .query({ - queryKey: ['project', project.full_name], - queryFn: () => fetchProject(project.full_name), - }) + .query(projectQueryOptions(project.full_name)) .catch(noop) setActiveProject(project.full_name) }} diff --git a/examples/react/suspense/src/index.tsx b/examples/react/suspense/src/index.tsx index 7dfb6a7467..8a38ee3281 100755 --- a/examples/react/suspense/src/index.tsx +++ b/examples/react/suspense/src/index.tsx @@ -11,7 +11,7 @@ import { import { ReactQueryDevtools } from '@tanstack/react-query-devtools' import { ErrorBoundary } from 'react-error-boundary' -import { fetchProjects } from './queries' +import { projectsQueryOptions } from './queries' import Button from './components/Button' @@ -45,12 +45,7 @@ function Example() { onClick={() => { setShowProjects((old) => { if (!old) { - queryClient - .query({ - queryKey: ['projects'], - queryFn: fetchProjects, - }) - .catch(noop) + queryClient.query(projectsQueryOptions).catch(noop) } return !old }) diff --git a/examples/react/suspense/src/queries.ts b/examples/react/suspense/src/queries.ts index 3ff7da1ce0..54fd07fef2 100644 --- a/examples/react/suspense/src/queries.ts +++ b/examples/react/suspense/src/queries.ts @@ -1,4 +1,6 @@ -export async function fetchProjects(): Promise< +import { queryOptions } from '@tanstack/react-query' + +async function fetchProjects(): Promise< Array<{ name: string; full_name: string }> > { console.info('Fetching projects') @@ -10,7 +12,7 @@ export async function fetchProjects(): Promise< return await response.json() } -export async function fetchProject(id: string): Promise<{ +async function fetchProject(id: string): Promise<{ forks_count: number stargazers_count: number watchers_count: number @@ -21,3 +23,14 @@ export async function fetchProject(id: string): Promise<{ await new Promise((r) => setTimeout(r, 1000)) return await response.json() } + +export const projectsQueryOptions = queryOptions({ + queryKey: ['projects'], + queryFn: fetchProjects, +}) + +export const projectQueryOptions = (id: string) => + queryOptions({ + queryKey: ['project', id], + queryFn: () => fetchProject(id), + })