From d272621453adaa87860659c7da336ba09247ba38 Mon Sep 17 00:00:00 2001 From: cagataycivici Date: Tue, 4 Dec 2018 22:06:03 +0300 Subject: [PATCH] Fixed #612 - viewDate.getMonth() is not a function --- src/components/calendar/Calendar.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js index a9701327ae..54e356dd65 100644 --- a/src/components/calendar/Calendar.js +++ b/src/components/calendar/Calendar.js @@ -151,8 +151,13 @@ export class Calendar extends Component { super(props); if (!this.props.onViewDateChange) { + let propValue = this.props.value; + if (Array.isArray(propValue)) { + propValue = propValue[0]; + } + this.state = { - viewDate: (this.props.viewDate || this.props.value || new Date()) + viewDate: (this.props.viewDate || propValue || new Date()) } } @@ -1013,8 +1018,11 @@ export class Calendar extends Component { else if(this.isRangeSelection()) { if(this.props.value[1]) return this.isDateEquals(this.props.value[0], dateMeta) || this.isDateEquals(this.props.value[1], dateMeta) || this.isDateBetween(this.props.value[0], this.props.value[1], dateMeta); - else - return this.isDateEquals(this.props.value[0], dateMeta) + else { + debugger; + return this.isDateEquals(this.props.value[0], dateMeta); + } + } } else {