Merge pull request #65 from nuwave/fix/connection-cursor

fix start and end cursors for connection edges
nuwave · Feb 22, 2018 · 6982111 · 6982111
2 parents 2ac5f8b + e6bc8ea
commit 6982111
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/Support/Definition/PageInfoType.php b/src/Support/Definition/PageInfoType.php
@@ -54,7 +54,7 @@ public function fields()
                     if ($collection instanceof LengthAwarePaginator) {
                         return $this->encodeGlobalId(
                             'arrayconnection',
-                            $collection->firstItem() * $collection->currentPage()
+                            $collection->currentPage()
                         );
                     }
 
@@ -66,10 +66,11 @@ public function fields()
                 'description' => 'When paginating forwards, the cursor to continue.',
                 'resolve' => function ($collection) {
                     if ($collection instanceof LengthAwarePaginator) {
-                        return $this->encodeGlobalId(
-                            'arrayconnection',
-                            $collection->lastItem() * $collection->currentPage()
-                        );
+                        $cursor = $collection->hasMorePages()
+                            ? $collection->lastItem()
+                            : $collection->currentPage();
+
+                        return $this->encodeGlobalId('arrayconnection', $cursor);
                     }
                 },
             ],