Merge pull request #7 from avid21/master

Use ViewPropTypes (with fallback) inside datepicker and improve falsy label props (Thanks to @Avid21)
pinguinjkeke · Nov 24, 2017 · ec105da · ec105da
2 parents d017232 + fbcd730
commit ec105da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/date-picker.android.js b/src/date-picker.android.js
@@ -1,9 +1,11 @@
 import React, { PureComponent } from 'react';
-import { ColorPropType, StyleSheet, View } from 'react-native';
+import { ColorPropType, StyleSheet, View, ViewPropTypes as RNViewPropTypes } from 'react-native';
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import Picker from './picker';
 
+const ViewPropTypes = RNViewPropTypes || View.propTypes;
+
 const styles = StyleSheet.create({
   picker: {
     flex: 1,
@@ -31,7 +33,7 @@ export default class DatePicker extends PureComponent {
     minimumDate: PropTypes.instanceOf(Date),
     mode: PropTypes.oneOf(['date', 'time', 'datetime']),
     onDateChange: PropTypes.func.isRequired,
-    style: View.propTypes.style,
+    style: ViewPropTypes.style,
     textColor: ColorPropType,
     textSize: PropTypes.number,
     itemSpace: PropTypes.number,

diff --git a/src/picker.js b/src/picker.js
@@ -58,7 +58,7 @@ export default class Picker extends Component {
           <PickerItem
             key={index}
             value={typeof data.value !== 'undefined' ? data.value : data}
-            label={data.label || data.toString()}
+            label={typeof data.label !== 'undefined' ? data.label : data.toString()}
           />
         ))}
       </WheelCurvedPicker>