Skip to content

Commit 54e3bf0

Browse files
committed
fix: autogen escaping, validModelValue sync, candidateYear fallback
1 parent 184c91d commit 54e3bf0

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

packages/core/src/YearPicker/YearPickerCellTrigger.vue

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,14 @@ function handleArrowKey(e: KeyboardEvent) {
174174
const candidateYear = parentElement.querySelector<HTMLElement>(`[data-value='${candidateYearValue.toString()}']`)
175175
if (candidateYear && !candidateYear.hasAttribute('data-disabled')) {
176176
rootContext.onPlaceholderChange(candidateYearValue)
177-
candidateYear?.focus()
177+
candidateYear.focus()
178178
return
179179
}
180180
181-
if (candidateYear && candidateYear.hasAttribute('data-disabled'))
181+
if (candidateYear?.hasAttribute('data-disabled'))
182182
shiftFocus(candidateYearValue, direction > 0 ? 1 : -1, 1)
183+
else
184+
parentElement.querySelector<HTMLElement>('[data-reka-year-picker-cell-trigger]:not([data-disabled])')?.focus()
183185
})
184186
}
185187
}

packages/core/src/YearRangePicker/YearRangePickerRoot.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ watch(modelValue, (_modelValue) => {
263263
if (!isEndSynced) {
264264
endValue.value = next.end?.copy?.()
265265
}
266+
267+
if (next.start && next.end)
268+
validModelValue.value = { start: next.start.copy(), end: next.end.copy() }
266269
})
267270
268271
watch(startValue, (_startValue) => {

0 commit comments

Comments
 (0)