fixes for disabled dates through handler. Still pending issue with na…

…tive dates and trySetState
Semantic-Org · Apr 17, 2017 · 49e5c3b · 49e5c3b
1 parent 92132ce
commit 49e5c3b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/modules/Datetime/Calendar.js b/src/modules/Datetime/Calendar.js
@@ -187,22 +187,22 @@ export default class Calendar extends Component {
   setDay = (e, day) => {
     e.stopPropagation()
     const {value, mode} = this.state
+    const { onDateSelect, time, range } = this.props
     const date = new this.Date(value)
     date.day(day)
-    debugger
-    const { onDateSelect, time } = this.props
+    const selectedDate = date.getDate()
     const nextMode = time ? 'hour' : mode
     const rangeState = {}
-    if (this.props.range) {
+    if (range) {
       rangeState.selectionStart = date
     }
     this.trySetState({
-      value: date.getDate(),
+      value: selectedDate,
       mode: nextMode,
       ...rangeState,
     })
     if (!time && onDateSelect) {
-      onDateSelect(e, date.getDate())
+      onDateSelect(e, selectedDate)
     }
   }
 
@@ -279,11 +279,12 @@ export default class Calendar extends Component {
   render() {
     const { date } = this.props
     const { mode, value } = this.state
+    const calendarDay = this.getDate()
     return (
       <div style={style}>
         {date && (
           <CalendarMenu
-            value={this.getDate()}
+            value={calendarDay}
             monthName={this.getMonthName()}
             year={this.getYear()}
             mode={mode}

diff --git a/src/modules/Datetime/Month.js b/src/modules/Datetime/Month.js
@@ -92,8 +92,8 @@ export default class Month extends Component {
   getDays() {
     const { date, onClick, disabledDates } = this.props
     const { selectionStart, selectionEnd } = this.state
+    console.log('disabltd', disabledDates)
     const _date = new this.Date(date)
-
     const firstDay = _date.getFirstOfMonth()
     const firstWeekDay = _date.getWeekDay(firstDay)
     const daysInMonth = _date.daysInMonth()
@@ -144,7 +144,7 @@ export default class Month extends Component {
       dayParams.selected = this.isCellSelected(dayCellDate, selectionStart, selectionEnd)
 
       if (hasDisabledDates && !dayParams.disabled &&
-        disabledDateSig.indexOf(this.getDateString(dayParams.date)) > -1) {
+        disabledDateSig.indexOf(_date.getDateString(dayCellDate.getDate())) > -1) {
         dayParams.disabled = true
       }
       return dayParams

diff --git a/src/modules/Datetime/handlers/moment.js b/src/modules/Datetime/handlers/moment.js
@@ -11,14 +11,15 @@ export function getMomentDateHandler(settings={}) {
   class DateHandler {
     static settings = settings
     constructor(date) {
+      if (!date) {
+        date = moment.tz()
+      }
       if (date.tz && date.tz()) {
         this.timeZone = date.tz()
       } else {
         this.timeZone = settings.timeZone || null
       }
-      if (date) {
-       this.set(date)
-      }
+      this.set(date)
     }
 
      /**

diff --git a/src/modules/Datetime/handlers/native.js b/src/modules/Datetime/handlers/native.js
@@ -12,9 +12,7 @@ export function getNativeDateHandler(settings={}) {
   class DateHandler {
     static settings = settings
     constructor(date) {
-      if (date) {
-        this.set(date)
-      }
+      this.set(date)
     }
 
     /**
@@ -28,7 +26,11 @@ export function getNativeDateHandler(settings={}) {
      * re/set a new date on this instance
      */
     set(date) {
-      this.date = new Date(date)
+      if (typeof(date) == 'string' && date.trim().length == 0) {
+        this.date = new Date()
+      } else {
+        this.date = new Date(date)
+      }
       return this
     }
 
@@ -166,7 +168,7 @@ export function getNativeDateHandler(settings={}) {
     }
 
     /**
-     * Get or set the date of the date
+     * Get or set the calendar date of the date
      */
     day(value) {
       if (value) {