Merge branch 'master' into feature-merge-master

.circleci/config.yml

@@ -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:

components/config-provider/__tests__/style.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+
 import ConfigProvider from '..';
 import { fireEvent, render } from '../../../tests/utils';
 import Alert from '../../alert';
@@ -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', () => {

components/tag/CheckableTag.tsx

@@ -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';
 
@@ -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);
@@ -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;

docs/react/i18n.en-US.md

@@ -75,6 +75,7 @@ The following languages are currently supported:
 | Malayalam (India)        | ml_IN    |
 | Mongolian                | mn_MN    |
 | Malay (Malaysia)         | ms_MY    |
+| Burmese                  | my_MM    |
 | Norwegian                | nb_NO    |
 | Nepal                    | ne_NP    |
 | Dutch (Belgium)          | nl_BE    |
@@ -99,7 +100,6 @@ The following languages are currently supported:
 | Chinese (Simplified)     | zh_CN    |
 | Chinese (Traditional)    | zh_HK    |
 | Chinese (Traditional)    | zh_TW    |
-| Burmese                  | my_MM    |
 
 See more usage at [ConfigProvider](/components/config-provider).
 

docs/react/i18n.zh-CN.md

@@ -72,6 +72,7 @@ return (
 | 马拉雅拉姆语         | ml_IN  |
 | 蒙古语               | mn_MN  |
 | 马来语 (马来西亚)    | ms_MY  |
+| 缅甸语               | my_MM  |
 | 挪威语               | nb_NO  |
 | 尼泊尔语             | ne_NP  |
 | 荷兰语（比利时）     | nl_BE  |
@@ -96,7 +97,6 @@ return (
 | 简体中文             | zh_CN  |
 | 繁体中文（中国香港） | zh_HK  |
 | 繁体中文（中国台湾） | zh_TW  |
-| 缅甸语               | my_MM  |
 
 具体的使用方法请参考 [ConfigProvider 文档](/components/config-provider-cn)。