Skip to content

Commit 09847cc

Browse files
committed
generate changelog
1 parent 5377499 commit 09847cc

File tree

2 files changed

+33
-4
lines changed

2 files changed

+33
-4
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<a name="1.7.0"></a>
2+
# [1.7.0](https://github.com/xgfe/react-native-datepicker/compare/v1.6.0...v1.7.0) (2018-04-08)
3+
4+
5+
### Bug Fixes
6+
7+
* **datepicker:** fix warns when pass moment instance to date prop ([7450bba](https://github.com/xgfe/react-native-datepicker/commit/7450bba)), closes [#166](https://github.com/xgfe/react-native-datepicker/issues/166)
8+
9+
10+
### Features
11+
12+
* **datepicker:** add `getDateStr` prop to customize display outside moment format ([905dfbd](https://github.com/xgfe/react-native-datepicker/commit/905dfbd))
13+
* **datepicker:** pass `locale` to native control if given ([60e3887](https://github.com/xgfe/react-native-datepicker/commit/60e3887))
14+
* **datepicker:** merge some PR for bugs ([5377499](https://github.com/xgfe/react-native-datepicker/commit/5377499))
15+
16+
17+
118
<a name="1.6.0"></a>
219
# [1.6.0](https://github.com/xgfe/react-native-datepicker/compare/v1.5.1...v1.6.0) (2017-06-12)
320

datepicker.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,17 @@ class DatePicker extends Component {
179179
const {date, placeholder, customStyles, allowFontScaling} = this.props;
180180

181181
if (!date && placeholder) {
182-
return (<Text allowFontScaling={allowFontScaling} style={[Style.placeholderText, customStyles.placeholderText]}>{placeholder}</Text>);
182+
return (
183+
<Text allowFontScaling={allowFontScaling} style={[Style.placeholderText, customStyles.placeholderText]}>
184+
{placeholder}
185+
</Text>
186+
);
183187
}
184-
return (<Text allowFontScaling={allowFontScaling} style={[Style.dateText, customStyles.dateText]}>{this.getDateStr()}</Text>);
188+
return (
189+
<Text allowFontScaling={allowFontScaling} style={[Style.dateText, customStyles.dateText]}>
190+
{this.getDateStr()}
191+
</Text>
192+
);
185193
}
186194

187195
onDateChange(date) {
@@ -422,7 +430,11 @@ class DatePicker extends Component {
422430
style={[Style.btnText, Style.btnConfirm, customStyles.btnConfirm]}
423431
testID={confirmBtnTestID}
424432
>
425-
<Text allowFontScaling={allowFontScaling} style={[Style.btnTextText, customStyles.btnTextConfirm]}>{confirmBtnText}</Text>
433+
<Text allowFontScaling={allowFontScaling}
434+
style={[Style.btnTextText, customStyles.btnTextConfirm]}
435+
>
436+
{confirmBtnText}
437+
</Text>
426438
</TouchableComponent>
427439
</Animated.View>
428440
</TouchableComponent>
@@ -484,7 +496,7 @@ DatePicker.propTypes = {
484496
modalOnResponderTerminationRequest: PropTypes.func,
485497
is24Hour: PropTypes.bool,
486498
getDateStr: PropTypes.func,
487-
locale: PropTypes.string,
499+
locale: PropTypes.string
488500
};
489501

490502
export default DatePicker;

0 commit comments

Comments
 (0)