Merge branch 'master' of https://github.com/tannerlinsley/react-query

Author: tannerlinsley

docs/src/pages/guides/initial-query-data.md

@@ -52,7 +52,7 @@ By default, `initialData` is treated as totally fresh, as if it were just fetche
   }
   ```
 
-- So what if your `initialData` isn't totally fresh? That leaves us with the last configuration that is actually the most accurate and uses an option called `initialDataUpdatedAt`. This options allows you to pass a numeric unix timestamp of when the initialData itself was last updated.
+- So what if your `initialData` isn't totally fresh? That leaves us with the last configuration that is actually the most accurate and uses an option called `initialDataUpdatedAt`. This options allows you to pass a numeric JS timestamp in milliseconds of when the initialData itself was last updated, e.g. what `Date.now()` provides. Take note that if you have a unix timestamp, you'll need to convert it to a JS timestamp by multiplying it by `1000`.
   ```js
   function Todos() {
     // Show initialTodos immeidately, but won't refetch until another interaction event is encountered after 1000 ms

docs/src/pages/guides/query-invalidation.md

@@ -21,7 +21,7 @@ When a query is invalidated with `invalidateQueries`, two things happen:
 
 ## Query Matching with `invalidateQueries`
 
-When using APIs like `invalidateQueries` and `removeQueries` (and others that support partial query matching), you can match multiple queries by their prefix, or get really specific and match an exact query. For informationo on the types of filters, you can use, please see [Query Filters](./query-filters).
+When using APIs like `invalidateQueries` and `removeQueries` (and others that support partial query matching), you can match multiple queries by their prefix, or get really specific and match an exact query. For information on the types of filters you can use, please see [Query Filters](./query-filters).
 
 In this example, we can use the `todos` prefix to invalidate any queries that start with `todos` in their query key:
 

src/core/infiniteQueryObserver.ts

@@ -107,8 +107,8 @@ export class InfiniteQueryObserver<
       ...result,
       fetchNextPage: this.fetchNextPage,
       fetchPreviousPage: this.fetchPreviousPage,
-      hasNextPage: hasNextPage(this.options, result.data?.pages),
-      hasPreviousPage: hasPreviousPage(this.options, result.data?.pages),
+      hasNextPage: hasNextPage(this.options, state.data?.pages),
+      hasPreviousPage: hasPreviousPage(this.options, state.data?.pages),
       isFetchingNextPage:
         state.isFetching && state.fetchMeta?.fetchMore?.direction === 'forward',
       isFetchingPreviousPage:

src/devtools/devtools.tsx

@@ -147,7 +147,6 @@ export function ReactQueryDevtools({
 
       const run = () => {
         const containerHeight = panelRef.current?.getBoundingClientRect().height
-        console.log(containerHeight)
         rootRef.current.parentElement.style.paddingBottom = `${containerHeight}px`
       }
 

src/react/tests/useInfiniteQuery.test.tsx

@@ -969,6 +969,49 @@ describe('useInfiniteQuery', () => {
     })
   })
 
+  it('should not use selected data when computing hasNextPage', async () => {
+    const key = queryKey()
+    const states: UseInfiniteQueryResult<string>[] = []
+
+    function Page() {
+      const state = useInfiniteQuery(
+        key,
+        ({ pageParam = 1 }) => Number(pageParam),
+        {
+          getNextPageParam: lastPage => (lastPage === 1 ? 2 : false),
+          select: data => ({
+            pages: data.pages.map(x => x.toString()),
+            pageParams: data.pageParams,
+          }),
+        }
+      )
+
+      states.push(state)
+
+      return null
+    }
+
+    renderWithClient(queryClient, <Page />)
+
+    await sleep(100)
+
+    expect(states.length).toBe(2)
+    expect(states[0]).toMatchObject({
+      data: undefined,
+      hasNextPage: undefined,
+      isFetching: true,
+      isFetchingNextPage: false,
+      isSuccess: false,
+    })
+    expect(states[1]).toMatchObject({
+      data: { pages: ['1'] },
+      hasNextPage: true,
+      isFetching: false,
+      isFetchingNextPage: false,
+      isSuccess: true,
+    })
+  })
+
   it('should build fresh cursors on refetch', async () => {
     const key = queryKey()