@websy/websy-designs 1.2.11 → 1.2.13

package/dist/websy-designs.debug.js

@@ -636,7 +636,10 @@ class WebsyDatePicker {
       this.close()
     }
     else if (event.target.classList.contains('clear-selection')) {
-      this.selectRange(0)
+      this.selectRange(0, false)
+      if (this.options.onClear) {
+        this.options.onClear()
+      }
       this.updateRange(0)
     }
   }
@@ -721,17 +724,7 @@ class WebsyDatePicker {
         console.log('diff', diff)
       }
       else if (this.options.mode === 'hour') {
-        let diffStart
-        let diffEnd
-        this.options.hours.forEach((h, i) => {
-          if (h.text === this.selectedRangeDates[0]) {
-            diffStart = i            
-          }
-          if (h.text === this.selectedRangeDates[this.selectedRangeDates.length - 1]) {
-            diffEnd = i            
-          }
-        })
-        diff = diffEnd - diffStart
+        diff = this.selectedRangeDates[this.selectedRangeDates.length - 1] - this.selectedRangeDates[0]
       }  
       for (let i = 0; i < diff + 1; i++) {
         let d
@@ -754,7 +747,7 @@ class WebsyDatePicker {
           rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime()
         }
         else if (this.options.mode === 'hour') {
-          d = this.options.hours[i]
+          d = this.selectedRangeDates[0] + i
           rangeStart = this.selectedRangeDates[0]
           rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1]
         }
@@ -765,7 +758,10 @@ class WebsyDatePicker {
         else if (this.options.mode === 'year') {
           dateEl = document.getElementById(`${this.elementId}_${d}_year`)
         }
-        else if (this.options.mode === 'monthyear') {          
+        else if (this.options.mode === 'monthyear') {
+          console.log('d', d)
+          console.log(this.selectedRangeDates)
+          console.log(rangeStart, rangeEnd)
           dateEl = document.getElementById(`${this.elementId}_${d}_monthyear`)
         }
         else if (this.options.mode === 'hour') {
@@ -1128,7 +1124,7 @@ class WebsyDatePicker {
     this.selectedRange = -1
     this.highlightRange()
   }
-  selectRange (index) {
+  selectRange (index, confirm = true) {
     if (this.options.ranges[this.options.mode][index]) {
       this.selectedRangeDates = [...this.options.ranges[this.options.mode][index].range]
       this.currentselection = [...this.options.ranges[this.options.mode][index].range]
@@ -1143,7 +1139,7 @@ class WebsyDatePicker {
         }
       }
       this.highlightRange()      
-      this.close(true)
+      this.close(confirm)
     }
   }
   selectCustomRange (range) {

package/dist/websy-designs.js

@@ -705,7 +705,12 @@ var WebsyDatePicker = /*#__PURE__*/function () {
       } else if (event.target.classList.contains('websy-dp-cancel')) {
         this.close();
       } else if (event.target.classList.contains('clear-selection')) {
-        this.selectRange(0);
+        this.selectRange(0, false);
+
+        if (this.options.onClear) {
+          this.options.onClear();
+        }
+
         this.updateRange(0);
       }
     }
@@ -807,18 +812,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           console.log('year diff', yearDiff);
           console.log('diff', diff);
         } else if (this.options.mode === 'hour') {
-          var diffStart;
-          var diffEnd;
-          this.options.hours.forEach(function (h, i) {
-            if (h.text === _this5.selectedRangeDates[0]) {
-              diffStart = i;
-            }
-
-            if (h.text === _this5.selectedRangeDates[_this5.selectedRangeDates.length - 1]) {
-              diffEnd = i;
-            }
-          });
-          diff = diffEnd - diffStart;
+          diff = this.selectedRangeDates[this.selectedRangeDates.length - 1] - this.selectedRangeDates[0];
         }
 
         for (var _i = 0; _i < diff + 1; _i++) {
@@ -840,7 +834,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             rangeStart = this.selectedRangeDates[0].getTime();
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime();
           } else if (this.options.mode === 'hour') {
-            d = this.options.hours[_i];
+            d = this.selectedRangeDates[0] + _i;
             rangeStart = this.selectedRangeDates[0];
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1];
           }
@@ -852,6 +846,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           } else if (this.options.mode === 'year') {
             dateEl = document.getElementById("".concat(this.elementId, "_").concat(d, "_year"));
           } else if (this.options.mode === 'monthyear') {
+            console.log('d', d);
+            console.log(this.selectedRangeDates);
+            console.log(rangeStart, rangeEnd);
             dateEl = document.getElementById("".concat(this.elementId, "_").concat(d, "_monthyear"));
           } else if (this.options.mode === 'hour') {
             dateEl = document.getElementById("".concat(this.elementId, "_").concat(d, "_hour"));
@@ -1255,6 +1252,8 @@ var WebsyDatePicker = /*#__PURE__*/function () {
   }, {
     key: "selectRange",
     value: function selectRange(index) {
+      var confirm = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+
       if (this.options.ranges[this.options.mode][index]) {
         this.selectedRangeDates = _toConsumableArray(this.options.ranges[this.options.mode][index].range);
         this.currentselection = _toConsumableArray(this.options.ranges[this.options.mode][index].range);
@@ -1270,7 +1269,7 @@ var WebsyDatePicker = /*#__PURE__*/function () {
         }
 
         this.highlightRange();
-        this.close(true);
+        this.close(confirm);
       }
     }
   }, {