more scrolling shenanigans
This commit is contained in:
parent
f0bbb6d277
commit
d622a61fd1
3 changed files with 29 additions and 17 deletions
|
|
@ -3,6 +3,7 @@ import { onMounted, onUnmounted, ref } from 'vue'
|
|||
export function useScrollPosition() {
|
||||
const x = ref(0)
|
||||
const y = ref(0)
|
||||
const inProgress = ref(false)
|
||||
|
||||
const update = (e) => {
|
||||
x.value = window.scrollX
|
||||
|
|
@ -17,5 +18,11 @@ export function useScrollPosition() {
|
|||
window.removeEventListener('scroll', update)
|
||||
})
|
||||
|
||||
return { x, y }
|
||||
const scrollBy = async (x1, y1, options) => {
|
||||
inProgress.value = true
|
||||
await window.scrollBy(x1, y1, options)
|
||||
inProgress.value = false
|
||||
}
|
||||
|
||||
return { x, y, scrollBy, inProgress }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,10 +4,15 @@ import { computed, ref, watch, nextTick } from 'vue'
|
|||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
import { useStatusesStore } from 'src/stores/statuses.js'
|
||||
|
||||
import { useScrollPosition } from 'src/composables/useScrollPosition.js'
|
||||
import { useWindowSize } from 'src/composables/useWindowSize.js'
|
||||
|
||||
export function useVirtualScrolling(conversation, body, anchorStatus) {
|
||||
export function useVirtualScrolling(
|
||||
conversation,
|
||||
body,
|
||||
scrollPosition,
|
||||
scrollCompensation,
|
||||
anchorStatus,
|
||||
) {
|
||||
const getStatusObject = (id) => useStatusesStore().allStatuses.get(id)
|
||||
|
||||
const { mergedConfig } = storeToRefs(useMergedConfigStore())
|
||||
|
|
@ -64,7 +69,7 @@ export function useVirtualScrolling(conversation, body, anchorStatus) {
|
|||
}
|
||||
|
||||
// Scrolling
|
||||
const { y: scrollY } = useScrollPosition()
|
||||
const { y: scrollY, inProgress: scrollInProgress } = scrollPosition
|
||||
const { height: windowHeight } = useWindowSize()
|
||||
|
||||
const topScrollBoundary = ref(0)
|
||||
|
|
@ -125,6 +130,8 @@ export function useVirtualScrolling(conversation, body, anchorStatus) {
|
|||
})
|
||||
|
||||
watch(heightChart, async (newVal, oldVal) => {
|
||||
if (scrollInProgress) return
|
||||
if (!scrollCompensation) return
|
||||
pauseWatchers()
|
||||
const getAnchoredEl = (list) => anchor.value
|
||||
? list.find(({ id }) => id === anchor.value)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue