fix: call getInitialData just once

pmndrs · Jul 9, 2021 · ab36eaa · ab36eaa
1 parent 0455dca
commit ab36eaa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/query/atomWithInfiniteQuery.ts b/src/query/atomWithInfiniteQuery.ts
@@ -61,11 +61,14 @@ export function atomWithInfiniteQuery<
               >
             )()
           : options.initialData
+
+      const initialData = getInitialData()
+
       const dataAtom = atom<
         | InfiniteData<TData | TQueryData>
         | Promise<InfiniteData<TData | TQueryData>>
       >(
-        getInitialData() ||
+        initialData ||
           new Promise<InfiniteData<TData>>((resolve, reject) => {
             settlePromise = (data, err) => {
               if (err) {
@@ -120,7 +123,7 @@ export function atomWithInfiniteQuery<
 
       const observer = new InfiniteQueryObserver(queryClient, defaultedOptions)
 
-      if (!getInitialData()) {
+      if (!initialData) {
         observer
           .fetchOptimistic(defaultedOptions)
           .then(listener)

diff --git a/src/query/atomWithQuery.ts b/src/query/atomWithQuery.ts
@@ -46,8 +46,11 @@ export function atomWithQuery<
         typeof options.initialData === 'function'
           ? (options.initialData as InitialDataFunction<TQueryData>)()
           : options.initialData
+
+      const initialData = getInitialData()
+
       const dataAtom = atom<TData | TQueryData | Promise<TData | TQueryData>>(
-        getInitialData() ||
+        initialData ||
           new Promise<TData>((resolve, reject) => {
             settlePromise = (data, err) => {
               if (err) {
@@ -95,7 +98,7 @@ export function atomWithQuery<
         defaultedOptions.staleTime = 1000
       }
       const observer = new QueryObserver(queryClient, defaultedOptions)
-      if (!getInitialData()) {
+      if (!initialData) {
         observer
           .fetchOptimistic(defaultedOptions)
           .then(listener)