Skip to content
New issue

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

#

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

Already on GitHub? # to your account

added validation to verify if date in DateInput is between minDate and maxDate #539

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added validation to verify if date in DateInput is between minDate and maxDate #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/components/Calendar/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@ class Calendar extends PureComponent {
scrollArea: this.calcScrollArea(props),
};
}
isDateInRange = date => {
return date >= this.props.minDate && date <= this.props.maxDate;
};
getMonthNames() {
return [...Array(12).keys()].map(i => this.props.locale.localize.month(i));
}
Expand Down Expand Up @@ -309,6 +312,7 @@ class Calendar extends PureComponent {
}
onChange={this.onDragSelectionEnd}
onFocus={() => this.handleRangeFocusChange(i, 0)}
isDateInRange={this.isDateInRange}
/>
<DateInput
className={classnames(styles.dateDisplayItem, {
Expand All @@ -327,6 +331,7 @@ class Calendar extends PureComponent {
}
onChange={this.onDragSelectionEnd}
onFocus={() => this.handleRangeFocusChange(i, 1)}
isDateInRange={this.isDateInRange}
/>
</div>
);
Expand Down Expand Up @@ -493,7 +498,7 @@ class Calendar extends PureComponent {
isVertical ? this.styles.monthsVertical : this.styles.monthsHorizontal
)}>
{new Array(this.props.months).fill(null).map((_, i) => {
let monthStep = addMonths(this.state.focusedDate, i);;
let monthStep = addMonths(this.state.focusedDate, i);
if (this.props.calendarFocus === 'backwards') {
monthStep = subMonths(this.state.focusedDate, this.props.months - 1 - i);
}
Expand Down
70 changes: 57 additions & 13 deletions src/components/DateInput/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { format, parse, isValid, isEqual } from 'date-fns';
import { format, parse, isValid as isValidDateFns, isEqual } from 'date-fns';

class DateInput extends PureComponent {
constructor(props, context) {
super(props, context);

this.state = {
invalid: false,
invalid: {
invalidFormat: false,
outOfRange: false,
},
changed: false,
value: this.formatDate(props),
};
Expand All @@ -22,27 +25,43 @@ class DateInput extends PureComponent {
}
}

isValid = value => {
return { isValidFormat: isValidDateFns(value), isInRange: this.props.isDateInRange(value) };
};

formatDate({ value, dateDisplayFormat, dateOptions }) {
if (value && isValid(value)) {
return format(value, dateDisplayFormat, dateOptions);
if (value) {
const { isInRange, isValidFormat } = this.isValid(value);
if (isInRange && isValidFormat) {
return format(value, dateDisplayFormat, dateOptions);
}
}

return '';
}

update(value) {
const { invalid, changed } = this.state;
const {
invalid: { invalidFormat, outOfRange },
changed,
} = this.state;

if (invalid || !changed || !value) {
if (invalidFormat || outOfRange || !changed || !value) {
return;
}

const { onChange, dateDisplayFormat, dateOptions } = this.props;
const parsed = parse(value, dateDisplayFormat, new Date(), dateOptions);

if (isValid(parsed)) {
const { isInRange, isValidFormat } = this.isValid(parsed);
if (isInRange && isValidFormat) {
this.setState({ changed: false }, () => onChange(parsed));
} else {
this.setState({ invalid: true });
this.setState({
invalid: {
invalidFormat: !isValidFormat,
outOfRange: !isInRange,
},
});
}
}

Expand All @@ -55,7 +74,14 @@ class DateInput extends PureComponent {
};

onChange = e => {
this.setState({ value: e.target.value, changed: true, invalid: false });
this.setState({
value: e.target.value,
changed: true,
invalid: {
invalidFormat: false,
outOfRange: false,
},
});
};

onBlur = () => {
Expand All @@ -65,10 +91,24 @@ class DateInput extends PureComponent {

render() {
const { className, readOnly, placeholder, ariaLabel, disabled, onFocus } = this.props;
const { value, invalid } = this.state;
const {
value,
invalid: { invalidFormat, outOfRange },
} = this.state;

const tooltipWarningMessage = invalidFormat
? 'The date format is invalid'
: outOfRange
? 'The date is out of range'
: '';

return (
<span className={classnames('rdrDateInput', className)}>
<span
className={classnames(
{ rdrInvalidDateInput: invalidFormat || outOfRange },
'rdrDateInput',
className
)}>
<input
readOnly={readOnly}
disabled={disabled}
Expand All @@ -80,7 +120,10 @@ class DateInput extends PureComponent {
onBlur={this.onBlur}
onFocus={onFocus}
/>
{invalid && <span className="rdrWarning">&#9888;</span>}
{(invalidFormat || outOfRange) && <span className="rdrWarning">&#9888;</span>}
{tooltipWarningMessage && (
<span className="rdrTooltipWarning">{tooltipWarningMessage}</span>
)}
</span>
);
}
Expand All @@ -97,6 +140,7 @@ DateInput.propTypes = {
className: PropTypes.string,
onFocus: PropTypes.func.isRequired,
onChange: PropTypes.func.isRequired,
isDateInRange: PropTypes.func.isRequired,
};

DateInput.defaultProps = {
Expand Down
33 changes: 32 additions & 1 deletion src/components/DateInput/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
input {
outline: none;
}

.rdrWarning {
position: absolute;
font-size: 1.6em;
Expand All @@ -13,4 +13,35 @@
right: .25em;
color: #FF0000;
}
&.rdrInvalidDateInput {
border:1px solid #FF0000;
}

.rdrTooltipWarning {
visibility: hidden;
width: 200px;
background-color: black;
color: #fff;
text-align: center;
border-radius: 6px;
padding: 5px 0;
position: absolute;
z-index: 1;
top: 130%;
left: 50%;
margin-left: -100px;
}
&:hover .rdrTooltipWarning{
visibility: visible;
}
&:hover .rdrTooltipWarning::after {
content: " ";
position: absolute;
bottom: 100%;
left: 50%;
margin-left: -5px;
border-width: 5px;
border-style: solid;
border-color: transparent transparent black transparent;
}
}
69 changes: 69 additions & 0 deletions src/components/DateInput/index.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
import React from 'react';
import { mount } from 'enzyme';

import DateInput from './index';

const date = new Date('01/01/2021');

describe('DateInput tests', () => {
const onChange = jest.fn();
const onFocus = jest.fn();

test('Should set invalidFormat in state to true', () => {
const isDateInRange = jest.fn();

const wrapper = mount(
<DateInput
readOnly={false}
disabled={false}
value={date}
onChange={onChange}
onFocus={onFocus}
isDateInRange={isDateInRange}
dateDisplayFormat={'MMM d, yyyy'}
/>
);
const input = wrapper.find('input');
input.simulate('change', { target: { value: 'fooo' } });
input.simulate('keydown', { key: 'Enter' });
expect(wrapper.state().invalid.invalidFormat).toEqual(true);
});
test('Should set outOfRange in state to true', () => {
const isDateInRange = jest.fn(() => false);

const wrapper = mount(
<DateInput
readOnly={false}
disabled={false}
value={date}
onChange={onChange}
onFocus={onFocus}
isDateInRange={isDateInRange}
dateDisplayFormat={'MMM d, yyyy'}
/>
);
const input = wrapper.find('input');
input.simulate('change', { target: { value: 'Dec 8, 2021' } });
input.simulate('keydown', { key: 'Enter' });
expect(wrapper.state().invalid.outOfRange).toEqual(true);
});
test('Should call this.props.onChange if valid date', () => {
const isDateInRange = jest.fn(() => true);

const wrapper = mount(
<DateInput
readOnly={false}
disabled={false}
value={date}
onChange={onChange}
onFocus={onFocus}
isDateInRange={isDateInRange}
dateDisplayFormat={'MMM d, yyyy'}
/>
);
const input = wrapper.find('input');
input.simulate('change', { target: { value: 'Dec 8, 2021' } });
input.simulate('keydown', { key: 'Enter' });
expect(onChange).toHaveBeenCalledTimes(1);
});
});