Skip to content

Commit 898745e

Browse files
committed
fix: showTimeObj ts define
1 parent 840f6d5 commit 898745e

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

src/RangePicker.tsx

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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+
132139
export interface RangePickerBaseProps<DateType>
133140
extends RangePickerSharedProps<DateType>,
134141
OmitPickerProps<PickerBaseProps<DateType>> {}
135142

136143
export 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

146149
export 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 (

src/utils/miscUtil.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default function getDataOrAriaProps(props: any) {
3939
}
4040

4141
export function getValue<T>(
42-
values: null | undefined | [T | null, T | null],
42+
values: null | undefined | (T | null)[],
4343
index: number,
4444
): T | null {
4545
return values ? values[index] : null;

0 commit comments

Comments
 (0)