Skip to content

wip: fix DatePicker providing broken initial date #676

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
JakobMiesner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

wip: fix DatePicker providing broken initial date #676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 35 additions & 7 deletions src/lib/components/DatePicker/DatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,44 @@ class DatePicker extends Component {
};

getInitialDate = (initialDate, disable) => {
let firstAvailableDay = DateTime.local();
let initialDateChecked = initialDate;
const { minDate, maxDate } = this.props;

let startDate = DateTime.local();
if (minDate) {
const min = DateTime.fromISO(minDate);
if (min.isValid && min > startDate) {
startDate = min;
}
}

// Find first non-disabled day
let firstAvailableDay = startDate;
const maxDateLimit = maxDate ? DateTime.fromISO(maxDate) : null;

while (disable.includes(toShortDate(firstAvailableDay))) {
firstAvailableDay = new DateTime(firstAvailableDay.plus({ days: 1 }));
firstAvailableDay = firstAvailableDay.plus({ days: 1 });
if (
maxDateLimit &&
maxDateLimit.isValid &&
firstAvailableDay > maxDateLimit
) {
firstAvailableDay = startDate;
break;
}
}
const firstAvailableDayToShortDate = toShortDate(firstAvailableDay);
if (initialDate < firstAvailableDayToShortDate) {
initialDateChecked = firstAvailableDayToShortDate;

const firstAvailableDayStr = toShortDate(firstAvailableDay);

if (!initialDate || initialDate < firstAvailableDayStr) {
return firstAvailableDayStr;
}

// Clamp initialDate to maxDate
if (maxDate && initialDate > maxDate) {
return firstAvailableDayStr;
}
return initialDateChecked;

return initialDate;
};

render() {
Expand Down
Loading