Reset pagination reference cache

swan-io · Jul 24, 2024 · 72dc624 · 72dc624
1 parent 65c65e3
commit 72dc624
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/react/usePagination.ts b/src/react/usePagination.ts
@@ -100,10 +100,20 @@ const createPaginationHook = (direction: mode) => {
           ([serialized]) => serializedArg === serialized,
         )
       ) {
-        connectionArgumentsRef.current = [
-          ...connectionArgumentsRef.current,
-          [serializedArg, arg],
-        ];
+        // if `before` or `after` argument is `null`, we're on the first page,
+        // reset the pagination
+        if (
+          "__connectionArguments" in connection &&
+          isRecord(connection.__connectionArguments) &&
+          connection.__connectionArguments[direction] == null
+        ) {
+          connectionArgumentsRef.current = [[serializedArg, arg]];
+        } else {
+          connectionArgumentsRef.current = [
+            ...connectionArgumentsRef.current,
+            [serializedArg, arg],
+          ];
+        }
       }
     }