queryOptions as props on PreloadQuery

apollographql · May 3, 2024 · e08acd9 · e08acd9
1 parent e64236d
commit e08acd9
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 33 deletions.
diff --git a/integration-test/nextjs/src/app/rsc/dynamic/PreloadQuery/queryRef-refTest/page.tsx b/integration-test/nextjs/src/app/rsc/dynamic/PreloadQuery/queryRef-refTest/page.tsx
@@ -13,14 +13,12 @@ export default function Page() {
     <ApolloWrapper>
       <form name="test">
         <PreloadQuery
-          options={{
-            query: QUERY,
-            context: {
-              delay: 100,
-            },
-            variables: {
-              someArgument: "query1",
-            },
+          query={QUERY}
+          context={{
+            delay: 100,
+          }}
+          variables={{
+            someArgument: "query1",
           }}
         >
           {(queryRef1) => (
@@ -31,14 +29,12 @@ export default function Page() {
           )}
         </PreloadQuery>
         <PreloadQuery
-          options={{
-            query: QUERY,
-            context: {
-              delay: 100,
-            },
-            variables: {
-              someArgument: "query2",
-            },
+          query={QUERY}
+          context={{
+            delay: 100,
+          }}
+          variables={{
+            someArgument: "query2",
           }}
         >
           {(queryRef2) => (

diff --git a/integration-test/nextjs/src/app/rsc/dynamic/PreloadQuery/queryRef-useReadQuery/page.tsx b/integration-test/nextjs/src/app/rsc/dynamic/PreloadQuery/queryRef-useReadQuery/page.tsx
@@ -10,12 +10,10 @@ export default function Page({ searchParams }: { searchParams?: any }) {
   return (
     <ApolloWrapper>
       <PreloadQuery
-        options={{
-          query: QUERY,
-          context: {
-            delay: 1000,
-            error: searchParams?.errorIn || undefined,
-          },
+        query={QUERY}
+        context={{
+          delay: 1000,
+          error: searchParams?.errorIn || undefined,
         }}
       >
         {(queryRef) => (

diff --git a/integration-test/nextjs/src/app/rsc/dynamic/PreloadQuery/useSuspenseQuery/page.tsx b/integration-test/nextjs/src/app/rsc/dynamic/PreloadQuery/useSuspenseQuery/page.tsx
@@ -10,12 +10,10 @@ export default function Page({ searchParams }: { searchParams?: any }) {
   return (
     <ApolloWrapper>
       <PreloadQuery
-        options={{
-          query: QUERY,
-          context: {
-            delay: 1000,
-            error: searchParams?.errorIn || undefined,
-          },
+        query={QUERY}
+        context={{
+          delay: 1000,
+          error: searchParams?.errorIn || undefined,
         }}
       >
         <Suspense fallback={<>loading</>}>

diff --git a/packages/client-react-streaming/src/PreloadQuery.tsx b/packages/client-react-streaming/src/PreloadQuery.tsx
@@ -25,11 +25,10 @@ export type PreloadQueryOptions<TVariables, TData> = QueryOptions<
   RestrictedPreloadOptions;
 
 export function PreloadQuery<TData, TVariables extends OperationVariables>({
-  options,
   getClient,
   children,
-}: {
-  options: PreloadQueryOptions<TVariables, TData>;
+  ...options
+}: PreloadQueryOptions<TVariables, TData> & {
   getClient: () => ApolloClient<any> | Promise<ApolloClient<any>>;
   children:
     | ReactNode

diff --git a/packages/client-react-streaming/src/registerApolloClient.tsx b/packages/client-react-streaming/src/registerApolloClient.tsx
@@ -144,8 +144,8 @@ return a new instance every time \`makeClient\` is called.
   return getClient;
 }
 
-interface PreloadQueryProps<TData, TVariables> {
-  options: PreloadQueryOptions<TVariables, TData>;
+interface PreloadQueryProps<TData, TVariables>
+  extends PreloadQueryOptions<TVariables, TData> {
   children:
     | ReactNode
     | ((