@momo-kits/date-picker 0.0.19 → 0.0.24

package/datePicker/DatePicker.js

@@ -6,7 +6,7 @@ import {
 } from 'react-native';
 import PropTypes from 'prop-types';
 import {
-    BottomPopupHeader, Button, Text, ScreenUtils, SwitchLanguage, Spacing
+    BottomPopupHeader, Button, Text, ScreenUtils, SwitchLanguage, Spacing, Colors
 } from '@momo-kits/core';
 import WheelPicker from './WheelPicker';
 import DatePickerHelper from './helper/DatePickerHelper';
@@ -26,13 +26,22 @@ const styles = StyleSheet.create({
         width: widthScreen,
         alignItems: 'center',
         justifyContent: 'center',
+        paddingHorizontal: 21,
+        paddingTop: 12
     },
     column: {
         borderWidth: 2,
         borderColor: 'red',
     },
     header: {
-        borderRadius: 16,
+        borderTopLeftRadius: 12,
+        borderTopRightRadius: 12,
+        //backgroundColor:'red',
+        height: 64,
+        borderBottomColor: Colors.black_04,
+        borderBottomWidth: 1,
+        alignItems:'center',
+        justifyContent:'center',
         marginBottom: 0, // Spacing.S,
     },
     view: {
@@ -171,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;
@@ -261,7 +268,6 @@ class DatePicker extends Component {
         const year = this.years[this.yearIndex];
         const hour = this.hours[this.hourIndex];
         const minute = this.minutes[this.minuteIndex];
-
         const selectedDateFormatted = DatePickerHelper.toString(day, month, year, hour, minute, format);
 
         if (onSelected && typeof onSelected === 'function') {
@@ -540,7 +546,7 @@ class DatePicker extends Component {
     renderFooter() {
         const { titleFooter, renderFooter } = this.props;
         return renderFooter ? renderFooter() : (
-            <View style={{ paddingHorizontal: 12, marginBottom: ifIphoneX(29, 11), marginTop: 28 }}>
+            <View style={{ paddingHorizontal: 12, marginBottom: ifIphoneX(35, 12), marginTop: 16 }}>
                 <Button
                     onPress={this.finish}
                     title={titleFooter || SwitchLanguage.confirm}

package/datePicker/WheelPicker.js

@@ -6,6 +6,7 @@ import {
     LinearGradient, Text, Colors, ScaleSize
 } from '@momo-kits/core';
 import ScrollCustom from './custom/ScrollCustom';
+import DatePickerHelper from './helper/DatePickerHelper';
 
 const widthScreen = Dimensions.get('window').width;
 // var heightScreen = Dimensions.get('window').height;
@@ -171,19 +172,20 @@ export default class WheelPicker extends Component {
         const { items, value, width } = this.state;
         const { preFix, bottomOffset } = this.props;
         return (
-            <View style={{ flex: 1, height: heightContain + 20 }}>
-                <Text.SubTitle style={{
+            <View style={{ flex: 1, height: heightContain + 40 }}>
+                <Text.SubTitle weight='bold' style={{
                     color: Colors.black_17, marginLeft: 6, marginBottom: 3
                 }}
                 >
-                    {preFix?.toUpperCase()}
+                    {DatePickerHelper.capitalizeFirstLetter(preFix || '')}
                 </Text.SubTitle>
                 <View
                     style={{
                         flex: 1,
                         height: heightContain,
-                        // backgroundColor: 'blue',
+                        //backgroundColor: 'blue',
                         marginHorizontal: 6,
+                        paddingBottom: 20,
                         borderWidth: 1,
                         borderColor: Colors.black_04,
                         borderRadius: 8,

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;
@@ -194,4 +198,8 @@ export default class DatePickerHelper {
 
         return monthLength[month - 1];
     }
+
+    static capitalizeFirstLetter(string) {
+        return string.charAt(0).toUpperCase() + string.slice(1);
+      }
 }

package/package.json

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