Fixed loading glitch if web server becomes unresponsive.
This commit is contained in:
parent
c2f55a5967
commit
8c622420bb
@ -227,7 +227,7 @@ const ObjectTable = forwardRef(
|
|||||||
const loadNextPage = useCallback(() => {
|
const loadNextPage = useCallback(() => {
|
||||||
const highestPage = Math.max(...pages.map((p) => p.pageNum))
|
const highestPage = Math.max(...pages.map((p) => p.pageNum))
|
||||||
const nextPage = highestPage + 1
|
const nextPage = highestPage + 1
|
||||||
if (hasMore) {
|
if (hasMore && lazyLoading == false) {
|
||||||
setPages((prev) => {
|
setPages((prev) => {
|
||||||
const filteredPages = prev.map((page) => ({
|
const filteredPages = prev.map((page) => ({
|
||||||
...page,
|
...page,
|
||||||
@ -244,13 +244,13 @@ const ObjectTable = forwardRef(
|
|||||||
})
|
})
|
||||||
fetchData(nextPage)
|
fetchData(nextPage)
|
||||||
}
|
}
|
||||||
}, [pages, createSkeletonData, fetchData, hasMore])
|
}, [pages, createSkeletonData, fetchData, hasMore, lazyLoading])
|
||||||
|
|
||||||
const loadPreviousPage = useCallback(() => {
|
const loadPreviousPage = useCallback(() => {
|
||||||
const lowestPage = Math.min(...pages.map((p) => p.pageNum))
|
const lowestPage = Math.min(...pages.map((p) => p.pageNum))
|
||||||
const prevPage = lowestPage - 1
|
const prevPage = lowestPage - 1
|
||||||
|
|
||||||
if (prevPage > 0) {
|
if (prevPage > 0 && lazyLoading == false) {
|
||||||
setPages((prev) => {
|
setPages((prev) => {
|
||||||
const filteredPages = prev.map((page) => ({
|
const filteredPages = prev.map((page) => ({
|
||||||
...page,
|
...page,
|
||||||
@ -267,7 +267,7 @@ const ObjectTable = forwardRef(
|
|||||||
})
|
})
|
||||||
fetchData(prevPage)
|
fetchData(prevPage)
|
||||||
}
|
}
|
||||||
}, [pages, createSkeletonData, fetchData])
|
}, [pages, createSkeletonData, fetchData, lazyLoading])
|
||||||
|
|
||||||
const handleScroll = useCallback(
|
const handleScroll = useCallback(
|
||||||
(e) => {
|
(e) => {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user