Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(useInfiniteScroll): improve promise handling and add flush post to watch #5122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −12
Open

fix(useInfiniteScroll): improve promise handling and add flush post to watch #5122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions packages/core/useInfiniteScroll/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function useInfiniteScroll<T extends InfiniteScrollElement>(
function checkAndLoad() {
state.measure()

if (!observedElement.value || !isElementVisible.value || !canLoad.value)
if (!observedElement.value || !isElementVisible.value || !canLoad.value || promise.value)
return

const { scrollHeight, clientHeight, scrollWidth, clientWidth } = observedElement.value as HTMLElement
Expand All @@ -94,23 +94,21 @@ export function useInfiniteScroll<T extends InfiniteScrollElement>(
: scrollWidth <= clientWidth

if (state.arrivedState[direction] || isNarrower) {
if (!promise.value) {
promise.value = Promise.all([
onLoadMore(state),
new Promise(resolve => setTimeout(resolve, interval)),
])
.finally(() => {
promise.value = null
nextTick(() => checkAndLoad())
})
}
promise.value = Promise.all([
onLoadMore(state),
new Promise(resolve => setTimeout(resolve, interval)),
])
.finally(() => {
promise.value = null
nextTick(() => checkAndLoad())
})
}
}

const stop = watch(
() => [state.arrivedState[direction], isElementVisible.value, canLoad.value],
checkAndLoad,
{ immediate: true },
{ immediate: true, flush: 'post' },
)

tryOnUnmounted(stop)
Expand Down
Loading