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

ant-design · Oct 14, 2020 · 0bc651e · 0bc651e
1 parent 43e2651
commit 0bc651e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/components/date-picker/__tests__/DatePicker.test.js b/components/date-picker/__tests__/DatePicker.test.js
@@ -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(

diff --git a/components/date-picker/generatePicker/index.tsx b/components/date-picker/generatePicker/index.tsx
@@ -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,
   };