Compare commits

...

4 commits

Author SHA1 Message Date
Henry Jameson
e22eba8806 Merge branch 'virtual-scrolling-2.0' into shigusegubu-themes3 2026-09-16 03:06:59 +03:00
Henry Jameson
c4b3eff348 focusedId shenanigans 2026-09-16 03:06:29 +03:00
Henry Jameson
fb09a58023 Merge branch 'virtual-scrolling-2.0' into shigusegubu-themes3 2026-09-16 02:04:34 +03:00
Henry Jameson
5c316ff175 omg i think i actually did it 2026-09-16 02:04:23 +03:00
3 changed files with 48 additions and 46 deletions

View file

@ -320,8 +320,8 @@ export default {
}
const diveIntoStatus = (id) => scrollTo(new Set([id]))
const diveToTopLevel = () => scrollTo(new Set([currentAncestors.value[0].id]))
watch(focusedId, async (neu) => {
if (!isPage.value) return
watch(focusedId, async (neu, old) => {
if (neu) scrollTo(new Set([neu]))
})

View file

@ -1,5 +1,5 @@
import { storeToRefs } from 'pinia'
import { computed, provide, ref, watch } from 'vue'
import { computed, provide, ref, watch, nextTick } from 'vue'
import { useMergedConfigStore } from 'src/stores/merged_config.js'
import { useOAuthStore } from 'src/stores/oauth.js'
@ -28,49 +28,12 @@ export function useConversation(statusId, expanded) {
mastoUserSocketStatus === WSConnectionStatus.JOINED,
)
// # Focus
const focused = ref(null)
const { mainStatus: focusedStatus } = useMainStatus(focused)
const setFocused = (id) => {
focused.value = id
}
watch(mainStatusId, (val) => setFocused(val))
const focusedId = computed(() => expanded.value ? focusedStatus.value?.id : null)
provide('focusedId', focusedId)
watch(statusId, (neu, old) => {
if (neu) setFocused(neu)
}, { immediate: true })
watch(statusId, (neu, old) => {
if (neu !== old) {
fetchConversation()
}
})
watch(
expanded,
(value) => {
setFocused(value ? mainStatusId.value : null)
},
{ immediate: true },
)
watch(
focusedStatus,
(newVal, oldVal) => {
if (!newVal) return
if (newVal?.id === oldVal?.id) return // prevents infinite loop
if (!streamingEnabled.value) {
useStatusesStore().fetchStatus(newVal.id)
}
useStatusesStore().fetchFavsAndRepeats(newVal.id)
useStatusesStore().fetchEmojiReactions(newVal.id)
},
{ immediate: true },
)
const sortById = (a, b) => {
const idA = a.type === 'retweet' ? a.retweeted_status.id : a.id
const idB = b.type === 'retweet' ? b.retweeted_status.id : b.id
@ -88,9 +51,14 @@ export function useConversation(statusId, expanded) {
return idA < idB ? -1 : 1
}
}
const fullConversation = ref(new Set([currentStatus.value?.id].filter(Boolean)))
const fullyLoaded = ref(false)
const conversationId = computed(
() => mainStatus.value?.statusnet_conversation_id,
)
watch(conversationId, (neu, old) => {
if (neu !== old) fullyLoaded.value = false
})
const conversation = computed(() => {
if (!currentStatus.value) {
return []
@ -100,15 +68,12 @@ export function useConversation(statusId, expanded) {
return [currentStatus.value]
}
const conversation = useStatusesStore().conversations.get(
conversationId.value,
)
return [...conversation.keys()]
return [...fullConversation.value.keys()]
.map((k) => useStatusesStore().allStatuses.get(k))
.filter((status) => status.type != 'repeat') // Old backend behavior?
.toSorted(sortById)
})
const replies = computed(() =>
conversation.value.reduce(
(result, { id, in_reply_to_status_id: irid }, index) => {
@ -145,6 +110,15 @@ export function useConversation(statusId, expanded) {
statuses: descendants,
timestamp,
})
fullConversation.value = new Set([
...ancestors,
currentStatus.value,
...descendants
].map(({ id }) => id))
await nextTick()
fullyLoaded.value = true
} else {
try {
loadError.value = null
@ -155,6 +129,9 @@ export function useConversation(statusId, expanded) {
})
useStatusesStore().addNewStatuses({ statuses: [status] })
fullConversation.value = new Set([
currentStatus.value,
].map(({ id }) => id))
fetchConversation()
} catch (error) {
console.error(error)
@ -163,6 +140,32 @@ export function useConversation(statusId, expanded) {
}
}
// # Focus
const focused = ref(null)
const { mainStatus: focusedStatus } = useMainStatus(focused)
const setFocused = (id) => {
focused.value = id
}
watch(statusId, (val) => setFocused(val), { immediate: true })
const focusedId = computed(() => (expanded.value && fullyLoaded.value) ? focusedStatus.value?.id : null)
provide('focusedId', focusedId)
watch(
focusedStatus,
(newVal, oldVal) => {
if (!newVal) return
if (newVal?.id === oldVal?.id) return // prevents infinite loop
if (!streamingEnabled.value) {
useStatusesStore().fetchStatus(newVal.id)
}
useStatusesStore().fetchFavsAndRepeats(newVal.id)
useStatusesStore().fetchEmojiReactions(newVal.id)
},
{ immediate: true },
)
return {
focusedId,
conversationId,

View file

@ -297,7 +297,6 @@ export function useVirtualScrolling({
const elementMiddle = element.top + element.height / 2
const desiredTopBoundary = Math.min(element.top, elementMiddle - (windowHeight.value - offset.value) / 2)
console.log(element, desiredTopBoundary, topScrollBoundary.value)
scrollBy(0, desiredTopBoundary - topScrollBoundary.value)
resumeWatchers()