diff --git a/components/date-picker/WeekPicker.tsx b/components/date-picker/WeekPicker.tsx index bb8c67e1dd..3837394a45 100644 --- a/components/date-picker/WeekPicker.tsx +++ b/components/date-picker/WeekPicker.tsx @@ -55,7 +55,8 @@ class WeekPicker extends React.Component { weekDateRender = (current: any) => { const selectedValue = this.state.value; - const { prefixCls } = this.props; + const { prefixCls, dateRender } = this.props; + const dateNode = dateRender ? dateRender(current) : current.date(); if ( selectedValue && current.year() === selectedValue.year() && @@ -63,11 +64,11 @@ class WeekPicker extends React.Component { ) { return (
-
{current.date()}
+
{dateNode}
); } - return
{current.date()}
; + return
{dateNode}
; }; handleChange = (value: moment.Moment | null) => { @@ -130,8 +131,7 @@ class WeekPicker extends React.Component { suffixIcon, } = this.props; - const { open } = this.state; - const pickerValue = this.state.value; + const { open, value: pickerValue } = this.state; if (pickerValue && localeCode) { pickerValue.locale(localeCode); } diff --git a/components/date-picker/__tests__/WeekPicker.test.js b/components/date-picker/__tests__/WeekPicker.test.js index 63895aafc0..f7b15cc755 100644 --- a/components/date-picker/__tests__/WeekPicker.test.js +++ b/components/date-picker/__tests__/WeekPicker.test.js @@ -1,5 +1,5 @@ import React from 'react'; -import { mount } from 'enzyme'; +import { mount, render } from 'enzyme'; import DatePicker from '..'; import focusTest from '../../../tests/shared/focusTest'; @@ -12,4 +12,18 @@ describe('WeekPicker', () => { const wrapper = mount(); expect(wrapper.render()).toMatchSnapshot(); }); + + it('should support dateRender', () => { + const wrapper = mount( + {current.format('YYYY-MM-DD')}} />, + ); + expect( + render( + wrapper + .find('Trigger') + .instance() + .getComponent(), + ), + ).toMatchSnapshot(); + }); }); diff --git a/components/date-picker/__tests__/__snapshots__/WeekPicker.test.js.snap b/components/date-picker/__tests__/__snapshots__/WeekPicker.test.js.snap index 7aa25845ae..adf3a4d165 100644 --- a/components/date-picker/__tests__/__snapshots__/WeekPicker.test.js.snap +++ b/components/date-picker/__tests__/__snapshots__/WeekPicker.test.js.snap @@ -1,5 +1,790 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`WeekPicker should support dateRender 1`] = ` +
+
+
+
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + x + + + + Su + + + + Mo + + + + Tu + + + + We + + + + Th + + + + Fr + + + + Sa + +
+ 48 + +
+ + 2018-11-25 + +
+ 		+
+ + 2018-11-26 + +
+ 		+
+ + 2018-11-27 + +
+ 		+
+ + 2018-11-28 + +
+ 		+
+ + 2018-11-29 + +
+ 		+
+ + 2018-11-30 + +
+ 		+
+ + 2018-12-01 + +
+
+ 49 + +
+ + 2018-12-02 + +
+ 		+
+ + 2018-12-03 + +
+ 		+
+ + 2018-12-04 + +
+ 		+
+ + 2018-12-05 + +
+ 		+
+ + 2018-12-06 + +
+ 		+
+ + 2018-12-07 + +
+ 		+
+ + 2018-12-08 + +
+
+ 50 + +
+ + 2018-12-09 + +
+ 		+
+ + 2018-12-10 + +
+ 		+
+ + 2018-12-11 + +
+ 		+
+ + 2018-12-12 + +
+ 		+
+ + 2018-12-13 + +
+ 		+
+ + 2018-12-14 + +
+ 		+
+ + 2018-12-15 + +
+
+ 51 + +
+ + 2018-12-16 + +
+ 		+
+ + 2018-12-17 + +
+ 		+
+ + 2018-12-18 + +
+ 		+
+ + 2018-12-19 + +
+ 		+
+ + 2018-12-20 + +
+ 		+
+ + 2018-12-21 + +
+ 		+
+ + 2018-12-22 + +
+
+ 52 + +
+ + 2018-12-23 + +
+ 		+
+ + 2018-12-24 + +
+ 		+
+ + 2018-12-25 + +
+ 		+
+ + 2018-12-26 + +
+ 		+
+ + 2018-12-27 + +
+ 		+
+ + 2018-12-28 + +
+ 		+
+ + 2018-12-29 + +
+
+ 1 + +
+ + 2018-12-30 + +
+ 		+
+ + 2018-12-31 + +
+ 		+
+ + 2019-01-01 + +
+ 		+
+ + 2019-01-02 + +
+ 		+
+ + 2019-01-03 + +
+ 		+
+ + 2019-01-04 + +
+ 		+
+ + 2019-01-05 + +
+
+
+
+
+
+
+
+`; + exports[`WeekPicker should support style prop 1`] = `