Skip to content

Commit 208fd85

Browse files
committed
refactor(Calendar): allow pass maxDate and minDate as string
1 parent adf6151 commit 208fd85

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

js/src/calendar.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class Calendar extends BaseComponent {
211211
}
212212

213213
// Allow to change the calendarDate but not startDate or endDate
214-
if (isDateDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)) {
214+
if (isDateDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)) {
215215
return
216216
}
217217

@@ -237,16 +237,16 @@ class Calendar extends BaseComponent {
237237
event.preventDefault()
238238

239239
if (
240-
this._config.maxDate &&
241-
date >= convertToDateObject(this._config.maxDate, this._config.selectionType) &&
240+
this._maxDate &&
241+
date >= convertToDateObject(this._maxDate, this._config.selectionType) &&
242242
(event.key === ARROW_RIGHT_KEY || event.key === ARROW_DOWN_KEY)
243243
) {
244244
return
245245
}
246246

247247
if (
248-
this._config.minDate &&
249-
date <= convertToDateObject(this._config.minDate, this._config.selectionType) &&
248+
this._minDate &&
249+
date <= convertToDateObject(this._minDate, this._config.selectionType) &&
250250
(event.key === ARROW_LEFT_KEY || event.key === ARROW_UP_KEY)
251251
) {
252252
return
@@ -338,7 +338,7 @@ class Calendar extends BaseComponent {
338338
const target = event.target.classList.contains(CLASS_NAME_CALENDAR_CELL_INNER) ? event.target.parentElement : event.target
339339
const date = this._getDate(target)
340340

341-
if (isDateDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)) {
341+
if (isDateDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)) {
342342
return
343343
}
344344

@@ -504,7 +504,7 @@ class Calendar extends BaseComponent {
504504
}
505505

506506
_selectDate(date) {
507-
if (isDateDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)) {
507+
if (isDateDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)) {
508508
return
509509
}
510510

@@ -724,6 +724,8 @@ class Calendar extends BaseComponent {
724724
)
725725
this._startDate = convertToDateObject(this._config.startDate, this._config.selectionType)
726726
this._endDate = convertToDateObject(this._config.endDate, this._config.selectionType)
727+
this._minDate = convertToDateObject(this._config.minDate, this._config.selectionType)
728+
this._maxDate = convertToDateObject(this._config.maxDate, this._config.selectionType)
727729
this._hoverDate = null
728730
this._selectEndDate = this._config.selectEndDate
729731
}
@@ -804,7 +806,7 @@ class Calendar extends BaseComponent {
804806

805807
_cellDayAttributes(date, month) {
806808
const isCurrentMonth = month === 'current'
807-
const isDisabled = isDateDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)
809+
const isDisabled = isDateDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)
808810
const isSelected = isDateSelected(date, this._startDate, this._endDate)
809811

810812
const classNames = this._classNames({
@@ -833,7 +835,7 @@ class Calendar extends BaseComponent {
833835
}
834836

835837
_cellMonthAttributes(date) {
836-
const isDisabled = isMonthDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)
838+
const isDisabled = isMonthDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)
837839
const isSelected = isMonthSelected(date, this._startDate, this._endDate)
838840

839841
const classNames = this._classNames({
@@ -855,7 +857,7 @@ class Calendar extends BaseComponent {
855857
}
856858

857859
_cellYearAttributes(date) {
858-
const isDisabled = isYearDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)
860+
const isDisabled = isYearDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)
859861
const isSelected = isYearSelected(date, this._startDate, this._endDate)
860862

861863
const classNames = this._classNames({
@@ -877,7 +879,7 @@ class Calendar extends BaseComponent {
877879
}
878880

879881
_rowWeekAttributes(date) {
880-
const isDisabled = isDateDisabled(date, this._config.minDate, this._config.maxDate, this._config.disabledDates)
882+
const isDisabled = isDateDisabled(date, this._minDate, this._maxDate, this._config.disabledDates)
881883
const isSelected = isDateSelected(date, this._startDate, this._endDate)
882884

883885
const classNames = this._classNames({

0 commit comments

Comments
 (0)