fix(connections): add more accurate collective padding to time window

thematters · Aug 21, 2024 · 1a4114c · 1a4114c
1 parent 5db714c
commit 1a4114c
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/common/utils/connections.ts b/src/common/utils/connections.ts
@@ -59,7 +59,11 @@ export const connectionFromArray = <T>(
 ): Connection<T> => {
   if (totalCount) {
     const { after, before, first } = args // after and before should not appear together
-    const offset = before ? -cursorToIndex(before) : after ? cursorToIndex(after) + 1 : 0
+    const offset = before
+      ? cursorToIndex(before) - (first ?? 0)
+      : after
+      ? cursorToIndex(after) + 1
+      : 0
 
     const edges = data.map((value, index) => ({
       cursor: indexToCursor(index + offset),
@@ -79,8 +83,11 @@ export const connectionFromArray = <T>(
       const beforeIndex = cursorToIndex(before)
       hasPreviousPage = beforeIndex >= (first ? first : 0)
     } else {
-      hasPreviousPage = first ? first - cursorToIndex(firstEdge.cursor) > 0 : cursorToIndex(firstEdge.cursor) > 0
+      hasPreviousPage = first
+        ? first - cursorToIndex(firstEdge.cursor) > 0
+        : cursorToIndex(firstEdge.cursor) > 0
     }
+    console.log(`first cursor is: `, cursorToIndex(firstEdge.cursor))
 
     if (lastEdge) {
       hasNextPage = cursorToIndex(lastEdge.cursor) + 1 < totalCount