diff --git a/src/components/Dashboard/common/ObjectTable.jsx b/src/components/Dashboard/common/ObjectTable.jsx index 64ee3c5..e5486c3 100644 --- a/src/components/Dashboard/common/ObjectTable.jsx +++ b/src/components/Dashboard/common/ObjectTable.jsx @@ -227,7 +227,7 @@ const ObjectTable = forwardRef( const loadNextPage = useCallback(() => { const highestPage = Math.max(...pages.map((p) => p.pageNum)) const nextPage = highestPage + 1 - if (hasMore) { + if (hasMore && lazyLoading == false) { setPages((prev) => { const filteredPages = prev.map((page) => ({ ...page, @@ -244,13 +244,13 @@ const ObjectTable = forwardRef( }) fetchData(nextPage) } - }, [pages, createSkeletonData, fetchData, hasMore]) + }, [pages, createSkeletonData, fetchData, hasMore, lazyLoading]) const loadPreviousPage = useCallback(() => { const lowestPage = Math.min(...pages.map((p) => p.pageNum)) const prevPage = lowestPage - 1 - if (prevPage > 0) { + if (prevPage > 0 && lazyLoading == false) { setPages((prev) => { const filteredPages = prev.map((page) => ({ ...page, @@ -267,7 +267,7 @@ const ObjectTable = forwardRef( }) fetchData(prevPage) } - }, [pages, createSkeletonData, fetchData]) + }, [pages, createSkeletonData, fetchData, lazyLoading]) const handleScroll = useCallback( (e) => {