@momo-kits/date-picker 0.0.65-beta.21 → 0.0.65-beta.23

package/datePicker/helper/DatePickerHelper.js

@@ -49,7 +49,7 @@ export default class DatePickerHelper {
         '22:00',
         '22:30',
         '23:00',
-        '23:30',
+        '23:30'
     ];
 
     static makeRange(min, max, isDouble) {
@@ -57,8 +57,7 @@ export default class DatePickerHelper {
         // eslint-disable-next-line no-plusplus
         for (let i = min; i <= max; i++) {
             const string = String(i);
-            const value =
-                string.length === 1 && isDouble ? `0${string}` : string;
+            const value = string.length === 1 && isDouble ? `0${string}` : string;
             array.push(value);
         }
         return array;
@@ -70,14 +69,7 @@ export default class DatePickerHelper {
             const day = current.getDate().toString();
             const month = (current.getMonth() + 1).toString();
             const year = current.getFullYear().toString();
-            return DatePickerHelper.toString(
-                day,
-                month,
-                year,
-                null,
-                null,
-                format,
-            );
+            return DatePickerHelper.toString(day, month, year, null, null, format);
         }
         return '';
     }
@@ -85,17 +77,10 @@ export default class DatePickerHelper {
     static formatDate(date, format) {
         if (date && format) {
             const {
-                year,
-                month,
-                day,
-                hour,
-                minute,
-                second = 0,
+                year, month, day, hour, minute, second = 0
             } = DatePickerHelper.getDateTimeFromFormat(date, format);
-            if (
-                DatePickerHelper.checkValidDate(year, month, day) &&
-                DatePickerHelper.checkValidTime(hour, minute, second)
-            ) {
+            if (DatePickerHelper.checkValidDate(year, month, day)
+                && DatePickerHelper.checkValidTime(hour, minute, second)) {
                 return new Date(year, month, day, hour, minute, second);
             }
             return null;
@@ -134,14 +119,8 @@ export default class DatePickerHelper {
 
         const today = new Date();
 
-        const year =
-            yearIndex > -1 ? dateItems?.[yearIndex] : today.getFullYear();
-        const month =
-            monthIndex > -1
-                ? dateItems?.[monthIndex] - 1
-                : today.getMonth() === 0
-                ? 1
-                : today.getMonth() - 1;
+        const year = yearIndex > -1 ? dateItems?.[yearIndex] : today.getFullYear();
+        const month = monthIndex > -1 ? dateItems?.[monthIndex] - 1 : today.getMonth() === 0 ? 1 : today.getMonth() - 1;
         const day = dayIndex > -1 ? dateItems?.[dayIndex] : today.getDate();
 
         const hour = hourIndex > -1 ? dateItems[hourIndex] : 0;
@@ -163,7 +142,7 @@ export default class DatePickerHelper {
             return number;
         }
         return `0${number}`;
-    };
+    }
 
     static toString(day, month, year, hour, minute, format) {
         if (day && month && year && format) {
@@ -181,32 +160,24 @@ export default class DatePickerHelper {
         const year = parseInt(y);
         const month = parseInt(m);
         const day = parseInt(d);
-        const months31 = [1, 3, 5, 7, 8, 10, 12];
-        const months30 = [4, 6, 9, 11];
-        const months28 = [2];
-        const isLeap = (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
+        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(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);
+            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;
     }
 
     static checkValidTime(hour, minute, second) {
-        if (
-            hour >= 0 &&
-            hour < 24 &&
-            minute >= 0 &&
-            minute < 60 &&
-            second >= 0 &&
-            second < 60
-        ) {
+        if ((hour >= 0 && hour < 24) && (minute >= 0 && minute < 60) && (second >= 0 && second < 60)) {
             return true;
         }
         return false;
@@ -214,18 +185,11 @@ export default class DatePickerHelper {
 
     static calculateDateSinceYearAgo(yearAgo) {
         let nowDate = new Date();
-        nowDate = new Date(
-            nowDate.getFullYear() - yearAgo,
-            nowDate.getMonth(),
-            nowDate.getDate(),
-        );
+        nowDate = new Date(nowDate.getFullYear() - yearAgo, nowDate.getMonth(), nowDate.getDate());
         return nowDate;
     }
 
-    static getMaxDate(
-        month = new Date().getMonth(),
-        year = new Date().getFullYear(),
-    ) {
+    static getMaxDate(month = new Date().getMonth(), year = new Date().getFullYear()) {
         const monthLength = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
         // Adjust for leap years
         if (year % 400 === 0 || (year % 100 !== 0 && year % 4 === 0)) {
@@ -237,5 +201,5 @@ export default class DatePickerHelper {
 
     static capitalizeFirstLetter(string) {
         return string.charAt(0).toUpperCase() + string.slice(1);
-    }
+      }
 }

package/package.json

@@ -1,16 +1,16 @@
 {
-    "name": "@momo-kits/date-picker",
-    "version": "0.0.65-beta.21",
-    "private": false,
-    "main": "index.js",
-    "dependencies": {},
-    "peerDependencies": {
-        "@momo-kits/core-v2": ">=0.0.5-beta",
-        "lodash": "^4.17.15",
-        "prop-types": "^15.7.2",
-        "react": "16.9.0",
-        "react-native": ">=0.55"
-    },
-    "devDependencies": {},
-    "license": "MoMo"
-}
+  "name": "@momo-kits/date-picker",
+  "version": "0.0.65-beta.23",
+  "private": false,
+  "main": "index.js",
+  "dependencies": {},
+  "peerDependencies": {
+    "@momo-kits/core": ">=0.0.5-beta",
+    "lodash": "^4.17.15",
+    "prop-types": "^15.7.2",
+    "react": "16.9.0",
+    "react-native": ">=0.55"
+  },
+  "devDependencies": {},
+  "license": "MoMo"
+}