blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Calendar scroll):ensures the calendar scroll watcher always triggers by also passing the current focusDate of the Calendar

Browse Source
This commit is contained in:
SimonGschnell
2024-11-15 09:52:40 +01:00
parent 6b828179b0
commit ef21936975
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/js/components/Calendar/Calendar.js
+19 -18
View File
@@ -60,23 +60,22 @@ export default {
},
watch:{
// scroll to the first event if the html element was found
async scrollTime(newScrollTime){
scrollTime({focusDate,scrollTime}){
// return early if the scrollTime is not set
if(!scrollTime) return;
// scroll the Stundenplan to the closest event
await Vue.nextTick();
let previousScrollAnchor = document.getElementById('scroll' + (newScrollTime-1) + this.focusDate.d + this.focusDate.w)
let scrollAnchor = document.getElementById('scroll' + newScrollTime+this.focusDate.d+this.focusDate.w);
if (previousScrollAnchor)
{
previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
}
else
{
if (scrollAnchor)
{
scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
Vue.nextTick(()=>{
let previousScrollAnchor = document.getElementById('scroll' + (scrollTime - 1) + this.focusDate.d + this.focusDate.w)
let scrollAnchor = document.getElementById('scroll' + scrollTime + this.focusDate.d + this.focusDate.w);
if (previousScrollAnchor) {
previousScrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
}
}
else {
if (scrollAnchor) {
scrollAnchor.scrollIntoView({ behavior: 'smooth', block: 'start' });
}
}
});
}
},
emits: [
@@ -126,16 +125,18 @@ export default {
}, {});
},
// returns the hour of the earliest event, used to scroll to the events in the calendar (week / day view)
scrollTime: function () {
scrollTime() {
// return the first beginning time of the filtered events
if(this.filteredEvents && Array.isArray(this.filteredEvents) && this.filteredEvents.length > 0)
{
return parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
let scrollTime = parseInt(this.filteredEvents.sort((a, b) => parseInt(a.beginn) - parseInt(b.beginn))[0].beginn);
// to ensure that the scrollTime watcher triggers even if the scrollTime doesn't change, it returns both the scrollTime and the focusDate
return { focusDate: this.focusDate, scrollTime };
}
// there is no event that matches the current view mode constraints
else
{
return null;
return { focusDate: this.focusDate, scrollTime: null };
}
},
// filters the events based on the current calendar view mode