fix(graphql-skip-limit): fix hasNextPage (gatsbyjs#10504)

gpetrioli · Jan 22, 2019 · b94d35e · b94d35e
1 parent 0ed343b
commit b94d35e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/packages/graphql-skip-limit/src/connection/__tests__/arrayconnection.js b/packages/graphql-skip-limit/src/connection/__tests__/arrayconnection.js
@@ -150,6 +150,27 @@ describe(`connectionFromArray()`, () => {
         },
       })
     })
+
+    it(`returns hasNextPage correctly`, () => {
+      const c = connectionFromArray(letters, { limit: 2, skip: 3 })
+      return expect(c).toEqual({
+        edges: [
+          {
+            next: `E`,
+            node: `D`,
+            previous: `C`,
+          },
+          {
+            next: undefined,
+            node: `E`,
+            previous: `D`,
+          },
+        ],
+        pageInfo: {
+          hasNextPage: false,
+        },
+      })
+    })
   })
 })
 

diff --git a/packages/graphql-skip-limit/src/connection/arrayconnection.js b/packages/graphql-skip-limit/src/connection/arrayconnection.js
@@ -52,9 +52,7 @@ export function connectionFromArray<T>(
     edges,
     pageInfo: {
       hasNextPage:
-        typeof limit === `number`
-          ? limit + startSlice - 1 < data.length
-          : false,
+        typeof limit === `number` ? limit + startSlice < data.length : false,
     },
   }
 }