Skip to content
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

fix: dataset pagination state keeps resetting when filters changed #15268

Merged
merged 2 commits into from
Mar 8, 2025
Merged

fix: dataset pagination state keeps resetting when filters changed #15268

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8322cbb
fix: dataset pagination state keeps resetting when filters changed
nht1206 Mar 8, 2025
4407093
fix: style check failed
nht1206 Mar 8, 2025
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
29 changes: 18 additions & 11 deletions web/app/(commonLayout)/datasets/Datasets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client'

import { useEffect, useRef } from 'react'
import { useCallback, useEffect, useRef } from 'react'
import useSWRInfinite from 'swr/infinite'
import { debounce } from 'lodash-es'
import { useTranslation } from 'react-i18next'
Expand Down Expand Up @@ -62,21 +62,28 @@
useEffect(() => {
loadingStateRef.current = isLoading
document.title = `${t('dataset.knowledge')} - Dify`
}, [isLoading])
}, [isLoading, t])

useEffect(() => {
const onScroll = debounce(() => {
if (!loadingStateRef.current) {
const { scrollTop, clientHeight } = containerRef.current!
const anchorOffset = anchorRef.current!.offsetTop
const onScroll = useCallback(

Check warning on line 67 in web/app/(commonLayout)/datasets/Datasets.tsx

View workflow job for this annotation

GitHub Actions / Web Style 

React Hook useCallback received a function whose dependencies are unknown. Pass an inline function instead
debounce(() => {
if (!loadingStateRef.current && containerRef.current && anchorRef.current) {
const { scrollTop, clientHeight } = containerRef.current
const anchorOffset = anchorRef.current.offsetTop
if (anchorOffset - scrollTop - clientHeight < 100)
setSize(size => size + 1)
}
}, 50)
}, 50),
[setSize],
)

containerRef.current?.addEventListener('scroll', onScroll)
return () => containerRef.current?.removeEventListener('scroll', onScroll)
}, [])
useEffect(() => {
const currentContainer = containerRef.current
currentContainer?.addEventListener('scroll', onScroll)
return () => {
currentContainer?.removeEventListener('scroll', onScroll)
onScroll.cancel()
}
}, [onScroll])

Check warning on line 86 in web/app/(commonLayout)/datasets/Datasets.tsx

View workflow job for this annotation

GitHub Actions / Web Style 

React Hook useEffect has a missing dependency: 'containerRef'. Either include it or remove the dependency array

return (
<nav className='grid content-start grid-cols-1 gap-4 px-12 pt-2 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4 grow shrink-0'>
Expand Down
Loading