File tree Expand file tree Collapse file tree 2 files changed +40
-1
lines changed Expand file tree Collapse file tree 2 files changed +40
-1
lines changed Original file line number Diff line number Diff line change @@ -819,7 +819,9 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
819819 onOk = { null }
820820 onSelect = { undefined }
821821 onChange = { undefined }
822- defaultValue = { undefined }
822+ defaultValue = {
823+ mergedActivePickerIndex === 0 ? getValue ( selectedValue , 1 ) : getValue ( selectedValue , 0 )
824+ }
823825 defaultPickerValue = { undefined }
824826 />
825827 </ RangeContext . Provider >
Original file line number Diff line number Diff line change @@ -1863,4 +1863,41 @@ describe('Picker.Range', () => {
18631863 expect ( wrapper . findCell ( 'Jan' ) . hasClass ( 'rc-picker-cell-disabled' ) ) . toBeTruthy ( ) ;
18641864 expect ( wrapper . findCell ( 'Dec' ) . hasClass ( 'rc-picker-cell-disabled' ) ) . toBeFalsy ( ) ;
18651865 } ) ;
1866+
1867+ // https://github.com/ant-design/ant-design/issues/23167
1868+ it ( 'default endDate should be relative startDate' , ( ) => {
1869+ const wrapper = mount ( < MomentRangePicker showTime /> ) ;
1870+ wrapper . openPicker ( ) ;
1871+
1872+ wrapper . selectCell ( 24 ) ;
1873+ wrapper . find ( '.rc-picker-ok button' ) . simulate ( 'click' ) ;
1874+
1875+ wrapper
1876+ . find ( 'ul' )
1877+ . first ( )
1878+ . find ( 'li' )
1879+ . at ( 0 )
1880+ . simulate ( 'click' ) ;
1881+ wrapper . find ( '.rc-picker-ok button' ) . simulate ( 'click' ) ;
1882+
1883+ matchValues ( wrapper , '1990-09-24 00:00:00' , '1990-09-24 00:00:00' ) ;
1884+ } ) ;
1885+
1886+ it ( 'default startDate should be relative endDate' , ( ) => {
1887+ const wrapper = mount ( < MomentRangePicker showTime /> ) ;
1888+ wrapper . openPicker ( 1 ) ;
1889+
1890+ wrapper . selectCell ( 24 ) ;
1891+ wrapper . find ( '.rc-picker-ok button' ) . simulate ( 'click' ) ;
1892+
1893+ wrapper
1894+ . find ( 'ul' )
1895+ . first ( )
1896+ . find ( 'li' )
1897+ . at ( 0 )
1898+ . simulate ( 'click' ) ;
1899+ wrapper . find ( '.rc-picker-ok button' ) . simulate ( 'click' ) ;
1900+
1901+ matchValues ( wrapper , '1990-09-24 00:00:00' , '1990-09-24 00:00:00' ) ;
1902+ } ) ;
18661903} ) ;
You can’t perform that action at this time.
0 commit comments