diff --git a/apps/calendar/apps/web/src/lib/components/calendar/DayView.svelte b/apps/calendar/apps/web/src/lib/components/calendar/DayView.svelte index 34f4a64b0..f21b2776c 100644 --- a/apps/calendar/apps/web/src/lib/components/calendar/DayView.svelte +++ b/apps/calendar/apps/web/src/lib/components/calendar/DayView.svelte @@ -813,24 +813,26 @@ /> {/each} - - {#each getScheduledTasks() as task (task.id)} - {@const isTaskBeingDragged = isTaskDragging && draggedTask?.id === task.id} - {@const isTaskBeingResized = isTaskResizing && resizeTask?.id === task.id} - - {/each} + + {#if settingsStore.showTasksInCalendar} + {#each getScheduledTasks() as task (task.id)} + {@const isTaskBeingDragged = isTaskDragging && draggedTask?.id === task.id} + {@const isTaskBeingResized = isTaskResizing && resizeTask?.id === task.id} + + {/each} + {/if} {#if overflowEvents.before.length > 0} diff --git a/apps/calendar/apps/web/src/lib/components/calendar/MultiDayView.svelte b/apps/calendar/apps/web/src/lib/components/calendar/MultiDayView.svelte index abfb51478..038b02d2b 100644 --- a/apps/calendar/apps/web/src/lib/components/calendar/MultiDayView.svelte +++ b/apps/calendar/apps/web/src/lib/components/calendar/MultiDayView.svelte @@ -976,37 +976,39 @@ {/each} - - {#each getScheduledTasksForDay(day) as task (task.id)} - {@const isTaskBeingDragged = isTaskDragging && draggedTask?.id === task.id} - {@const isTaskBeingResized = isTaskResizing && resizeTask?.id === task.id} - {@const isTaskCrossDayDrag = - isTaskBeingDragged && - taskDragTargetDay !== null && - !isSameDay(day, taskDragTargetDay)} - - {/each} + + {#if settingsStore.showTasksInCalendar} + {#each getScheduledTasksForDay(day) as task (task.id)} + {@const isTaskBeingDragged = isTaskDragging && draggedTask?.id === task.id} + {@const isTaskBeingResized = isTaskResizing && resizeTask?.id === task.id} + {@const isTaskCrossDayDrag = + isTaskBeingDragged && + taskDragTargetDay !== null && + !isSameDay(day, taskDragTargetDay)} + + {/each} - - {#if isTaskDragging && draggedTask && taskDragTargetDay && isSameDay(day, taskDragTargetDay) && !getScheduledTasksForDay(day).some((t) => t.id === draggedTask!.id)} - + + {#if isTaskDragging && draggedTask && taskDragTargetDay && isSameDay(day, taskDragTargetDay) && !getScheduledTasksForDay(day).some((t) => t.id === draggedTask!.id)} + + {/if} {/if} diff --git a/apps/calendar/apps/web/src/lib/components/calendar/ViewCarousel.svelte b/apps/calendar/apps/web/src/lib/components/calendar/ViewCarousel.svelte index 8ea78cb75..4658e609f 100644 --- a/apps/calendar/apps/web/src/lib/components/calendar/ViewCarousel.svelte +++ b/apps/calendar/apps/web/src/lib/components/calendar/ViewCarousel.svelte @@ -1,8 +1,10 @@ @@ -331,7 +367,7 @@ -