Skip to content

fix: provided a 'defaultValue' prop to the DatePicker #844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 10, 2020
Merged

fix: provided a 'defaultValue' prop to the DatePicker #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a5db35
Implemented the ability to pass a default value to the datepicker. Th…
SydneyMonis Jan 6, 2020
be99a33
Datepicker with default value
athulvraj Jan 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/DatePicker/DatePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@ import React, { Component } from 'react';
class DatePicker extends Component {
constructor(props) {
super(props);

const ISO_DATE_FORMAT = 'YYYY-MM-DD';
const formattedDate = props.defaultValue.length > 0 ?
moment(props.defaultValue, ISO_DATE_FORMAT).format(this.getLocaleDateFormat()) : '';
this.state = {
hidden: true,
selectedDate: null,
selectedDate: formattedDate.length === 0 ? null : moment(formattedDate, this.getLocaleDateFormat()),
arrSelectedDates: [],
formattedDate: ''
formattedDate
};

this.calendarRef = React.createRef();
Expand Down Expand Up @@ -61,7 +63,7 @@ class DatePicker extends Component {
}

validateDates = () => {
const longDateFormat = moment.localeData(this.props.locale).longDateFormat('L');
const longDateFormat = this.getLocaleDateFormat();

if (this.props.enableRangeSelection) {
const dateRange = this.state.formattedDate.split('-');
Expand Down Expand Up @@ -114,7 +116,7 @@ class DatePicker extends Component {
};

updateDate = (date) => {
const longDateFormat = moment.localeData(this.props.locale).longDateFormat('L');
const longDateFormat = this.getLocaleDateFormat();

if (this.props.enableRangeSelection) {
let formatDate = date[0].format(longDateFormat);
Expand All @@ -133,6 +135,8 @@ class DatePicker extends Component {
}
}

getLocaleDateFormat = () => moment.localeData(this.props.locale).longDateFormat('L');

_handleBlur = () => {
this.props.onBlur({
date: this.state.selectedDate,
Expand Down Expand Up @@ -175,7 +179,7 @@ class DatePicker extends Component {
onChange={this.modifyDate}
onClick={() => this.openCalendar('input')}
onKeyPress={this.sendUpdate}
placeholder={moment.localeData(this.props.locale).longDateFormat('L')}
placeholder={this.getLocaleDateFormat()}
value={this.state.formattedDate} />
<InputGroup.Addon isButton>
<Button {...buttonProps}
Expand Down Expand Up @@ -221,19 +225,22 @@ DatePicker.propTypes = {
...Calendar.basePropTypes,
buttonProps: PropTypes.object,
compact: PropTypes.bool,
defaultValue: PropTypes.string,
enableRangeSelection: PropTypes.bool,
inputProps: PropTypes.object,
locale: PropTypes.string,
onBlur: PropTypes.func
};

DatePicker.defaultProps = {
defaultValue: '',
locale: 'en',
onBlur: () => {}
};

DatePicker.propDescriptions = {
...Calendar.propDescriptions,
defaultValue: 'Default value to be shown in the Datepicker. The only accepted format is the ISO format, i.e. YYYY-MM-DD',
enableRangeSelection: 'Set to **true** to enable the selection of a date range (begin and end).',
locale: 'Language code to set the locale.',
onBlur: 'Callback function for onBlur events. In the object returned, `date` is the date object and `formattedDate` is the formatted date.'
Expand Down
10 changes: 10 additions & 0 deletions src/DatePicker/DatePicker.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ describe('<DatePicker />', () => {
const compactDatePicker = <DatePicker className='blue' compact />;
const rangeDatePicker = <DatePicker enableRangeSelection />;
const compactRangeDatepicker = <DatePicker compact enableRangeSelection />;
const prePopulatedDatepicker = <DatePicker defaultValue='2020-03-13' />;
let wrapper;

afterAll(() => {
Expand Down Expand Up @@ -291,6 +292,15 @@ describe('<DatePicker />', () => {
expect(wrapper.state('formattedDate')).toEqual('05/04/2018');
});

test('pre-populated value for date', () => {
wrapper = mountComponentWithStyles(prePopulatedDatepicker);
expect(wrapper.state('formattedDate')).toEqual('03/13/2020');
wrapper
.find('input[type="text"]')
.simulate('change', { target: { value: '04/14/2020' } });
expect(wrapper.state('formattedDate')).toEqual('04/14/2020');
});

describe('onBlur callback', () => {
test('should call onBlur after clicking outside calendar overlay', () => {
const blur = jest.fn();
Expand Down