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.

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

🐛 refactor(enabled): fix issues with range generation for enabled dates #19

Merged
merged 1 commit into from
Mar 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/src/App.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@
<h3>Enabled Dates</h3>

<div class="example">
<SinglePicker enableFutureDates enabledDates={['1/14/24:1/25/24']} />
<SinglePicker enableFutureDates enabledDates={['1/14/23:3/16/24']} />
</div>

<h3>Theme</h3>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@svelte-plugins/datepicker",
"description": "A simple datepicker component designed for Svelte.",
"version": "1.0.6",
"version": "1.0.7",
"license": "MIT",
"author": "Kieran Boyle (https://github.com/dysfunc)",
"homepage": "https://github.com/svelte-plugins/datepicker",
Expand Down
18 changes: 13 additions & 5 deletions src/datepicker.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -830,24 +830,32 @@
/**
* Returns an array of timestamps from an array of date strings.
* @param {string[]} collection - An array of date strings.
* @param {boolean} enabled - Indicates whether the dates are enabled.
* @returns {number[]} - An array of timestamps.
*/
const getDatesFromArray = (collection) => {
const getDatesFromArray = (collection, enabled) => {
return collection.reduce((acc, date) => {
let newDates = [];

if (date instanceof Date) {
newDates = [date.getTime()];
newDates = [normalizeTimestamp(date.getTime())];
} else if (typeof date === 'string' && date.includes(':')) {
const [rangeStart, rangeEnd] = date.split(':');

let dateRangeStart = new Date(rangeStart).getTime();
let dateRangeEnd = new Date(rangeEnd).getTime();

if (enabled) {
const newDateRangeEnd = new Date(rangeEnd);
newDateRangeEnd.setDate(newDateRangeEnd.getDate() + 1);
dateRangeEnd = newDateRangeEnd.getTime();
}

for (; dateRangeStart <= dateRangeEnd; dateRangeStart += MILLISECONDS_IN_DAY) {
newDates = [...newDates, dateRangeStart];
newDates = [...newDates, normalizeTimestamp(dateRangeStart)];
}
} else {
newDates = [new Date(date).getTime()];
newDates = [normalizeTimestamp(new Date(date).getTime())];
}

return [...acc, ...newDates];
Expand All @@ -873,7 +881,7 @@
$: !isRange && (endDate = null);
$: theme !== null && globalThis.document?.documentElement.setAttribute('data-picker-theme', theme);
$: disabled = getDatesFromArray(disabledDates);
$: enabled = getDatesFromArray(enabledDates);
$: enabled = getDatesFromArray(enabledDates, true);

$: if (!startDate && !endDate) {
startDateYear = Number(defaultYear);
Expand Down
Loading