mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-01-19 06:43:16 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:AdonLee/ant-design into AdonLee-master

Browse Source
This commit is contained in:
afc163 2022-11-04 11:39:24 +08:00
commit f26e9c131d
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/date-picker/generatePicker/generateRangePicker.tsx
View File

@ -23,12 +23,9 @@ import warning from '../../_util/warning';
export default function generateRangePicker<DateType>(
generateConfig: GenerateConfig<DateType>,
): PickerComponentClass<RangePickerProps<DateType>> {
) {
type InternalRangePickerProps = RangePickerProps<DateType> & {};
const RangePicker = forwardRef<
InternalRangePickerProps | CommonPickerMethods,
RangePickerProps<DateType> & {
type DateRangePickerProps = RangePickerProps<DateType> & {
/**
* @deprecated `dropdownClassName` is deprecated which will be removed in next major
* version.Please use `popupClassName` instead.
@ -36,6 +33,10 @@ export default function generateRangePicker<DateType>(
dropdownClassName: string;
popupClassName?: string;
}
const RangePicker = forwardRef<
InternalRangePickerProps | CommonPickerMethods,
DateRangePickerProps
>((props, ref) => {
const {
prefixCls: customizePrefixCls,
@ -149,5 +150,5 @@ export default function generateRangePicker<DateType>(
);
});
return RangePicker as unknown as PickerComponentClass<RangePickerProps<DateType>>;
return RangePicker as unknown as PickerComponentClass<DateRangePickerProps>;
}

17
components/date-picker/generatePicker/generateSinglePicker.tsx
View File

@ -23,7 +23,7 @@ import { getPlaceholder, transPlacement2DropdownAlign } from '../util';
import type { CommonPickerMethods, DatePickRef, PickerComponentClass } from './interface';
export default function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
type DatePickerProps = PickerProps<DateType> & {
type CustomPickerProps = {
status?: InputStatus;
/**
* @deprecated `dropdownClassName` is deprecated which will be removed in next major
@ -31,7 +31,10 @@ export default function generatePicker<DateType>(generateConfig: GenerateConfig<
*/
dropdownClassName?: string;
popupClassName?: string;
};
}
type DatePickerProps = PickerProps<DateType> & CustomPickerProps;
type TimePickerProps = PickerTimeProps<DateType> & CustomPickerProps
function getPicker<InnerPickerProps extends DatePickerProps>(
picker?: PickerMode,
displayName?: string,
@ -172,11 +175,11 @@ export default function generatePicker<DateType>(generateConfig: GenerateConfig<
}
const DatePicker = getPicker<DatePickerProps>();
const WeekPicker = getPicker<Omit<PickerDateProps<DateType>, 'picker'>>('week', 'WeekPicker');
const MonthPicker = getPicker<Omit<PickerDateProps<DateType>, 'picker'>>('month', 'MonthPicker');
const YearPicker = getPicker<Omit<PickerDateProps<DateType>, 'picker'>>('year', 'YearPicker');
const TimePicker = getPicker<Omit<PickerTimeProps<DateType>, 'picker'>>('time', 'TimePicker');
const QuarterPicker = getPicker<Omit<PickerTimeProps<DateType>, 'picker'>>(
const WeekPicker = getPicker<Omit<DatePickerProps, 'picker'>>('week', 'WeekPicker');
const MonthPicker = getPicker<Omit<DatePickerProps, 'picker'>>('month', 'MonthPicker');
const YearPicker = getPicker<Omit<DatePickerProps, 'picker'>>('year', 'YearPicker');
const TimePicker = getPicker<Omit<TimePickerProps, 'picker'>>('time', 'TimePicker');
const QuarterPicker = getPicker<Omit<TimePickerProps, 'picker'>>(
'quarter',
'QuarterPicker',
);