mirror of
https://gitee.com/ant-design/ant-design.git
synced 2024-12-02 03:59:01 +08:00
fix: CheckableTag miss CP tag (#44602)
* fix: CheckableTag miss CP tag * chore: bump tag * chore: fix failed * chore: fix circle
This commit is contained in:
parent
9d162d3408
commit
5a5af385b8
@ -7,7 +7,9 @@ version: 2.1
|
|||||||
jobs:
|
jobs:
|
||||||
test-argos-ci:
|
test-argos-ci:
|
||||||
docker:
|
docker:
|
||||||
- image: cimg/node:16.20-browsers
|
- image: cimg/node:18.17-browsers
|
||||||
|
environment:
|
||||||
|
NODE_OPTIONS: --openssl-legacy-provider
|
||||||
steps:
|
steps:
|
||||||
- checkout
|
- checkout
|
||||||
- run:
|
- run:
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
|
|
||||||
import ConfigProvider from '..';
|
import ConfigProvider from '..';
|
||||||
import { fireEvent, render } from '../../../tests/utils';
|
import { fireEvent, render } from '../../../tests/utils';
|
||||||
import Alert from '../../alert';
|
import Alert from '../../alert';
|
||||||
@ -942,11 +943,16 @@ describe('ConfigProvider support style and className props', () => {
|
|||||||
const { container } = render(
|
const { container } = render(
|
||||||
<ConfigProvider tag={{ className: 'cp-tag', style: { backgroundColor: 'blue' } }}>
|
<ConfigProvider tag={{ className: 'cp-tag', style: { backgroundColor: 'blue' } }}>
|
||||||
<Tag>Test</Tag>
|
<Tag>Test</Tag>
|
||||||
|
<Tag.CheckableTag checked>CheckableTag</Tag.CheckableTag>
|
||||||
</ConfigProvider>,
|
</ConfigProvider>,
|
||||||
);
|
);
|
||||||
const element = container.querySelector<HTMLSpanElement>('.ant-tag');
|
const element = container.querySelector<HTMLSpanElement>('.ant-tag');
|
||||||
expect(element).toHaveClass('cp-tag');
|
expect(element).toHaveClass('cp-tag');
|
||||||
expect(element).toHaveStyle({ backgroundColor: 'blue' });
|
expect(element).toHaveStyle({ backgroundColor: 'blue' });
|
||||||
|
|
||||||
|
const checkableElement = container.querySelector<HTMLSpanElement>('.ant-tag-checkable');
|
||||||
|
expect(checkableElement).toHaveClass('cp-tag');
|
||||||
|
expect(checkableElement).toHaveStyle({ backgroundColor: 'blue' });
|
||||||
});
|
});
|
||||||
|
|
||||||
it('Should Table className & style works', () => {
|
it('Should Table className & style works', () => {
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
import classNames from 'classnames';
|
|
||||||
import * as React from 'react';
|
import * as React from 'react';
|
||||||
|
import classNames from 'classnames';
|
||||||
|
|
||||||
import { ConfigContext } from '../config-provider';
|
import { ConfigContext } from '../config-provider';
|
||||||
import useStyle from './style';
|
import useStyle from './style';
|
||||||
|
|
||||||
@ -21,13 +22,14 @@ export interface CheckableTagProps {
|
|||||||
const CheckableTag: React.FC<CheckableTagProps> = (props) => {
|
const CheckableTag: React.FC<CheckableTagProps> = (props) => {
|
||||||
const {
|
const {
|
||||||
prefixCls: customizePrefixCls,
|
prefixCls: customizePrefixCls,
|
||||||
|
style,
|
||||||
className,
|
className,
|
||||||
checked,
|
checked,
|
||||||
onChange,
|
onChange,
|
||||||
onClick,
|
onClick,
|
||||||
...restProps
|
...restProps
|
||||||
} = props;
|
} = props;
|
||||||
const { getPrefixCls } = React.useContext(ConfigContext);
|
const { getPrefixCls, tag } = React.useContext(ConfigContext);
|
||||||
|
|
||||||
const handleClick = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
|
const handleClick = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
|
||||||
onChange?.(!checked);
|
onChange?.(!checked);
|
||||||
@ -44,11 +46,22 @@ const CheckableTag: React.FC<CheckableTagProps> = (props) => {
|
|||||||
{
|
{
|
||||||
[`${prefixCls}-checkable-checked`]: checked,
|
[`${prefixCls}-checkable-checked`]: checked,
|
||||||
},
|
},
|
||||||
|
tag?.className,
|
||||||
className,
|
className,
|
||||||
hashId,
|
hashId,
|
||||||
);
|
);
|
||||||
|
|
||||||
return wrapSSR(<span {...restProps} className={cls} onClick={handleClick} />);
|
return wrapSSR(
|
||||||
|
<span
|
||||||
|
{...restProps}
|
||||||
|
style={{
|
||||||
|
...style,
|
||||||
|
...tag?.style,
|
||||||
|
}}
|
||||||
|
className={cls}
|
||||||
|
onClick={handleClick}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default CheckableTag;
|
export default CheckableTag;
|
||||||
|
Loading…
Reference in New Issue
Block a user