fix: compatible with legacy token

aojunhao123 · Jan 16, 2025 · afcf91a · afcf91a
1 parent 89bff27
commit afcf91a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/components/button/style/index.ts b/components/button/style/index.ts
@@ -159,7 +159,7 @@ const genRoundButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
 
 const genDisabledStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
   cursor: 'not-allowed',
-  borderColor: token.colorBorderDisabled,
+  borderColor: token.colorBorderDisabled ?? token.borderColorDisabled,
   color: token.colorTextDisabled,
   background: token.colorBgContainerDisabled,
   boxShadow: 'none',

diff --git a/components/button/style/token.ts b/components/button/style/token.ts
@@ -82,6 +82,12 @@ export interface ComponentToken {
    * @descEN Border color of default button when active
    */
   defaultActiveBorderColor: string;
+  /**
+   * @deprecated use `colorBorderDisabled` instead
+   * @desc 禁用状态边框颜色
+   * @descEN Border color of disabled button
+   */
+  borderColorDisabled: string;
   /**
    * @desc 默认幽灵按钮文本颜色
    * @descEN Text color of default ghost button

diff --git a/components/tag/demo/component-token.tsx b/components/tag/demo/component-token.tsx
@@ -4,7 +4,11 @@ import { ConfigProvider, Flex, Tag } from 'antd';
 
 const App: React.FC = () => (
   <ConfigProvider
-    theme={{ components: { Tag: { defaultBg: '#f9f0ff', defaultColor: '#4b34d3' } } }}
+    theme={{
+      components: {
+        Tag: { defaultBg: '#f9f0ff', defaultColor: '#4b34d3', colorBorderDisabled: '#4a4a4a' },
+      },
+    }}
   >
     <Flex gap="small" align="center" wrap>
       <Tag>
@@ -38,6 +42,9 @@ const App: React.FC = () => (
       <Tag icon={<SyncOutlined spin />} color="processing">
         processing
       </Tag>
+      <Tag color="success" disabled>
+        disabled
+      </Tag>
     </Flex>
   </ConfigProvider>
 );