Skip to content

Commit

Permalink
fix(VDatePickerMonth): apply month/year updates when displayValue cha…
Browse files Browse the repository at this point in the history
…nges
  • Loading branch information
johnleider committed Nov 16, 2023
1 parent 05db921 commit 6901d24
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions packages/vuetify/src/components/VDatePicker/VDatePickerMonth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getWeek, useDate } from '@/composables/date/date'
import { useProxiedModel } from '@/composables/proxiedModel'

// Utilities
import { computed, ref } from 'vue'
import { computed, ref, watch } from 'vue'
import { genericComponent, propsFactory, wrapInArray } from '@/util'

// Types
Expand Down Expand Up @@ -64,19 +64,20 @@ export const VDatePickerMonth = genericComponent<VDatePickerMonthSlots>()({
[],
v => wrapInArray(v),
)
const displayDate = computed(() => {
const displayValue = computed(() => {
if (model.value.length > 0) return adapter.date(model.value[0])
if (props.min) return adapter.date(props.min)
if (Array.isArray(props.allowedDates)) return adapter.date(props.allowedDates[0])

return adapter.date()
})

const year = useProxiedModel(
props,
'year',
undefined,
v => {
const value = v != null ? Number(v) : adapter.getYear(displayDate.value)
const value = v != null ? Number(v) : adapter.getYear(displayValue.value)

return adapter.startOfYear(adapter.setYear(adapter.date(), value))
},
Expand All @@ -88,7 +89,7 @@ export const VDatePickerMonth = genericComponent<VDatePickerMonthSlots>()({
'month',
undefined,
v => {
const value = v != null ? Number(v) : adapter.getMonth(displayDate.value)
const value = v != null ? Number(v) : adapter.getMonth(displayValue.value)
const date = adapter.setYear(adapter.date(), adapter.getYear(year.value))

return adapter.setMonth(date, value)
Expand Down Expand Up @@ -189,6 +190,11 @@ export const VDatePickerMonth = genericComponent<VDatePickerMonthSlots>()({
}
}

watch(displayValue, val => {
month.value = val
year.value = val
})

return () => (
<div class="v-date-picker-month">
{ props.showWeek && (
Expand Down

0 comments on commit 6901d24

Please sign in to comment.