mirror of
https://github.com/coracle-social/flotilla.git
synced 2025-12-11 11:27:03 +00:00
Fix a couple calendar bugs
This commit is contained in:
@@ -185,8 +185,6 @@ export const makeCalendarFeed = ({
|
|||||||
events.update($events => $events.filter(e => !ids.includes(e.id)))
|
events.update($events => $events.filter(e => !ids.includes(e.id)))
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleDelete = (e: TrustedEvent) => removeEvents(getTagValues(["e", "a"], e.tags))
|
|
||||||
|
|
||||||
const onThunk = (thunk: Thunk) => {
|
const onThunk = (thunk: Thunk) => {
|
||||||
if (matchFilters(feedFilters, thunk.event)) {
|
if (matchFilters(feedFilters, thunk.event)) {
|
||||||
insertEvent(thunk.event)
|
insertEvent(thunk.event)
|
||||||
@@ -194,8 +192,6 @@ export const makeCalendarFeed = ({
|
|||||||
thunk.controller.signal.addEventListener("abort", () => {
|
thunk.controller.signal.addEventListener("abort", () => {
|
||||||
removeEvents([thunk.event.id])
|
removeEvents([thunk.event.id])
|
||||||
})
|
})
|
||||||
} else if (thunk.event.kind === DELETE) {
|
|
||||||
handleDelete(thunk.event)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,7 +200,6 @@ export const makeCalendarFeed = ({
|
|||||||
filters: subscriptionFilters,
|
filters: subscriptionFilters,
|
||||||
onEvent: (e: TrustedEvent) => {
|
onEvent: (e: TrustedEvent) => {
|
||||||
if (matchFilters(feedFilters, e)) insertEvent(e)
|
if (matchFilters(feedFilters, e)) insertEvent(e)
|
||||||
if (e.kind === DELETE) handleDelete(e)
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -62,6 +62,10 @@
|
|||||||
let initialScrollDone = false
|
let initialScrollDone = false
|
||||||
|
|
||||||
$effect(() => {
|
$effect(() => {
|
||||||
|
if (items.length === 0) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
if (initialScrollDone) {
|
if (initialScrollDone) {
|
||||||
// If new events are prepended, adjust the scroll position so that the viewport content remains anchored
|
// If new events are prepended, adjust the scroll position so that the viewport content remains anchored
|
||||||
if (prevFirstEventId && items[0].event.id !== prevFirstEventId) {
|
if (prevFirstEventId && items[0].event.id !== prevFirstEventId) {
|
||||||
@@ -72,7 +76,7 @@
|
|||||||
element.scrollTop += delta
|
element.scrollTop += delta
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (items.length > 0) {
|
} else {
|
||||||
const {event} = items.find(({event}) => getStart(event) >= now()) || last(items)
|
const {event} = items.find(({event}) => getStart(event) >= now()) || last(items)
|
||||||
const {offsetTop, clientHeight} = document.querySelector(
|
const {offsetTop, clientHeight} = document.querySelector(
|
||||||
".calendar-event-" + event.id,
|
".calendar-event-" + event.id,
|
||||||
@@ -83,10 +87,8 @@
|
|||||||
initialScrollDone = true
|
initialScrollDone = true
|
||||||
}
|
}
|
||||||
|
|
||||||
if (items.length > 0) {
|
previousScrollHeight = element.scrollHeight
|
||||||
previousScrollHeight = element.scrollHeight
|
prevFirstEventId = items[0].event.id
|
||||||
prevFirstEventId = items[0].event.id
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user