Skip to content

Add rangeConstraint prop #2

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add rangeConstraint prop #2

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
5a7082a
Add rangeConstraint prop
kevinchappell Jun 4, 2017
c916749
Add test
kevinchappell Jun 4, 2017
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
15 changes: 14 additions & 1 deletion Calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default class Calendar extends Component {
static propTypes = {
i18n: PropTypes.string,
format: PropTypes.string,
rangeConstraint: PropTypes.string,
customI18n: PropTypes.object,
color: PropTypes.object,
minDate: PropTypes.oneOfType([PropTypes.string, PropTypes.instanceOf(Date)]),
Expand All @@ -31,6 +32,7 @@ export default class Calendar extends Component {
static defaultProps = {
format: 'YYYY-MM-DD',
i18n: 'en',
rangeConstraint: 'none',
customI18n: {},
color: {}
}
Expand Down Expand Up @@ -153,7 +155,18 @@ export default class Calendar extends Component {
startDate,
endDate
} = this.state;
if ((!startDate && !endDate) || day < startDate || (startDate && endDate)) {
if (this.props.rangeConstraint === 'week') {
let startDay = Moment(day).startOf('week')
let endDay = Moment(day).endOf('week')
this.setState({
startDate: startDay,
endDate: endDay,
startDateText: this._i18n(startDay, 'date'),
startWeekdayText: this._i18n(startDay.isoWeekday(), 'weekday'),
endDateText: this._i18n(endDay, 'date'),
endWeekdayText: this._i18n(endDay.isoWeekday(), 'weekday')
});
} else if ((!startDate && !endDate) || day < startDate || (startDate && endDate)) {
this.setState({
startDate: day,
endDate: null,
Expand Down
20 changes: 20 additions & 0 deletions __tests__/Calendar.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,26 @@ let invalidDateCalC = shallow(
/>
);

let rangeConstraintWeekCal = shallow(
<Calendar
format="YYYYMMDD"
rangeConstraint="week"
/>
);

test('It constrains selection to full weeks', done => {
let instance = rangeConstraintWeekCal.instance();
expect(rangeConstraintWeekCal.state('isModalVisible')).toEqual(false);
instance.componentDidMount();
instance.open();
instance._onChoose(Moment('20170607', 'YYYYMMDD'));
expect(rangeConstraintWeekCal.state('startDate').isSame(Moment('20170604', 'YYYYMMDD'))).toEqual(true);
expect(rangeConstraintWeekCal.state('startWeekdayText')).toEqual('Sunday');
expect(rangeConstraintWeekCal.state('endWeekdayText')).toEqual('Saturday');
expect(rangeConstraintWeekCal.state('endDate').isSame(Moment('20170610', 'YYYYMMDD').endOf('week'))).toEqual(true);
done();
});

test('It renders calendar correctly', done => {
let instance = cal.instance();
expect(cal.state('isModalVisible')).toEqual(false);
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"ios": "react-native run-ios",
"android": "react-native run-android",
"test": "jest",
"test:watch": "jest --watch",
"coverage": "cat ./coverage/lcov.info | coveralls",
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
},
Expand Down