@momo-kits/date-picker 0.0.53-beta.8 → 0.0.54-beta.3

package/datePicker/DatePicker.js

@@ -594,9 +594,9 @@ class DatePicker extends Component {
         const { description, descriptionStyle, renderDescription } = this.props;
         if (renderDescription) return renderDescription;
         return description ? (
-            <Text.Title style={[{ marginBottom: Spacing.S }, descriptionStyle]}>
+            <Text style={[{ marginBottom: Spacing.S }, descriptionStyle]}>
                 {description}
-            </Text.Title>
+            </Text>
         ) : null;
     };
 

package/datePicker/DatePickerInput.js

@@ -3,13 +3,32 @@ import React, { useState } from 'react';
 import { StyleSheet } from 'react-native';
 import { isEmpty } from 'lodash';
 import {
-    IconSource, TouchableOpacity, Text, Colors, ValueUtil, Image
+    IconSource,
+    TouchableOpacity,
+    Text,
+    Colors,
+    ValueUtil,
+    Image,
 } from '@momo-kits/core';
 import DatePicker from './DatePicker';
 
 const DatePickerInput = ({
-    navigator, defaultDate, maxDate, minDate, format = 'dd/MM/YYYY', onSelected, onClose,
-    style, textStyle, icon, iconStyle, error, disabled, minuteArray, title, showRightIcon
+    navigator,
+    defaultDate,
+    maxDate,
+    minDate,
+    format = 'dd/MM/YYYY',
+    onSelected,
+    onClose,
+    style,
+    textStyle,
+    icon,
+    iconStyle,
+    error,
+    disabled,
+    minuteArray,
+    title,
+    showRightIcon,
 }) => {
     const [selected, setSelected] = useState(defaultDate || '');
 
@@ -29,7 +48,7 @@ const DatePickerInput = ({
                     onSelected?.(dateSelected);
                     setSelected(dateSelected);
                 },
-            }
+            },
         });
     };
     let otherStyle = {};
@@ -40,15 +59,27 @@ const DatePickerInput = ({
         <TouchableOpacity
             disabled={disabled}
             onPress={onPress}
-            style={[styles.container, ValueUtil.extractStyle(style), otherStyle]}
-        >
-            <Text.Title style={[styles.defaultText, ValueUtil.extractStyle(textStyle), isEmpty(selected) ? { color: Colors.black_09 } : {}]}>{isEmpty(selected) ? format : selected}</Text.Title>
+            style={[
+                styles.container,
+                ValueUtil.extractStyle(style),
+                otherStyle,
+            ]}>
+            <Text
+                style={[
+                    styles.defaultText,
+                    ValueUtil.extractStyle(textStyle),
+                    isEmpty(selected) ? { color: Colors.black_09 } : {},
+                ]}>
+                {isEmpty(selected) ? format : selected}
+            </Text>
             {showRightIcon ? (
                 <Image
                     source={icon || IconSource.ic_calendar}
                     style={[styles.icon, ValueUtil.extractStyle(iconStyle)]}
                 />
-            ) : <View />}
+            ) : (
+                <View />
+            )}
         </TouchableOpacity>
     );
 };
@@ -69,10 +100,10 @@ DatePickerInput.propTypes = {
     disabled: PropTypes.bool,
     minuteArray: PropTypes.arrayOf(PropTypes.string),
     showRightIcon: PropTypes.bool,
-    title: PropTypes.string
+    title: PropTypes.string,
 };
 DatePickerInput.defaultProps = {
-    showRightIcon: true
+    showRightIcon: true,
 };
 
 export default DatePickerInput;
@@ -82,7 +113,7 @@ const styles = StyleSheet.create({
         width: 16,
         height: 16,
         resizeMode: 'contain',
-        tintColor: Colors.black_09
+        tintColor: Colors.black_09,
     },
     container: {
         flexDirection: 'row',
@@ -93,16 +124,16 @@ const styles = StyleSheet.create({
         alignItems: 'center',
         justifyContent: 'space-between',
         paddingHorizontal: 12,
-        backgroundColor: Colors.black_01
+        backgroundColor: Colors.black_01,
     },
     error: {
-        borderColor: Colors.red_05
+        borderColor: Colors.red_05,
     },
     defaultText: {
         // fontSize: 14
     },
     disabled: {
         backgroundColor: Colors.black_05,
-        borderWidth: 0
-    }
-});
+        borderWidth: 0,
+    },
+});

package/datePicker/ListPicker.js

@@ -1,9 +1,14 @@
 import React, { Component } from 'react';
+import { Dimensions, StyleSheet, View } from 'react-native';
 import {
-    Dimensions, StyleSheet, View
-} from 'react-native';
-import {
-    Button, IconSource, TouchableOpacity, Text, Colors, Image, DeviceUtils, SwitchLanguage
+    Button,
+    IconSource,
+    TouchableOpacity,
+    Text,
+    Colors,
+    Image,
+    DeviceUtils,
+    SwitchLanguage,
 } from '@momo-kits/core';
 import WheelPicker from './WheelPicker';
 
@@ -26,41 +31,41 @@ export default class ListPicker extends Component {
                 }
             });
         }
-    }
+    };
 
     onBeginDrag = () => {
         if (this.refs.picker) {
             this.refs.picker.setScrollEnabled(false);
         }
-    }
+    };
 
     onEndDrag = () => {
         if (this.refs.picker) {
             this.refs.picker.setScrollEnabled(true);
         }
-    }
+    };
 
     onChangeValue = (value) => {
         const { callback } = this.props;
         if (typeof callback === 'function') {
             callback(value);
         }
-    }
+    };
 
     onPressClear = () => {
         this.hide();
-    }
+    };
 
     onPressChoose = () => {
         this.onChangeValue(this.data);
         this.hide();
-    }
+    };
 
     renderRight = () => (
-        <TouchableOpacity
-            onPress={this.onPressChoose}
-        >
-            <Text.Title style={{ fontWeight: 'bold', color: Colors.pink_05 }}>{SwitchLanguage.save}</Text.Title>
+        <TouchableOpacity onPress={this.onPressChoose}>
+            <Text style={{ fontWeight: 'bold', color: Colors.pink_05 }}>
+                {SwitchLanguage.save}
+            </Text>
         </TouchableOpacity>
     );
 
@@ -78,10 +83,12 @@ export default class ListPicker extends Component {
         return (
             <View style={styles.header}>
                 {this.renderLeftIcon()}
-                <Text style={styles.title}>
-                    {title}
-                </Text>
-                {this.props.typeStyle === 'aboveAction' ? this.renderRight() : <View style={{ width: 25 }} />}
+                <Text style={styles.title}>{title}</Text>
+                {this.props.typeStyle === 'aboveAction' ? (
+                    this.renderRight()
+                ) : (
+                    <View style={{ width: 25 }} />
+                )}
             </View>
         );
     }
@@ -103,7 +110,6 @@ export default class ListPicker extends Component {
                         this.data = value;
                     }}
                 />
-
             </View>
         );
     }
@@ -113,26 +119,24 @@ export default class ListPicker extends Component {
             <View style={styles.view}>
                 {this.renderHeader()}
                 {this.renderContent()}
-                {
-                    this.props.typeStyle === 'aboveAction'
-                        ? null
-                        : (
-                            <View style={styles.btnView}>
-                                <Button
-                                    style={{ flex: 1 }}
-                                    title={SwitchLanguage.cancel}
-                                    buttonStyle={{ backgroundColor: Colors.second_text_color }}
-                                    onPress={this.onPressClear}
-                                />
-                                <Button
-                                    style={{ flex: 1, marginLeft: 15 }}
-                                    title={SwitchLanguage.choose}
-                                    type="primary"
-                                    onPress={this.onPressChoose}
-                                />
-                            </View>
-                        )
-                }
+                {this.props.typeStyle === 'aboveAction' ? null : (
+                    <View style={styles.btnView}>
+                        <Button
+                            style={{ flex: 1 }}
+                            title={SwitchLanguage.cancel}
+                            buttonStyle={{
+                                backgroundColor: Colors.second_text_color,
+                            }}
+                            onPress={this.onPressClear}
+                        />
+                        <Button
+                            style={{ flex: 1, marginLeft: 15 }}
+                            title={SwitchLanguage.choose}
+                            type="primary"
+                            onPress={this.onPressChoose}
+                        />
+                    </View>
+                )}
             </View>
         );
     }
@@ -143,7 +147,7 @@ const styles = StyleSheet.create({
         flexDirection: 'row',
         width: widthScreen,
         alignItems: 'center',
-        justifyContent: 'center'
+        justifyContent: 'center',
     },
     contentStyle: {
         height: 230,
@@ -165,29 +169,29 @@ const styles = StyleSheet.create({
     },
     view: {
         backgroundColor: 'white',
-        paddingBottom: 10 + (isIphoneX() ? 10 : 0)
+        paddingBottom: 10 + (isIphoneX() ? 10 : 0),
     },
     title: {
         fontWeight: 'bold',
         color: Colors.black_17,
         flex: 1,
         fontSize: 16,
-        textAlign: 'center'
+        textAlign: 'center',
     },
     titleCancel: {
         fontSize: 17,
-        color: '#4A90E2'
+        color: '#4A90E2',
     },
     titleConfirm: {
         fontSize: 17,
         color: '#4A90E2',
-        textAlign: 'right'
+        textAlign: 'right',
     },
     btnView: {
         flexDirection: 'row',
         justifyContent: 'space-between',
         marginHorizontal: 15,
         height: 60,
-        alignItems: 'center'
-    }
+        alignItems: 'center',
+    },
 });

package/datePicker/WheelPicker.js

@@ -187,7 +187,7 @@ export default class WheelPicker extends Component {
         const { preFix, bottomOffset } = this.props;
         return (
             <View style={{ flex: 1, height: heightContain + 40 }}>
-                <Text.SubTitle
+                <Text
                     weight="bold"
                     style={{
                         color: Colors.black_17,
@@ -195,7 +195,7 @@ export default class WheelPicker extends Component {
                         marginBottom: 3,
                     }}>
                     {DatePickerHelper.capitalizeFirstLetter(preFix || '')}
-                </Text.SubTitle>
+                </Text>
                 <View
                     style={{
                         flex: 1,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@momo-kits/date-picker",
-    "version": "0.0.53-beta.8",
+    "version": "0.0.54-beta.3",
     "private": false,
     "main": "index.js",
     "dependencies": {

package/publish.sh

@@ -21,7 +21,7 @@ rsync -r --verbose --exclude '*.mdx' --exclude '*Demo.js'  --exclude 'props-type
 #npm login
 #publish dist to npm
 cd dist
-npm publish --tag beta --access=public --otp=429718
+npm publish --tag beta --access=public
 cd ..
 rm -rf dist