Fixed otherProps spreading

mmazzarolo · Sep 16, 2016 · 009ad57 · 009ad57
1 parent d7a03e1
commit 009ad57
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-modal-datetime-picker",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A react-native datetime-picker for Android and iOS",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/CustomDatePickerAndroid/index.js b/src/CustomDatePickerAndroid/index.js
@@ -4,17 +4,17 @@ import moment from 'moment'
 
 export default class CustomDatePickerAndroid extends Component {
   static propTypes = {
-    visible: PropTypes.bool,
-    onConfirm: PropTypes.func.isRequired,
-    onCancel: PropTypes.func.isRequired,
+    date: PropTypes.instanceOf(Date),
     mode: PropTypes.oneOf(['date', 'time']),
-    date: PropTypes.object
+    onCancel: PropTypes.func.isRequired,
+    onConfirm: PropTypes.func.isRequired,
+    visible: PropTypes.bool
   }
 
   static defaultProps = {
-    visible: false,
+    date: new Date(),
     mode: 'date',
-    date: new Date()
+    visible: false
   }
 
   componentDidUpdate = (prevProps) => {

diff --git a/src/CustomDatePickerIOS/index.js b/src/CustomDatePickerIOS/index.js
@@ -6,23 +6,23 @@ import styles from './index.style'
 
 export default class CustomDatePickerIOS extends Component {
   static propTypes = {
-    visible: PropTypes.bool,
+    cancelTextIOS: PropTypes.string,
+    confirmTextIOS: PropTypes.string,
+    date: PropTypes.instanceOf(Date),
+    mode: PropTypes.oneOf(['date', 'time']),
     onConfirm: PropTypes.func.isRequired,
     onCancel: PropTypes.func.isRequired,
-    mode: PropTypes.oneOf(['date', 'time']),
-    date: PropTypes.object,
     titleIOS: PropTypes.string,
-    confirmTextIOS: PropTypes.string,
-    cancelTextIOS: PropTypes.string
+    visible: PropTypes.bool
   }
 
   static defaultProps = {
-    visible: false,
-    mode: 'date',
+    cancelTextIOS: 'Cancel',
+    confirmTextIOS: 'Confirm',
     date: new Date(),
+    mode: 'date',
     titleIOS: 'Pick a date',
-    confirmTextIOS: 'Confirm',
-    cancelTextIOS: 'Cancel'
+    visible: false
   }
 
   state = {
@@ -34,7 +34,7 @@ export default class CustomDatePickerIOS extends Component {
   _handleDateChange = (date) => this.setState({ date })
 
   render () {
-    const { onCancel, visible, mode, titleIOS, confirmTextIOS, cancelTextIOS, ...otherProps } = this.props
+    const { onCancel, visible, mode, titleIOS, confirmTextIOS, cancelTextIOS, date, ...otherProps } = this.props
     return (
       <CustomModal visible={visible} contentContainerStyle={styles.contentContainer}>
         <View style={styles.datepickerContainer}>