mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-27 20:49:53 +08:00
Code Issues Actions 39 Packages Projects Releases Wiki Activity

fix(date-picker): showTime should work correctly when format is function (#27156)

Browse Source
This commit is contained in:
Kermit Xuan 2020-10-14 23:00:18 +08:00 committed by GitHub
parent 43e2651b9c
commit e883e4ba40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/date-picker/__tests__/DatePicker.test.js
View File

@ -138,6 +138,13 @@ describe('DatePicker', () => {
.length,
).toBe(60);
});
it('showTime should work correctly when format is custom function', () => {
const wrapper = mount(
<DatePicker defaultValue={moment()} showTime format={val => val.format('YYYY-MM-DD')} open />,
);
const input = wrapper.find('input').simulate('mousedown');
expect(input.simulate.bind(input, 'focus')).not.toThrowError();
});
it('12 hours', () => {
const wrapper = mount(

5
components/date-picker/generatePicker/index.tsx
View File

@ -56,6 +56,11 @@ export function getTimeProps<DateType>(
return showTimeObj;
}
if (typeof firstFormat === 'function') {
// format of showTime should use default when format is custom format function
delete showTimeObj.format;
}
return {
showTime: showTimeObj,
};