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

Adding date to displayFormat parameters #2086

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

Adding date to displayFormat parameters #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16cdc21
Adding date to displayFormat parameters
mgm793 Jan 28, 2021
903e126
Adding tests
mgm793 Mar 3, 2021
3fd7141
Remove console log
mgm793 Mar 3, 2021
4d9b682
Merge branch 'master' into feature/custom-input-format
mgm793 Aug 11, 2021
5fdfd3e
Merge branch 'master' into feature/custom-input-format
mgm793 Sep 5, 2022
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
6 changes: 3 additions & 3 deletions src/components/DateRangePickerInputController.jsx
View file
Open in desktop
Expand Up @@ -261,13 +261,13 @@ export default class DateRangePickerInputController extends React.PureComponent
}
}

getDisplayFormat() {
getDisplayFormat(date) {
const { displayFormat } = this.props;
return typeof displayFormat === 'string' ? displayFormat : displayFormat();
return typeof displayFormat === 'string' ? displayFormat : displayFormat(date);
}

getDateString(date) {
const displayFormat = this.getDisplayFormat();
const displayFormat = this.getDisplayFormat(date);
if (date && displayFormat) {
return date && date.format(displayFormat);
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/SingleDatePickerInputController.jsx
View file
Open in desktop
Expand Up @@ -179,13 +179,13 @@ export default class SingleDatePickerInputController extends React.PureComponent
onClose({ date });
}

getDisplayFormat() {
getDisplayFormat(date) {
const { displayFormat } = this.props;
return typeof displayFormat === 'string' ? displayFormat : displayFormat();
return typeof displayFormat === 'string' ? displayFormat : displayFormat(date);
}

getDateString(date) {
const displayFormat = this.getDisplayFormat();
const displayFormat = this.getDisplayFormat(date);
if (date && displayFormat) {
return date && date.format(displayFormat);
}
Expand Down
18 changes: 18 additions & 0 deletions test/components/DateRangePickerInputController_spec.jsx
View file
Open in desktop
Expand Up @@ -704,6 +704,24 @@ describe('DateRangePickerInputController', () => {
expect(endDate).to.equal(wrapper.instance().props.endDate);
});

it('calls props.onDatesChange with custom function format', () => {
const onDatesChangeStub = sinon.stub();
const customFunctionFormat = (date) => date;
const customDate = moment(today).add(5, 'days');
const wrapper = shallow((
<DateRangePickerInputController
displayFormat={customFunctionFormat}
onDatesChange={onDatesChangeStub}
/>
));
wrapper.instance().onStartDateChange(customDate);
expect(onDatesChangeStub.callCount).to.equal(1);

const { startDate, endDate } = onDatesChangeStub.getCall(0).args[0];
expect(startDate).to.deep.equal(customDate);
expect(endDate).to.equal(wrapper.instance().props.endDate);
});

describe('props.onFocusChange', () => {
it('is called once', () => {
const onFocusChangeStub = sinon.stub();
Expand Down