@momo-kits/date-picker 0.0.23-beta-1 → 0.0.25

package/datePicker/DatePicker.js

@@ -180,15 +180,13 @@ class DatePicker extends Component {
             current = this.maxDate;
         }
         if (format === 'hh:mm' && isRanged) {
-            const valueHours_1 = this.selectedDate ? `${getStrings(this.selectedDate?.from?.getHours()?.toString())}:${getStrings(this.selectedDate?.from?.getMinutes()?.toString())}` : '';
-
-            const valueHours_2 = this.selectedDate ? `${getStrings(this.selectedDate?.to?.getHours()?.toString())}:${getStrings(this.selectedDate?.to?.getMinutes()?.toString())}` : '';
-
-            this.hourRangeIndex_1 = this.selectedDate
+            const valueHours_1 = this.selectedDate?.from ? `${getStrings(this.selectedDate?.from?.getHours()?.toString())}:${getStrings(this.selectedDate?.from?.getMinutes()?.toString())}` : '00:00';
+            const valueHours_2 = this.selectedDate?.to ? `${getStrings(this.selectedDate?.to?.getHours()?.toString())}:${getStrings(this.selectedDate?.to?.getMinutes()?.toString())}` : '00:00';
+            this.hourRangeIndex_1 = valueHours_1
                 ? this.ranged.indexOf(valueHours_1)
                 : this.ranged.indexOf(`${current.getHours().toString()}:${current.getMinutes().toString()}`);
 
-            this.hourRangeIndex_2 = this.selectedDate
+            this.hourRangeIndex_2 = valueHours_2
                 ? this.ranged.indexOf(valueHours_2)
                 : this.ranged.indexOf(`${current.getHours().toString()}:${current.getMinutes().toString()}`);
             return;
@@ -208,7 +206,7 @@ class DatePicker extends Component {
         if (format === 'hh:mm' && !isRanged) {
             const valueHours = this.selectedDate ? this.selectedDate?.getHours()?.toString()?.length === 1 ? `0${this.selectedDate.getHours().toString()}` : this.selectedDate?.getHours()?.toString() || '' : '';
             const valueMinute = this.selectedDate ? this.selectedDate?.getMinutes()?.toString()?.length === 1 ? `0${this.selectedDate.getMinutes().toString()}` : this.selectedDate?.getMinutes()?.toString() || '' : '';
-
+            
             this.hourIndex = this.selectedDate
                 ? this.hours.indexOf(valueHours)
                 : this.hours.indexOf(current.getHours().toString().length === 1 ? `0${current.getHours().toString()}` : current.getHours().toString());
@@ -268,11 +266,9 @@ class DatePicker extends Component {
         const day = this.days[this.dayIndex];
         const month = this.months[this.monthIndex];
         const year = this.years[this.yearIndex];
-        const hour = this.hours[this.hourIndex];
-        const minute = this.minutes[this.minuteIndex];
-
+        const hour = this.hours[this.hourIndex] || '00';
+        const minute = this.minutes[this.minuteIndex] || '00';
         const selectedDateFormatted = DatePickerHelper.toString(day, month, year, hour, minute, format);
-
         if (onSelected && typeof onSelected === 'function') {
             onSelected(selectedDateFormatted || selectedDate || DatePickerHelper.getCurrentDate(format));
         }

package/datePicker/WheelPicker.js

@@ -15,8 +15,9 @@ export default class WheelPicker extends Component {
     constructor(props) {
         super(props);
         const {
-            heightItem, value, numberItem, arrayValue
+            heightItem, value: valueItem, numberItem, arrayValue
         } = this.props;
+        const value = valueItem === -1 ? 0 : valueItem;
         this.heightItem = heightItem;
         this.currentPosition = value * this.heightItem;
         this.prePosition = this.currentPosition;

package/datePicker/helper/DatePickerHelper.js

@@ -77,7 +77,7 @@ export default class DatePickerHelper {
     static formatDate(date, format) {
         if (date && format) {
             const {
-                year, month, day, hour, minute, second
+                year, month, day, hour, minute, second = 0
             } = DatePickerHelper.getDateTimeFromFormat(date, format);
             if (DatePickerHelper.checkValidDate(year, month, day)
                 && DatePickerHelper.checkValidTime(hour, minute, second)) {
@@ -156,17 +156,21 @@ export default class DatePickerHelper {
         return null;
     }
 
-    static checkValidDate(year, month, day) {
+    static checkValidDate(y, m, d) {
+        const year = parseInt(y);
+        const month = parseInt(m);
+        const day = parseInt(d);
         const months31 = [0, 2, 4, 6, 7, 9, 11];
         const months30 = [3, 5, 8, 10];
         const months28 = [1];
         const isLeap = ((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0);
         if (year != null && month != null && day != null) {
             const isDayValid = day > 0;
-            const isMonthValid = (months31.indexOf(month) !== -1 && day <= 31)
-            || (months30.indexOf(month) !== -1 && day <= 30)
-            || (months28.indexOf(month) !== -1 && day <= 28)
-            || (months28.indexOf(month) !== -1 && day <= 29 && isLeap);
+            const isMonthValid = (months31.indexOf(parseInt(month)) != -1 && day <= 31)
+            || (months30.indexOf(month) != -1 && day <= 30)
+            || (months30.indexOf(month) != -1 && day <= 31)
+            || (months28.indexOf(month) != -1 && day <= 28)
+            || (months28.indexOf(month) != -1 && day <= 29 && isLeap);
             return isDayValid && isMonthValid;
         }
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@momo-kits/date-picker",
-  "version": "0.0.23-beta-1",
+  "version": "0.0.25",
   "private": false,
   "main": "index.js",
   "dependencies": {},