@websy/websy-designs 1.2.17 → 1.2.19

package/dist/websy-designs-es6.debug.js

@@ -396,7 +396,7 @@ class WebsyDatePicker {
         }
         else {
           if (this.options.mode === 'hour') {
-            let hoursOut = this.selectedRangeDates.map(h => this.options.hours[h])
+            let hoursOut = this.currentselection.map(h => this.options.hours[h])
             this.options.onChange(hoursOut, true)        
           }     
           else {
@@ -948,20 +948,44 @@ class WebsyDatePicker {
       this.close(confirm)
     }
   }
-  selectCustomRange (range) {
+  selectCustomRange (rangeInput) {
     this.selectedRange = -1
-    this.selectedRangeDates = range
-    this.currentselection = []
+    let isContinuousRange = true
+    if (rangeInput.length === 1) {
+      this.selectedRangeDates = [...rangeInput]
+      this.customRangeSelected = [...rangeInput]
+    }
+    else if (rangeInput.length === 2) {      
+      this.selectedRangeDates = [...rangeInput]
+      this.customRangeSelected = [...rangeInput]
+    }
+    rangeInput.forEach((r, i) => {
+      if (i > 0) {
+        if (this.options.mode === 'date' || this.options.mode === 'monthyear') {          
+          if ((r.getTime() / this.oneDay) - (rangeInput[i - 1] / this.oneDay) > 1) {
+            isContinuousRange = false
+          }          
+        }
+        else if (this.options.mode === 'hour' || this.options.mode === 'year') {
+          if (r - rangeInput[i - 1] > 1) {
+            isContinuousRange = false
+          }
+        } 
+      }      
+    })   
+    if (rangeInput.length > 2 && isContinuousRange === true) {
+      this.selectedRangeDates = [rangeInput[0], rangeInput[rangeInput.length - 1]]
+    }           
     // check if the custom range matches a configured range
     for (let i = 0; i < this.options.ranges[this.options.mode].length; i++) {
       if (this.options.ranges[this.options.mode][i].range.length === 1) {
-        if (this.options.ranges[this.options.mode][i].range[0] === range[0]) {
+        if (this.options.ranges[this.options.mode][i].range[0] === rangeInput[0]) {
           this.selectedRange = i
           break
         }
       }
       else if (this.options.ranges[this.options.mode][i].range.length === 2) {
-        if (this.options.ranges[this.options.mode][i].range[0] === range[0] && this.options.ranges[this.options.mode][i].range[1] === range[1]) {
+        if (this.options.ranges[this.options.mode][i].range[0] === rangeInput[0] && this.options.ranges[this.options.mode][i].range[1] === rangeInput[1]) {
           this.selectedRange = i
           break
         }
@@ -1019,6 +1043,7 @@ class WebsyDatePicker {
       if (this.customRangeSelected === true) {        
         end = ` - ${list[list.length - 1]}`
         if (this.options.mode === 'hour') {
+          start = this.options.hours[start].text
           end = `${this.customRangeSelected === true ? ' - ' : ''}${this.options.hours[list[list.length - 1]].text}`
         }
       }