wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-13 19:58:09 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed auto-scrolling in Scroller (#2699)

Browse Source 
Signed-off-by: Alexander Platov <sas_lord@mail.ru>
This commit is contained in:
Alexander Platov 2023-03-01 21:39:20 +03:00 committed by GitHub
parent 18e9b76c61
commit 3f8d20fd10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/ui/src/components/Scroller.svelte
View File

@ -225,13 +225,6 @@
}
if (inter.size) checkIntersectionFade()
renderFade()
if (autoscroll) {
if (scrolling && divScroll.scrollHeight - divScroll.clientHeight - divScroll.scrollTop > 10 && !firstScroll) {
scrolling = false
}
if (!scrolling && belowContent && belowContent <= 10) scrolling = true
}
}
if (!isScrolling) checkBar()
if (!isScrolling && horizontal) checkBarH()
@ -245,9 +238,9 @@
}
const scrollDown = (): void => {
if (divScroll) divScroll.scrollTop = divScroll.scrollHeight - divHeight
if (divScroll) divScroll.scrollTop = divScroll.scrollHeight - divHeight + 2
}
$: if (scrolling && belowContent && belowContent > 10) scrollDown()
$: if (scrolling && belowContent && belowContent > 0) scrollDown()
const checkIntersection = (entries: IntersectionObserverEntry[], observer: IntersectionObserver) => {
const interArr: Element[] = []
@ -287,9 +280,17 @@
})
}
const wheelEvent = (e: WheelEvent) => {
e = e || window.event
const deltaY = e.deltaY
if (deltaY < 0 && autoscroll && scrolling && beforeContent && beforeContent > 0) scrolling = false
else if (deltaY > 0 && autoscroll && !scrolling && belowContent && belowContent <= 10) scrolling = true
}
let observer: IntersectionObserver
onMount(() => {
if (divScroll && divBox) {
divScroll.addEventListener('wheel', wheelEvent)
divScroll.addEventListener('scroll', checkFade)
checkBar()
if (horizontal) checkBarH()
@ -297,7 +298,10 @@
})
onDestroy(() => {
if (observer) observer.disconnect()
if (divScroll) divScroll.removeEventListener('scroll', checkFade)
if (divScroll) {
divScroll.removeEventListener('wheel', wheelEvent)
divScroll.removeEventListener('scroll', checkFade)
}
})
let oldTop: number