@@ -129,18 +129,21 @@ type OmitPickerProps<Props> = Omit<
129
129
| 'onPickerValueChange'
130
130
> ;
131
131
132
+ type RangeShowTimeObject < DateType > = Omit <
133
+ SharedTimeProps < DateType > ,
134
+ 'defaultValue'
135
+ > & {
136
+ defaultValue ?: DateType [ ] ;
137
+ } ;
138
+
132
139
export interface RangePickerBaseProps < DateType >
133
140
extends RangePickerSharedProps < DateType > ,
134
141
OmitPickerProps < PickerBaseProps < DateType > > { }
135
142
136
143
export interface RangePickerDateProps < DateType >
137
144
extends RangePickerSharedProps < DateType > ,
138
145
OmitPickerProps < PickerDateProps < DateType > > {
139
- showTime ?:
140
- | boolean
141
- | ( Omit < SharedTimeProps < DateType > , 'defaultValue' > & {
142
- defaultValue ?: DateType [ ] ;
143
- } ) ;
146
+ showTime ?: boolean | RangeShowTimeObject < DateType > ;
144
147
}
145
148
146
149
export interface RangePickerTimeProps < DateType >
@@ -624,16 +627,21 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
624
627
panelHoverRangedValue = hoverRangedValue ;
625
628
}
626
629
627
- const panelShowTime = showTime ;
630
+ const panelShowTime :
631
+ | boolean
632
+ | SharedTimeProps < DateType >
633
+ | undefined = showTime ;
628
634
if (
629
635
panelShowTime &&
630
636
typeof panelShowTime === 'object' &&
631
637
panelShowTime . defaultValue
632
638
) {
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 ;
637
645
}
638
646
639
647
return (
0 commit comments