Skip to content

Commit

Permalink
Don't clamp time when setting DMY
Browse files Browse the repository at this point in the history
  • Loading branch information
probablykasper committed Feb 26, 2024
1 parent 53d438a commit 175f967
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Changelog

## Next
- Don't clamp time of day when settig date/month/year
- Fix time field sometimes showing a value outside `min`/`max`
- Fix time field losing highlight after pressing left/right arrow keys
- Use numeric keyboard in time field
Expand Down
37 changes: 30 additions & 7 deletions src/lib/DatePicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,16 @@
}
}
function setValueDate(d: Date) {
if (d.getTime() !== value?.getTime()) {
browseDate = clampDate(d, min, max)
value = cloneDate(browseDate)
}
}
/** Set the browseDate */
function browse(d: Date) {
browseDate = clamp(d, min, max)
browseDate = clampDate(d, min, max)
if (!browseWithoutSelecting && value) {
setValue(browseDate)
}
Expand Down Expand Up @@ -64,9 +71,25 @@
return cloneDate(d)
}
}
function clampDate(d: Date, min: Date, max: Date) {
const limit = clamp(d, min, max)
if (limit.getTime() !== d.getTime()) {
d = new Date(
limit.getFullYear(),
limit.getMonth(),
limit.getDate(),
d.getHours(),
d.getMinutes(),
d.getSeconds(),
d.getMilliseconds(),
)
d = clamp(d, min, max)
}
return d
}
/** The date shown in the popup when none is selected */
let browseDate = value ? cloneDate(value) : cloneDate(clamp(defaultDate, min, max))
let browseDate = value ? cloneDate(value) : cloneDate(clampDate(defaultDate, min, max))
$: setBrowseDate(value)
function setBrowseDate(value: Date | null) {
if (browseDate.getTime() !== value?.getTime()) {
Expand Down Expand Up @@ -132,7 +155,7 @@
browseDate.setFullYear(calendarDay.year)
browseDate.setMonth(calendarDay.month)
browseDate.setDate(calendarDay.number)
setValue(browseDate)
setValueDate(browseDate)
dispatch('select', cloneDate(browseDate))
}
}
Expand Down Expand Up @@ -205,16 +228,16 @@
return
} else if (e.key === 'ArrowUp') {
browseDate.setDate(browseDate.getDate() - 7)
setValue(browseDate)
setValueDate(browseDate)
} else if (e.key === 'ArrowDown') {
browseDate.setDate(browseDate.getDate() + 7)
setValue(browseDate)
setValueDate(browseDate)
} else if (e.key === 'ArrowLeft') {
browseDate.setDate(browseDate.getDate() - 1)
setValue(browseDate)
setValueDate(browseDate)
} else if (e.key === 'ArrowRight') {
browseDate.setDate(browseDate.getDate() + 1)
setValue(browseDate)
setValueDate(browseDate)
} else if (e.key === 'Enter') {
setValue(browseDate)
dispatch('select', cloneDate(browseDate))
Expand Down

0 comments on commit 175f967

Please sign in to comment.