@websy/websy-designs 1.2.16 → 1.2.18

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,9 +948,12 @@ class WebsyDatePicker {
       this.close(confirm)
     }
   }
-  selectCustomRange (range) {
+  selectCustomRange (range, isRange = true) {
     this.selectedRange = -1
     this.selectedRangeDates = range
+    if (isRange === true) {
+      this.currentselection = [] 
+    }    
     // 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) {
@@ -1015,18 +1018,23 @@ class WebsyDatePicker {
       })
       let start = list[0]
       let end = ''
-      if (this.customRangeSelected === true) {
+      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}`
+        }
       }
       else {
         if (list.length > 1) {
           start = `${list.length} selected` 
+        }
+        else {
+          if (this.options.mode === 'hour') {
+            start = this.options.hours[start].text            
+          }
         }        
-      }
-      if (this.options.mode === 'hour') {
-        start = this.options.hours[start].text
-        end = `${this.customRangeSelected === true ? ' - ' : ''}${this.options.hours[list[list.length - 1]].text}`
-      }
+      }      
       range = { label: `${start}${end}` }       
     }
     else {

package/dist/websy-designs-es6.js

@@ -437,7 +437,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             }
           } else {
             if (this.options.mode === 'hour') {
-              var _hoursOut = this.selectedRangeDates.map(function (h) {
+              var _hoursOut = this.currentselection.map(function (h) {
                 return _this2.options.hours[h];
               });
 
@@ -1054,8 +1054,14 @@ var WebsyDatePicker = /*#__PURE__*/function () {
   }, {
     key: "selectCustomRange",
     value: function selectCustomRange(range) {
+      var isRange = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       this.selectedRange = -1;
-      this.selectedRangeDates = range; // check if the custom range matches a configured range
+      this.selectedRangeDates = range;
+
+      if (isRange === true) {
+        this.currentselection = [];
+      } // check if the custom range matches a configured range
+
 
       for (var i = 0; i < this.options.ranges[this.options.mode].length; i++) {
         if (this.options.ranges[this.options.mode][i].range.length === 1) {
@@ -1127,17 +1133,21 @@ var WebsyDatePicker = /*#__PURE__*/function () {
 
         if (this.customRangeSelected === true) {
           end = " - ".concat(list[list.length - 1]);
+
+          if (this.options.mode === 'hour') {
+            start = this.options.hours[start].text;
+            end = "".concat(this.customRangeSelected === true ? ' - ' : '').concat(this.options.hours[list[list.length - 1]].text);
+          }
         } else {
           if (list.length > 1) {
             start = "".concat(list.length, " selected");
+          } else {
+            if (this.options.mode === 'hour') {
+              start = this.options.hours[start].text;
+            }
           }
         }
 
-        if (this.options.mode === 'hour') {
-          start = this.options.hours[start].text;
-          end = "".concat(this.customRangeSelected === true ? ' - ' : '').concat(this.options.hours[list[list.length - 1]].text);
-        }
-
         range = {
           label: "".concat(start).concat(end)
         };