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

fix config provider size (#22486)

Browse Source
This commit is contained in:
二货机器人 2020-03-22 15:52:02 +08:00 committed by GitHub
parent d33784b813
commit 147251345a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/config-provider/demo/size.md
View File

@ -52,6 +52,9 @@ const FormSizeDemo = () => {
<div className="example"> <div className="example">
<DatePicker /> <DatePicker />
</div> </div>
<div className="example">
<DatePicker.RangePicker />
</div>
<div className="example"> <div className="example">
<Button>Button</Button> <Button>Button</Button>
</div> </div>

58
components/date-picker/generatePicker.tsx
View File

@ -273,7 +273,7 @@ function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
const { const {
prefixCls: customizePrefixCls, prefixCls: customizePrefixCls,
className, className,
size, size: customizeSize,
bordered = true, bordered = true,
...restProps ...restProps
} = this.props; } = this.props;
@ -289,30 +289,38 @@ function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
}; };
return ( return (
<RCRangePicker<DateType> <SizeContext.Consumer>
separator={<span className={`${prefixCls}-separator`}>→</span>} {size => {
ref={this.pickerRef} const mergedSize = customizeSize || size;
placeholder={getRangePlaceholder(picker, locale)}
suffixIcon={picker === 'time' ? <ClockCircleOutlined /> : <CalendarOutlined />} return (
clearIcon={<CloseCircleFilled />} <RCRangePicker<DateType>
allowClear separator={<span className={`${prefixCls}-separator`}>→</span>}
transitionName="slide-up" ref={this.pickerRef}
{...restProps} placeholder={getRangePlaceholder(picker, locale)}
className={classNames(className, { suffixIcon={picker === 'time' ? <ClockCircleOutlined /> : <CalendarOutlined />}
[`${prefixCls}-${size}`]: size, clearIcon={<CloseCircleFilled />}
[`${prefixCls}-borderless`]: !bordered, allowClear
})} transitionName="slide-up"
{...additionalOverrideProps} {...restProps}
locale={locale!.lang} className={classNames(className, {
prefixCls={prefixCls} [`${prefixCls}-${mergedSize}`]: mergedSize,
generateConfig={generateConfig} [`${prefixCls}-borderless`]: !bordered,
prevIcon={<span className={`${prefixCls}-prev-icon`} />} })}
nextIcon={<span className={`${prefixCls}-next-icon`} />} {...additionalOverrideProps}
superPrevIcon={<span className={`${prefixCls}-super-prev-icon`} />} locale={locale!.lang}
superNextIcon={<span className={`${prefixCls}-super-next-icon`} />} prefixCls={prefixCls}
components={Components} generateConfig={generateConfig}
direction={direction} prevIcon={<span className={`${prefixCls}-prev-icon`} />}
/> nextIcon={<span className={`${prefixCls}-next-icon`} />}
superPrevIcon={<span className={`${prefixCls}-super-prev-icon`} />}
superNextIcon={<span className={`${prefixCls}-super-next-icon`} />}
components={Components}
direction={direction}
/>
);
}}
</SizeContext.Consumer>
); );
}; };