Skip to content

fix(Calendar): keep an uncontrolled selection when switching views #7401

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

Open
benjamincanac wants to merge 5 commits into
base: v4
Choose a base branch
from
Open

fix(Calendar): keep an uncontrolled selection when switching views #7401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
283ae0b
fix(Calendar): keep selection and focus when switching views
benjamincanac Nov 13, 2026
930da8a
fix(Calendar): skip disabled cells when restoring focus
benjamincanac Nov 13, 2026
d899a6f
fix(Calendar): drop a selection cleared by the parent, skip outside-v…
benjamincanac Nov 13, 2026
f6491a8
fix(Calendar): focus the tab stop after drilling down
benjamincanac Nov 13, 2026
d406902
fix(Calendar): move the focus handling to its own PR
benjamincanac Nov 13, 2026
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
9 changes: 8 additions & 1 deletion src/runtime/components/Calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,15 @@ function setPlaceholder(date: DateValue) {
emits('update:placeholder', date)
}

// The picker keeps an uncontrolled value internally and is replaced on each view change.
const uncontrolledValue = shallowRef(props.modelValue ?? props.defaultValue)
watch(() => props.modelValue, (value) => {
uncontrolledValue.value = value
})

function onSelect(value: DateValue | DateRange) {
if (isMinView.value) {
uncontrolledValue.value = value as CalendarDefaultValue<R, M>
emits('update:modelValue', value as CalendarModelValue<R, M>)
return
}
Expand Down Expand Up @@ -318,7 +325,7 @@ const ui = computed(() => tv({ extend: theme, ...(appConfig.ui?.calendar || {})
v-bind="rootProps"
:calendar-label="calendarLabel"
:model-value="(isMinView ? (props.modelValue as DateValue | DateValue[] | DateRange) : undefined)"
:default-value="(isMinView ? (props.defaultValue as DateValue | DateValue[] | DateRange) : undefined)"
:default-value="(isMinView ? (uncontrolledValue as DateValue | DateValue[] | DateRange) : undefined)"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
:placeholder="placeholder"
data-slot="root"
:class="ui.root({ class: [props.ui?.root, props.class] })"
Expand Down
23 changes: 23 additions & 0 deletions test/components/Calendar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,29 @@ describe('Calendar', () => {
})

describe('views', () => {
test('keeps an uncontrolled selection after cycling through the views', async () => {
const wrapper = await mountSuspended(Calendar, { props: { placeholder: new CalendarDate(2025, 1, 1) } })

await wrapper.find('[data-reka-calendar-cell-trigger][data-value="2025-01-15"]').trigger('click')
for (let i = 0; i < 3; i++) {
await wrapper.find('[data-slot="heading"] button').trigger('click')
}

expect(wrapper.find('[data-reka-calendar-cell-trigger][data-selected]').attributes('data-value')).toBe('2025-01-15')
})

test('does not bring back a selection cleared by the parent after cycling through the views', async () => {
const wrapper = await mountSuspended(Calendar, { props: { 'placeholder': new CalendarDate(2025, 1, 1), 'onUpdate:modelValue': (value: any) => wrapper.setProps({ modelValue: value }) } })

await wrapper.find('[data-reka-calendar-cell-trigger][data-value="2025-01-15"]').trigger('click')
await wrapper.setProps({ modelValue: undefined })
for (let i = 0; i < 3; i++) {
await wrapper.find('[data-slot="heading"] button').trigger('click')
}

expect(wrapper.find('[data-reka-calendar-cell-trigger][data-selected]').exists()).toBe(false)
})

test('heading button cycles through day, month and year views', async () => {
const wrapper = await mountSuspended(Calendar)

Expand Down
Loading