mirror of
https://github.com/ant-design/ant-design.git
synced 2024-11-28 05:05:48 +08:00
feat: ConfigProvider support Carousel className and style properties (#43412)
This commit is contained in:
parent
bf960bed60
commit
86d334baee
@ -39,11 +39,13 @@ const Carousel = React.forwardRef<CarouselRef, CarouselProps>(
|
|||||||
dotPosition = 'bottom',
|
dotPosition = 'bottom',
|
||||||
vertical = dotPosition === 'left' || dotPosition === 'right',
|
vertical = dotPosition === 'left' || dotPosition === 'right',
|
||||||
rootClassName,
|
rootClassName,
|
||||||
|
className: customClassName,
|
||||||
|
style,
|
||||||
...props
|
...props
|
||||||
},
|
},
|
||||||
ref,
|
ref,
|
||||||
) => {
|
) => {
|
||||||
const { getPrefixCls, direction } = React.useContext(ConfigContext);
|
const { getPrefixCls, direction, carousel } = React.useContext(ConfigContext);
|
||||||
const slickRef = React.useRef<any>();
|
const slickRef = React.useRef<any>();
|
||||||
|
|
||||||
const goTo = (slide: number, dontAnimate = false) => {
|
const goTo = (slide: number, dontAnimate = false) => {
|
||||||
@ -73,6 +75,8 @@ const Carousel = React.forwardRef<CarouselRef, CarouselProps>(
|
|||||||
|
|
||||||
const newProps = {
|
const newProps = {
|
||||||
vertical,
|
vertical,
|
||||||
|
className: classNames(customClassName, carousel?.className),
|
||||||
|
style: { ...carousel?.style, ...style },
|
||||||
...props,
|
...props,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8,6 +8,7 @@ import Badge from '../../badge';
|
|||||||
import Breadcrumb from '../../breadcrumb';
|
import Breadcrumb from '../../breadcrumb';
|
||||||
import Calendar from '../../calendar';
|
import Calendar from '../../calendar';
|
||||||
import Card from '../../card';
|
import Card from '../../card';
|
||||||
|
import Carousel from '../../carousel';
|
||||||
import Cascader from '../../cascader';
|
import Cascader from '../../cascader';
|
||||||
import Checkbox from '../../checkbox';
|
import Checkbox from '../../checkbox';
|
||||||
import Collapse from '../../collapse';
|
import Collapse from '../../collapse';
|
||||||
@ -183,6 +184,41 @@ describe('ConfigProvider support style and className props', () => {
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('Should Carousel className works', () => {
|
||||||
|
const { container } = render(
|
||||||
|
<ConfigProvider
|
||||||
|
carousel={{
|
||||||
|
className: 'test-class',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Carousel>
|
||||||
|
<div>
|
||||||
|
<h3>test item</h3>
|
||||||
|
</div>
|
||||||
|
</Carousel>
|
||||||
|
</ConfigProvider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(container.querySelector('.slick-slider')).toHaveClass('test-class');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('Should Carousel style works', () => {
|
||||||
|
const { container } = render(
|
||||||
|
<ConfigProvider carousel={{ style: { color: 'red' } }}>
|
||||||
|
<Carousel style={{ fontSize: '16px' }}>
|
||||||
|
<div>
|
||||||
|
<h3>test item 1</h3>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<h3>test item 2</h3>
|
||||||
|
</div>
|
||||||
|
</Carousel>
|
||||||
|
</ConfigProvider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(container.querySelector('.slick-slider')).toHaveStyle('color: red; font-size: 16px;');
|
||||||
|
});
|
||||||
|
|
||||||
it('Should Cascader className & style works', () => {
|
it('Should Cascader className & style works', () => {
|
||||||
const options = [
|
const options = [
|
||||||
{
|
{
|
||||||
|
@ -102,6 +102,7 @@ export interface ConfigConsumerProps {
|
|||||||
divider?: ComponentStyleConfig;
|
divider?: ComponentStyleConfig;
|
||||||
drawer?: ComponentStyleConfig;
|
drawer?: ComponentStyleConfig;
|
||||||
calendar?: ComponentStyleConfig;
|
calendar?: ComponentStyleConfig;
|
||||||
|
carousel?: ComponentStyleConfig;
|
||||||
cascader?: ComponentStyleConfig;
|
cascader?: ComponentStyleConfig;
|
||||||
collapse?: ComponentStyleConfig;
|
collapse?: ComponentStyleConfig;
|
||||||
typography?: ComponentStyleConfig;
|
typography?: ComponentStyleConfig;
|
||||||
|
@ -109,6 +109,7 @@ const {
|
|||||||
| button | Set Button common props | { className?: string, style?: React.CSSProperties, classNames?: { icon: string }, styles?: { icon: React.CSSProperties } } | - | 5.6.0 |
|
| button | Set Button common props | { className?: string, style?: React.CSSProperties, classNames?: { icon: string }, styles?: { icon: React.CSSProperties } } | - | 5.6.0 |
|
||||||
| card | Set Card common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| card | Set Card common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| calendar | Set Calendar common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| calendar | Set Calendar common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
|
| carousel | Set Carousel common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| cascader | Set Cascader common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| cascader | Set Cascader common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| checkbox | Set Checkbox common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| checkbox | Set Checkbox common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| collapse | Set Collapse common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| collapse | Set Collapse common props | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
|
@ -142,6 +142,7 @@ export interface ConfigProviderProps {
|
|||||||
anchor?: ComponentStyleConfig;
|
anchor?: ComponentStyleConfig;
|
||||||
button?: ButtonConfig;
|
button?: ButtonConfig;
|
||||||
calendar?: ComponentStyleConfig;
|
calendar?: ComponentStyleConfig;
|
||||||
|
carousel?: ComponentStyleConfig;
|
||||||
cascader?: ComponentStyleConfig;
|
cascader?: ComponentStyleConfig;
|
||||||
collapse?: ComponentStyleConfig;
|
collapse?: ComponentStyleConfig;
|
||||||
divider?: ComponentStyleConfig;
|
divider?: ComponentStyleConfig;
|
||||||
@ -276,6 +277,7 @@ const ProviderChildren: React.FC<ProviderChildrenProps> = (props) => {
|
|||||||
statistic,
|
statistic,
|
||||||
spin,
|
spin,
|
||||||
calendar,
|
calendar,
|
||||||
|
carousel,
|
||||||
cascader,
|
cascader,
|
||||||
collapse,
|
collapse,
|
||||||
typography,
|
typography,
|
||||||
@ -371,6 +373,7 @@ const ProviderChildren: React.FC<ProviderChildrenProps> = (props) => {
|
|||||||
statistic,
|
statistic,
|
||||||
spin,
|
spin,
|
||||||
calendar,
|
calendar,
|
||||||
|
carousel,
|
||||||
cascader,
|
cascader,
|
||||||
collapse,
|
collapse,
|
||||||
typography,
|
typography,
|
||||||
|
@ -111,6 +111,7 @@ const {
|
|||||||
| button | 设置 Button 组件的通用属性 | { className?: string, style?: React.CSSProperties, classNames?: { icon: string }, styles?: { icon: React.CSSProperties } } | - | 5.6.0 |
|
| button | 设置 Button 组件的通用属性 | { className?: string, style?: React.CSSProperties, classNames?: { icon: string }, styles?: { icon: React.CSSProperties } } | - | 5.6.0 |
|
||||||
| calendar | 设置 Calendar 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| calendar | 设置 Calendar 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| card | 设置 Card 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| card | 设置 Card 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
|
| carousel | 设置 Carousel 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| cascader | 设置 Cascader 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| cascader | 设置 Cascader 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| checkbox | 设置 Checkbox 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| checkbox | 设置 Checkbox 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
| collapse | 设置 Collapse 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
| collapse | 设置 Collapse 组件的通用属性 | { className?: string, style?: React.CSSProperties } | - | 5.7.0 |
|
||||||
|
Loading…
Reference in New Issue
Block a user