Merge pull request #265 from psteinroe/fix/remove-usememo

fix: remove unnecessary useMemo
psteinroe · Aug 8, 2023 · 7bcbb9f · 7bcbb9f · vercel · Aug 8, 2023
2 parents b4495da + 92caf9e
commit 7bcbb9f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/.changeset/nice-balloons-suffer.md b/.changeset/nice-balloons-suffer.md
@@ -0,0 +1,5 @@
+---
+"@supabase-cache-helpers/postgrest-swr": patch
+---
+
+fix: remove unnecessary useMemo calls
diff --git a/packages/postgrest-swr/src/query/use-infinite-offset-pagination-query.ts b/packages/postgrest-swr/src/query/use-infinite-offset-pagination-query.ts
@@ -94,13 +94,9 @@ function useInfiniteOffsetPaginationQuery<
 
   const [currentPageIndex, setCurrentPageIndex] = useState(0);
 
-  const { data: parsedData, hasMore } = useMemo(() => {
-    return {
-      data: (data ?? []).map((p) => p.data),
-      hasMore:
-        Array.isArray(data) && data.length > 0 && data[data.length - 1].hasMore,
-    };
-  }, [data]);
+  const parsedData = (data ?? []).map((p) => p.data);
+  const hasMore =
+    Array.isArray(data) && data.length > 0 && data[data.length - 1].hasMore;
 
   return {
     pages: parsedData,

diff --git a/packages/postgrest-swr/src/query/use-offset-infinite-query.ts b/packages/postgrest-swr/src/query/use-offset-infinite-query.ts
@@ -48,7 +48,7 @@ function useOffsetInfiniteQuery<
     Relationships
   > | null,
   config?: SWRInfiniteConfiguration & { pageSize?: number }
-): UseInfiniteQueryReturn<Result> {
+): UseOffsetInfiniteQueryReturn<Result> {
   return useSWRInfinite<
     Exclude<PostgrestResponse<Result>['data'], null>,
     PostgrestError

diff --git a/packages/postgrest-swr/src/query/use-offset-infinite-scroll-query.ts b/packages/postgrest-swr/src/query/use-offset-infinite-scroll-query.ts
@@ -77,7 +77,7 @@ function useOffsetInfiniteScrollQuery<
     Relationships
   > | null,
   config?: SWRInfiniteConfiguration & { pageSize?: number }
-): UseInfiniteScrollQueryReturn<Result> {
+): UseOffsetInfiniteScrollQueryReturn<Result> {
   const { data, setSize, size, isValidating, ...rest } = useSWRInfinite<
     PostgrestHasMorePaginationResponse<Result>,
     PostgrestError
@@ -106,16 +106,11 @@ function useOffsetInfiniteScrollQuery<
     }
   );
 
-  const { data: flatData, hasMore } = useMemo(() => {
-    return {
-      data: (data ?? []).flatMap((p) => p.data),
-      hasMore:
-        Array.isArray(data) && data.length > 0 && data[data.length - 1].hasMore,
-    };
-  }, [data]);
+  const hasMore =
+    Array.isArray(data) && data.length > 0 && data[data.length - 1].hasMore;
 
   return {
-    data: flatData,
+    data: (data ?? []).flatMap((p) => p.data),
     size,
     setSize,
     loadMore: hasMore ? () => setSize(size + 1) : null,