Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(VCalendar): not usable without v-model #19586

Merged
merged 1 commit into from
Apr 10, 2024
Merged

fix(VCalendar): not usable without v-model #19586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/vuetify/src/composables/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ export function useCalendar (props: CalendarProps) {
}

const daysInWeek = computed(() => {
const lastDay = adapter.startOfWeek(model.value)
const lastDay = adapter.startOfWeek(displayValue.value)
const week = []
for (let day = 0; day <= 6; day++) {
week.push(adapter.addDays(lastDay, day))
Expand Down
23 changes: 12 additions & 11 deletions packages/vuetify/src/labs/VCalendar/VCalendar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,31 +41,31 @@ export const VCalendar = genericComponent<VCalendarSlots>()({
setup (props, { emit, slots }) {
const adapter = useDate()

const { daysInMonth, daysInWeek, genDays, model, weekNumbers } = useCalendar(props as any)
const { daysInMonth, daysInWeek, genDays, model, displayValue, weekNumbers } = useCalendar(props as any)

const dayNames = adapter.getWeekdays()

function onClickNext () {
if (props.viewMode === 'month') {
model.value = [adapter.addMonths(model.value[0], 1)]
model.value = [adapter.addMonths(displayValue.value, 1)]
}
if (props.viewMode === 'week') {
model.value = [adapter.addDays(model.value[0], 7)]
model.value = [adapter.addDays(displayValue.value, 7)]
}
if (props.viewMode === 'day') {
model.value = [adapter.addDays(model.value[0], 1)]
model.value = [adapter.addDays(displayValue.value, 1)]
}
}

function onClickPrev () {
if (props.viewMode === 'month') {
model.value = [adapter.addMonths(model.value[0], -1)]
model.value = [adapter.addMonths(displayValue.value, -1)]
}
if (props.viewMode === 'week') {
model.value = [adapter.addDays(model.value[0], -7)]
model.value = [adapter.addDays(displayValue.value, -7)]
}
if (props.viewMode === 'day') {
model.value = [adapter.addDays(model.value[0], -1)]
model.value = [adapter.addDays(displayValue.value, -1)]
}
}

Expand All @@ -74,7 +74,7 @@ export const VCalendar = genericComponent<VCalendarSlots>()({
}

const title = computed(() => {
return adapter.format(model.value[0], 'monthAndYear')
return adapter.format(displayValue.value, 'monthAndYear')
})

useRender(() => {
Expand Down Expand Up @@ -173,11 +173,12 @@ export const VCalendar = genericComponent<VCalendarSlots>()({
{ props.viewMode === 'day' && (
<VCalendarDay
{ ...calendarDayProps }
day={ genDays([model.value[0] as Date], adapter.date() as Date)[0] }
day={ genDays([displayValue.value as Date], adapter.date() as Date)[0] }
dayIndex={ 0 }
events={
props.events?.filter(e =>
adapter.isSameDay(e.start, genDays([model.value[0] as Date], adapter.date() as Date)[0].date) ||
adapter.isSameDay(e.end, genDays([model.value[0] as Date], adapter.date() as Date)[0].date)
adapter.isSameDay(e.start, genDays([displayValue.value as Date], adapter.date() as Date)[0].date) ||
adapter.isSameDay(e.end, genDays([displayValue.value as Date], adapter.date() as Date)[0].date)
)
}
></VCalendarDay>
Expand Down
Loading