File tree Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Expand file tree Collapse file tree 2 files changed +12
-1
lines changed Original file line number Diff line number Diff line change @@ -294,7 +294,12 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
294294
295295 // Fill disabled unit
296296 for ( let i = 0 ; i < 2 ; i += 1 ) {
297- if ( mergedDisabled [ i ] && ! getValue ( postValues , i ) && ! getValue ( allowEmpty , i ) ) {
297+ if (
298+ mergedDisabled [ i ] &&
299+ ! postValues &&
300+ ! getValue ( postValues , i ) &&
301+ ! getValue ( allowEmpty , i )
302+ ) {
298303 postValues = updateValues ( postValues , generateConfig . getNow ( ) , i ) ;
299304 }
300305 }
Original file line number Diff line number Diff line change @@ -1724,4 +1724,10 @@ describe('Picker.Range', () => {
17241724 expect ( wrapper . find ( '.rc-picker-panel-container' ) . getDOMNode ( ) . style . marginLeft ) . toBe ( '295px' ) ;
17251725 mock . mockRestore ( ) ;
17261726 } ) ;
1727+
1728+ it ( 'range picker should use the passed in default when part is disabled' , ( ) => {
1729+ mount ( < MomentRangePicker defaultValue = { [ null , null ] } disabled = { [ false , true ] } /> ) ;
1730+
1731+ expect ( document . querySelectorAll ( 'input' ) [ 1 ] . value ) . toBeFalsy ( ) ;
1732+ } ) ;
17271733} ) ;
You can’t perform that action at this time.
0 commit comments