Skip to content
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

Jump to bottom

Store the typed value even if an invalid date #778

Merged
merged 2 commits into from Aug 26, 2018
Merged

Store the typed value even if an invalid date #778

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
4c191be
Store the typed value even if an invalid date
gpbl Aug 26, 2018
eea93ea
Add unit test
gpbl Aug 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/DayPickerInput.js
View file
Open in desktop
Expand Up @@ -260,7 +260,7 @@ export default class DayPickerInput extends React.Component {
*/
updateState(day, value, callback) {
const { dayPickerProps, onDayChange } = this.props;
this.setState({ month: day, value }, () => {
this.setState({ month: day, value, typedValue: undefined }, () => {
if (callback) {
callback();
}
Expand Down Expand Up @@ -399,13 +399,14 @@ export default class DayPickerInput extends React.Component {
}
const { value } = e.target;
if (value.trim() === '') {
this.setState({ value });
this.setState({ value, typedValue: undefined });
if (onDayChange) onDayChange(undefined, {});
return;
}
const day = parseDate(value, format, dayPickerProps.locale);
if (!day) {
this.setState({ value });
// Day is invalid: we save the value in the typedValue state
this.setState({ value, typedValue: value });
if (onDayChange) onDayChange(undefined, {});
return;
}
Expand Down Expand Up @@ -557,7 +558,7 @@ export default class DayPickerInput extends React.Component {
ref={el => (this.input = el)}
placeholder={this.props.placeholder}
{...inputProps}
value={this.state.value}
value={this.state.typedValue || this.state.value}
onChange={this.handleInputChange}
onFocus={this.handleInputFocus}
onBlur={this.handleInputBlur}
Expand Down
17 changes: 16 additions & 1 deletion test/daypickerinput/events.js
View file
Open in desktop
Expand Up @@ -324,7 +324,7 @@ describe('DayPickerInput', () => {
expect(wrapper.find('input')).toHaveProp('value', '');
expect(wrapper.find('.DayPicker-Day--selected')).toHaveLength(1);
});
it('should call `onDayChange` when clicking a selected day', () => {
it('should call `onDayChange` when clicking a selected day and unselect the day', () => {
const onDayChange = jest.fn();
const wrapper = mount(
<DayPickerInput
Expand All @@ -349,6 +349,21 @@ describe('DayPickerInput', () => {
foo: true,
});
});
it.only('should call `onDayChange` when typing an invalid day', () => {
const onDayChange = jest.fn();
const wrapper = mount(
<DayPickerInput onDayChange={onDayChange} clickUnselectsDay />
);
wrapper.update();
wrapper
.find('input')
.simulate('change', { target: { value: '02/07/x' } });
wrapper.update();
expect(onDayChange).toHaveBeenCalledWith(undefined, {});
wrapper.setState({ typedValue: '02/07/x', value: '' });
expect(wrapper.state('typedValue')).toBe('02/07/x');
expect(wrapper.find('input')).toHaveProp('value', '02/07/x');
});
it('should not call `onDayChange` if the day is disabled', () => {
const onDayChange = jest.fn();
const wrapper = mount(
Expand Down