Skip to content

Commit ec105da

Browse files
authored
Merge pull request pinguinjkeke#7 from avid21/master
Use ViewPropTypes (with fallback) inside datepicker and improve falsy label props (Thanks to @Avid21)
2 parents d017232 + fbcd730 commit ec105da

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

src/date-picker.android.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import React, { PureComponent } from 'react';
2-
import { ColorPropType, StyleSheet, View } from 'react-native';
2+
import { ColorPropType, StyleSheet, View, ViewPropTypes as RNViewPropTypes } from 'react-native';
33
import PropTypes from 'prop-types';
44
import moment from 'moment';
55
import Picker from './picker';
66

7+
const ViewPropTypes = RNViewPropTypes || View.propTypes;
8+
79
const styles = StyleSheet.create({
810
picker: {
911
flex: 1,
@@ -31,7 +33,7 @@ export default class DatePicker extends PureComponent {
3133
minimumDate: PropTypes.instanceOf(Date),
3234
mode: PropTypes.oneOf(['date', 'time', 'datetime']),
3335
onDateChange: PropTypes.func.isRequired,
34-
style: View.propTypes.style,
36+
style: ViewPropTypes.style,
3537
textColor: ColorPropType,
3638
textSize: PropTypes.number,
3739
itemSpace: PropTypes.number,

src/picker.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default class Picker extends Component {
5858
<PickerItem
5959
key={index}
6060
value={typeof data.value !== 'undefined' ? data.value : data}
61-
label={data.label || data.toString()}
61+
label={typeof data.label !== 'undefined' ? data.label : data.toString()}
6262
/>
6363
))}
6464
</WheelCurvedPicker>

0 commit comments

Comments
 (0)