Skip to content

Commit

Permalink
fix(VCalendar): hide adjacent events without show-adjacent-months (#1…
Browse files Browse the repository at this point in the history
  • Loading branch information
nekosaur authored Apr 10, 2024
1 parent 2fe65f0 commit f90ada3
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions packages/vuetify/src/labs/VCalendar/VCalendarMonthDay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,24 +54,27 @@ export const VCalendarMonthDay = genericComponent< VCalendarMonthDaySlots >()({
)}
</div>
)}
<div key="content" class="v-calendar-weekly__day-content">
{ slots.content?.() ?? (
<div>
<div class="v-calendar-weekly__day-alldayevents-container">
{ props.events?.filter(event => event.allDay).map(event => (
<VCalendarEvent day={ props.day } event={ event } allDay />
))}
</div>
<div class="v-calendar-weekly__day-events-container">
{ props.events?.filter(event => !event.allDay).map(event => (
<VCalendarEvent day={ props.day } event={ event } />
))}

{ !props.day?.isHidden && (
<div key="content" class="v-calendar-weekly__day-content">
{ slots.content?.() ?? (
<div>
<div class="v-calendar-weekly__day-alldayevents-container">
{ props.events?.filter(event => event.allDay).map(event => (
<VCalendarEvent day={ props.day } event={ event } allDay />
))}
</div>
<div class="v-calendar-weekly__day-events-container">
{ props.events?.filter(event => !event.allDay).map(event => (
<VCalendarEvent day={ props.day } event={ event } />
))}
</div>
</div>
</div>
)}
</div>
)}
</div>
)}

{ slots.default?.() }
{ !props.day?.isHidden && slots.default?.() }
</div>
)
})
Expand Down

0 comments on commit f90ada3

Please sign in to comment.