fix: bug on infinity dataloader

Author: Lawndlwd

.changeset/spotty-words-flow.md

@@ -0,0 +1,5 @@
+---
+"@scaleway/use-dataloader": patch
+---
+
+Fix bug on infinity data loader

packages/fuzzy-search/src/__tests__/index.test.tsx

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import { isFuzzyMatch, levenshteinDistance, normalizeString } from ".."
+import { isFuzzyMatch, levenshteinDistance, normalizeString } from '..'
 
 describe('fuzzySearch', () => {
   describe('normalizeString', () => {

packages/use-dataloader/src/useInfiniteDataLoader.ts

@@ -55,13 +55,15 @@ export const useInfiniteDataLoader = <
       getNextPage ? getNextPage(...params) : undefined,
   )
 
-  const paramsRef = useRef({
-    ...baseParams,
-    [pageParamKey]: page,
-  })
-
-  const getMethodRef = useRef(() => method(paramsRef.current))
+  const paramsMemo = useMemo(
+    () => ({
+      ...baseParams,
+      [pageParamKey]: page,
+    }),
+    [baseParams, page, pageParamKey],
+  )
 
+  const getMethodRef = useRef(() => method(paramsMemo))
   const getOnSuccessRef = useRef(
     (...params: Parameters<NonNullable<typeof onSuccess>>) =>
       onSuccess?.(...params),
@@ -99,23 +101,28 @@ export const useInfiniteDataLoader = <
       'infinite',
       page as string | number,
     ])
+
     // Clean bad requests in the array
     requestRefs.current = requestRefs.current.filter(request => {
       if (request.key.startsWith(computeKey(baseQueryKey))) {
         return true
       }
+
       request.removeObserver(forceRerender.current)
 
       return false
     })
+
     const requestInRef = requestRefs.current.find(request =>
       request.key.endsWith(currentQueryKey),
     )
+
     if (!requestInRef) {
       const request = getOrAddRequest<ResultType, ErrorType>(currentQueryKey, {
         enabled,
         method: getMethodRef.current,
       })
+
       if (!request.observers.includes(forceRerender.current)) {
         request.addObserver(forceRerender.current)
       }
@@ -176,17 +183,13 @@ export const useInfiniteDataLoader = <
 
   const loadMoreRef = useRef(() => {
     if (nextPageRef.current) {
-      paramsRef.current = {
-        ...baseParams,
-        [pageParamKey]: nextPageRef.current,
-      }
       setPage(curr => nextPageRef.current ?? curr)
     }
   })
 
   useEffect(() => {
-    request.method = () => method(paramsRef.current)
-  }, [method, request])
+    request.method = () => method(paramsMemo)
+  }, [method, request, paramsMemo])
 
   useEffect(() => {
     if (keepPreviousData) {
@@ -210,28 +213,23 @@ export const useInfiniteDataLoader = <
         .then(async result => {
           nextPageRef.current = getNextPageFnRef.current(
             result,
-            paramsRef.current,
+            paramsMemo,
           ) as typeof page
           await onSuccessLoad(result)
         })
         .catch(onFailedLoad)
     }
     optimisticIsLoadingRef.current = false
-  }, [needLoad, request])
+  }, [needLoad, request, paramsMemo])
 
-  useEffect(() => {
-    paramsRef.current = {
-      ...baseParams,
-      [pageParamKey]: page,
-    }
-    /* eslint-disable-next-line react-hooks/exhaustive-deps */
-  }, [baseParams, pageParamKey])
   useEffect(() => {
     getOnSuccessRef.current = (...params) => onSuccess?.(...params)
   }, [onSuccess])
+
   useEffect(() => {
     getOnErrorRef.current = err => onError?.(err) ?? onGlobalError?.(err)
   }, [onError, onGlobalError])
+
   useEffect(() => {
     getNextPageFnRef.current = (...params) =>
       getNextPage ? getNextPage(...params) : undefined