Skip to content

Commit 9f99174

Browse files
committed
chore: Update typescript support
1 parent abca3bc commit 9f99174

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/Picker.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ export type PickerProps<DateType> =
117117
| PickerDateProps<DateType>
118118
| PickerTimeProps<DateType>;
119119

120-
interface MergedPickerProps<DateType>
121-
extends Omit<
122-
PickerBaseProps<DateType> & PickerDateProps<DateType> & PickerTimeProps<DateType>,
123-
'picker'
124-
> {
120+
// TMP type to fit for ts 3.9.2
121+
type OmitType<DateType> = Omit<PickerBaseProps<DateType>, 'picker'> &
122+
Omit<PickerDateProps<DateType>, 'picker'> &
123+
Omit<PickerTimeProps<DateType>, 'picker'>;
124+
interface MergedPickerProps<DateType> extends OmitType<DateType> {
125125
picker?: PickerMode;
126126
}
127127

src/PickerPanel.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,11 @@ export type PickerPanelProps<DateType> =
109109
| PickerPanelDateProps<DateType>
110110
| PickerPanelTimeProps<DateType>;
111111

112-
interface MergedPickerPanelProps<DateType>
113-
extends Omit<
114-
PickerPanelBaseProps<DateType> &
115-
PickerPanelDateProps<DateType> &
116-
PickerPanelTimeProps<DateType>,
117-
'picker'
118-
> {
112+
// TMP type to fit for ts 3.9.2
113+
type OmitType<DateType> = Omit<PickerPanelBaseProps<DateType>, 'picker'> &
114+
Omit<PickerPanelDateProps<DateType>, 'picker'> &
115+
Omit<PickerPanelTimeProps<DateType>, 'picker'>;
116+
interface MergedPickerPanelProps<DateType> extends OmitType<DateType> {
119117
picker?: PickerMode;
120118
}
121119

src/RangePicker.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,12 @@ export type RangePickerProps<DateType> =
125125
| RangePickerDateProps<DateType>
126126
| RangePickerTimeProps<DateType>;
127127

128-
interface MergedRangePickerProps<DateType>
129-
extends Omit<
130-
RangePickerBaseProps<DateType> &
131-
RangePickerDateProps<DateType> &
132-
RangePickerTimeProps<DateType>,
133-
'picker'
134-
> {
128+
// TMP type to fit for ts 3.9.2
129+
type OmitType<DateType> = Omit<RangePickerBaseProps<DateType>, 'picker'> &
130+
Omit<RangePickerDateProps<DateType>, 'picker'> &
131+
Omit<RangePickerTimeProps<DateType>, 'picker'>;
132+
133+
interface MergedRangePickerProps<DateType> extends OmitType<DateType> {
135134
picker?: PickerMode;
136135
}
137136

@@ -612,7 +611,10 @@ function InnerRangePicker<DateType>(props: RangePickerProps<DateType>) {
612611
panelHoverRangedValue = hoverRangedValue;
613612
}
614613

615-
let panelShowTime: boolean | SharedTimeProps<DateType> | undefined = showTime;
614+
let panelShowTime:
615+
| boolean
616+
| SharedTimeProps<DateType>
617+
| undefined = showTime as SharedTimeProps<DateType>;
616618
if (showTime && typeof showTime === 'object' && showTime.defaultValue) {
617619
const timeDefaultValues: DateType[] = showTime.defaultValue!;
618620
panelShowTime = {

0 commit comments

Comments
 (0)