@@ -129,18 +129,21 @@ type OmitPickerProps<Props> = Omit<
129129 | 'onPickerValueChange'
130130> ;
131131
132+ type RangeShowTimeObject < DateType > = Omit <
133+ SharedTimeProps < DateType > ,
134+ 'defaultValue'
135+ > & {
136+ defaultValue ?: DateType [ ] ;
137+ } ;
138+
132139export interface RangePickerBaseProps < DateType >
133140 extends RangePickerSharedProps < DateType > ,
134141 OmitPickerProps < PickerBaseProps < DateType > > { }
135142
136143export interface RangePickerDateProps < DateType >
137144 extends RangePickerSharedProps < DateType > ,
138145 OmitPickerProps < PickerDateProps < DateType > > {
139- showTime ?:
140- | boolean
141- | ( Omit < SharedTimeProps < DateType > , 'defaultValue' > & {
142- defaultValue ?: DateType [ ] ;
143- } ) ;
146+ showTime ?: boolean | RangeShowTimeObject < DateType > ;
144147}
145148
146149export interface RangePickerTimeProps < DateType >
@@ -624,16 +627,21 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
624627 panelHoverRangedValue = hoverRangedValue ;
625628 }
626629
627- const panelShowTime = showTime ;
630+ const panelShowTime :
631+ | boolean
632+ | SharedTimeProps < DateType >
633+ | undefined = showTime ;
628634 if (
629635 panelShowTime &&
630636 typeof panelShowTime === 'object' &&
631637 panelShowTime . defaultValue
632638 ) {
633- panelShowTime . defaultValue = getValue (
634- panelShowTime . defaultValue ,
635- activePickerIndex ,
636- ) ;
639+ const timeDefaultValues : DateType [ ] = ( showTime as RangeShowTimeObject <
640+ DateType
641+ > ) . defaultValue ! ;
642+
643+ panelShowTime . defaultValue =
644+ getValue ( timeDefaultValues , activePickerIndex ) || undefined ;
637645 }
638646
639647 return (
0 commit comments