mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2025-08-05 23:46: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">
<DatePicker />
</div>
<div className="example">
<DatePicker.RangePicker />
</div>
<div className="example">
<Button>Button</Button>
</div>

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

@ -273,7 +273,7 @@ function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
const {
prefixCls: customizePrefixCls,
className,
size,
size: customizeSize,
bordered = true,
...restProps
} = this.props;
@ -288,6 +288,11 @@ function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
...(picker === 'time' ? getTimeProps({ format, ...this.props, picker }) : {}),
};
return (
<SizeContext.Consumer>
{size => {
const mergedSize = customizeSize || size;
return (
<RCRangePicker<DateType>
separator={<span className={`${prefixCls}-separator`}>→</span>}
@ -299,7 +304,7 @@ function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
transitionName="slide-up"
{...restProps}
className={classNames(className, {
[`${prefixCls}-${size}`]: size,
[`${prefixCls}-${mergedSize}`]: mergedSize,
[`${prefixCls}-borderless`]: !bordered,
})}
{...additionalOverrideProps}
@ -314,6 +319,9 @@ function generatePicker<DateType>(generateConfig: GenerateConfig<DateType>) {
direction={direction}
/>
);
}}
</SizeContext.Consumer>
);
};
render() {