Revert new usePaginatedQuery options that aren't ready (#38031)

We're not ready for new usePaginatedQuery options that enable gapless custom pagination (query streams, etc.) yet; we can do it, but the behavior is either difficult to describe and may change. Stick to convex helpers for this for now.

GitOrigin-RevId: fff159089f6af65156906aaac473e37b61822e8f

Author: thomasballinger

src/react/use_paginated_query.test.tsx

@@ -275,20 +275,9 @@ describe("usePaginatedQuery pages", () => {
     resetPaginationId();
   });
 
-  test.each([
-    {
-      latestPageSize: undefined,
-    },
-    {
-      latestPageSize: "fixed" as const,
-    },
-    {
-      latestPageSize: "grow" as const,
-    },
-  ])("loadMore with latestPageSize $latestPageSize", ({ latestPageSize }) => {
+  test("loadMore", () => {
     const { result } = renderHook(
-      () =>
-        usePaginatedQuery(query, {}, { initialNumItems: 1, latestPageSize }),
+      () => usePaginatedQuery(query, {}, { initialNumItems: 1 }),
       { wrapper },
     );
     mockPage(
@@ -302,18 +291,6 @@ describe("usePaginatedQuery pages", () => {
         isDone: false,
       },
     );
-    mockPage(
-      {
-        numItems: 1,
-        cursor: null,
-        endCursor: "abc",
-      },
-      {
-        page: ["item1"],
-        continueCursor: "abc",
-        isDone: false,
-      },
-    );
     mockPage(
       {
         numItems: 2,

src/react/use_paginated_query.ts

@@ -153,13 +153,7 @@ const completeSplitQuery =
  * @param args - The arguments object for the query function, excluding
  * the `paginationOpts` property. That property is injected by this hook.
  * @param options - An object specifying the `initialNumItems` to be loaded in
- * the first page, and the `latestPageSize` to use.
- * @param options.latestPageSize controls how the latest page (the first page
- * until another page is loaded) size grows. With "fixed", the page size will
- * stay at the size specified by `initialNumItems` / `loadMore`. With "grow",
- * the page size will grow as new items are added within the range of the initial
- * page. Once multiple pages are loaded, all but the last page will grow, in
- * order to provide seamless pagination. See the docs for more details.
+ * the first page.
  * @returns A {@link UsePaginatedQueryResult} that includes the currently loaded
  * items, the status of the pagination, and a `loadMore` function.
  *
@@ -168,10 +162,7 @@ const completeSplitQuery =
 export function usePaginatedQuery<Query extends PaginatedQueryReference>(
   query: Query,
   args: PaginatedQueryArgs<Query> | "skip",
-  options: {
-    initialNumItems: number;
-    latestPageSize?: "grow" | "fixed";
-  },
+  options: { initialNumItems: number },
 ): UsePaginatedQueryReturnType<Query> {
   if (
     typeof options?.initialNumItems !== "number" ||
@@ -247,9 +238,9 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
     Value[],
     undefined | PaginationResult<Value>,
   ] = useMemo(() => {
-    let currResult: PaginationResult<Value> | undefined = undefined;
+    let currResult = undefined;
 
-    const allItems: Value[] = [];
+    const allItems = [];
     for (const pageKey of currState.pageKeys) {
       currResult = resultsObject[pageKey];
       if (currResult === undefined) {
@@ -362,33 +353,9 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
         if (!alreadyLoadingMore) {
           alreadyLoadingMore = true;
           setState((prevState) => {
-            let nextPageKey = prevState.nextPageKey;
+            const pageKeys = [...prevState.pageKeys, prevState.nextPageKey];
             const queries = { ...prevState.queries };
-            let ongoingSplits = prevState.ongoingSplits;
-            let pageKeys = prevState.pageKeys;
-            if (options.latestPageSize === "fixed") {
-              const lastPageKey = prevState.pageKeys.at(-1)!;
-              const boundLastPageKey = nextPageKey;
-              queries[boundLastPageKey] = {
-                query: prevState.query,
-                args: {
-                  ...prevState.args,
-                  paginationOpts: {
-                    ...(queries[lastPageKey]!.args
-                      .paginationOpts as unknown as PaginationOptions),
-                    endCursor: continueCursor,
-                  },
-                },
-              };
-              nextPageKey++;
-              ongoingSplits = {
-                ...ongoingSplits,
-                [lastPageKey]: [boundLastPageKey, nextPageKey],
-              };
-            } else {
-              pageKeys = [...prevState.pageKeys, nextPageKey];
-            }
-            queries[nextPageKey] = {
+            queries[prevState.nextPageKey] = {
               query: prevState.query,
               args: {
                 ...prevState.args,
@@ -399,19 +366,17 @@ export function usePaginatedQuery<Query extends PaginatedQueryReference>(
                 },
               },
             };
-            nextPageKey++;
             return {
               ...prevState,
+              nextPageKey: prevState.nextPageKey + 1,
               pageKeys,
-              nextPageKey,
               queries,
-              ongoingSplits,
             };
           });
         }
       },
     } as const;
-  }, [maybeLastResult, currState.nextPageKey, options.latestPageSize]);
+  }, [maybeLastResult, currState.nextPageKey]);
 
   return {
     results,