fix: stop auto scroll if user manually scrolling up (#2874)

Co-authored-by: James <james@jan.ai>
This commit is contained in:
NamH 2024-05-06 20:03:25 +07:00 committed by GitHub
parent 2008aae100
commit 0406b51615
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 5 deletions

View File

@ -1,4 +1,4 @@
import { ReactNode, useEffect, useRef } from 'react' import { ReactNode, useCallback, useEffect, useRef } from 'react'
type Props = { type Props = {
children: ReactNode children: ReactNode
@ -6,20 +6,44 @@ type Props = {
const ListContainer: React.FC<Props> = ({ children }) => { const ListContainer: React.FC<Props> = ({ children }) => {
const listRef = useRef<HTMLDivElement>(null) const listRef = useRef<HTMLDivElement>(null)
const prevScrollTop = useRef(0)
const isUserManuallyScrollingUp = useRef(false)
const handleScroll = useCallback((event: React.UIEvent<HTMLElement>) => {
const currentScrollTop = event.currentTarget.scrollTop
if (prevScrollTop.current > currentScrollTop) {
console.debug('User is manually scrolling up')
isUserManuallyScrollingUp.current = true
} else {
const currentScrollTop = event.currentTarget.scrollTop
const scrollHeight = event.currentTarget.scrollHeight
const clientHeight = event.currentTarget.clientHeight
if (currentScrollTop + clientHeight >= scrollHeight) {
console.debug('Scrolled to the bottom')
isUserManuallyScrollingUp.current = false
}
}
prevScrollTop.current = currentScrollTop
}, [])
useEffect(() => { useEffect(() => {
const scrollHeight = listRef.current?.scrollHeight ?? 0 if (isUserManuallyScrollingUp.current === true) return
const scrollHeight = listRef.current?.scrollHeight ?? 0
listRef.current?.scrollTo({ listRef.current?.scrollTo({
top: scrollHeight, top: scrollHeight,
behavior: 'instant', behavior: 'instant',
}) })
}) }, [listRef.current?.scrollHeight, isUserManuallyScrollingUp])
return ( return (
<div <div
ref={listRef} ref={listRef}
className="flex h-full w-full flex-col overflow-y-scroll" className="flex h-full w-full flex-col overflow-y-scroll"
onScroll={handleScroll}
> >
{children} {children}
</div> </div>

View File

@ -22,8 +22,8 @@ const ChatBody: React.FC = () => {
const downloadedModels = useAtomValue(downloadedModelsAtom) const downloadedModels = useAtomValue(downloadedModelsAtom)
const loadModelError = useAtomValue(loadModelErrorAtom) const loadModelError = useAtomValue(loadModelErrorAtom)
if (downloadedModels.length === 0) return <EmptyModel /> if (!downloadedModels.length) return <EmptyModel />
if (messages.length === 0) return <EmptyThread /> if (!messages.length) return <EmptyThread />
return ( return (
<ListContainer> <ListContainer>