Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: CheckableTag miss CP tag #44602

Merged
merged 4 commits into from
Sep 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ version: 2.1
jobs:
test-argos-ci:
docker:
- image: cimg/node:16.20-browsers
- image: cimg/node:18.17-browsers
environment:
NODE_OPTIONS: --openssl-legacy-provider
steps:
- checkout
- run:
Expand Down
6 changes: 6 additions & 0 deletions components/config-provider/__tests__/style.test.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';

import ConfigProvider from '..';
import { fireEvent, render } from '../../../tests/utils';
import Alert from '../../alert';
Expand Down Expand Up @@ -942,11 +943,16 @@ describe('ConfigProvider support style and className props', () => {
const { container } = render(
<ConfigProvider tag={{ className: 'cp-tag', style: { backgroundColor: 'blue' } }}>
<Tag>Test</Tag>
<Tag.CheckableTag checked>CheckableTag</Tag.CheckableTag>
</ConfigProvider>,
);
const element = container.querySelector<HTMLSpanElement>('.ant-tag');
expect(element).toHaveClass('cp-tag');
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', () => {
Expand Down
19 changes: 16 additions & 3 deletions components/tag/CheckableTag.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import classNames from 'classnames';
import * as React from 'react';
import classNames from 'classnames';

import { ConfigContext } from '../config-provider';
import useStyle from './style';

Expand All @@ -21,13 +22,14 @@ export interface CheckableTagProps {
const CheckableTag: React.FC<CheckableTagProps> = (props) => {
const {
prefixCls: customizePrefixCls,
style,
className,
checked,
onChange,
onClick,
...restProps
} = props;
const { getPrefixCls } = React.useContext(ConfigContext);
const { getPrefixCls, tag } = React.useContext(ConfigContext);

const handleClick = (e: React.MouseEvent<HTMLSpanElement, MouseEvent>) => {
onChange?.(!checked);
Expand All @@ -44,11 +46,22 @@ const CheckableTag: React.FC<CheckableTagProps> = (props) => {
{
[`${prefixCls}-checkable-checked`]: checked,
},
tag?.className,
className,
hashId,
);

return wrapSSR(<span {...restProps} className={cls} onClick={handleClick} />);
return wrapSSR(
<span
{...restProps}
style={{
...style,
...tag?.style,
}}
className={cls}
onClick={handleClick}
/>,
);
};

export default CheckableTag;