chore: merge master

2026-02-09 02:49:18 +08:00 · 2025-09-02 18:00:34 +08:00
parent 320c510c97 23a2b5ec96
commit 7f01ee60b9
10 changed files with 67 additions and 23 deletions
--- a/.dumi/global.less
+++ b/.dumi/global.less
@@ -17,11 +17,9 @@
  border-radius: 6px;
 }

-#root {
+html {
  scrollbar-width: thin;
  scrollbar-color: #eaeaea transparent;
-  overflow-y: auto;
-  height: 100dvh;
 }

 .rc-footer {
--- a/.dumi/theme/layouts/GlobalLayout.tsx
+++ b/.dumi/theme/layouts/GlobalLayout.tsx
@@ -1,6 +1,3 @@
-// prettier-ignore
-import { scan } from 'react-scan'; // import this BEFORE react
-
 import React, { useCallback, useEffect } from 'react';
 import {
  createCache,
@@ -43,13 +40,6 @@ if (typeof window !== 'undefined') {
      location.hash = `#${hashId.replace(/^components-/, '')}`;
    }
  }
-
-  if (process.env.NODE_ENV !== 'production') {
-    scan({
-      enabled: false,
-      showToolbar: true,
-    });
-  }
 }

 const getAlgorithm = (themes: ThemeName[] = []) =>
--- a/.dumirc.ts
+++ b/.dumirc.ts
@@ -197,9 +197,14 @@ export default defineConfig({
        .readFileSync(path.join(__dirname, '.dumi', 'scripts', 'mirror-notify.js'))
        .toString(),
    },
-    {
-      async: true,
-      content: fs.readFileSync(path.join(__dirname, '.dumi', 'scripts', 'clarity.js')).toString(),
-    },
-  ],
+    // Only enable clarity in production environment
+    process.env.NODE_ENV === 'production'
+      ? {
+          async: true,
+          content: fs
+            .readFileSync(path.join(__dirname, '.dumi', 'scripts', 'clarity.js'))
+            .toString(),
+        }
+      : null,
+  ].filter((script) => !!script),
 });
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@@ -173,6 +173,21 @@ tag: vVERSION
 - 🚫 Modal `closable` support `onClose` props that trigger by any type of close. [#54607](https://github.com/ant-design/ant-design/pull/54607) [@EmilyyyLiu](https://github.com/EmilyyyLiu)
 - 🛠 Remove Dropdown.Button, please use Space.Compact instead. [#53793](https://github.com/ant-design/ant-design/pull/53793) [@Meet-student](https://github.com/Meet-student)

+## 5.27.2
+
+`2025-09-02`
+
+- Button
+  - 🐞 Fix custom `token.paddingInline` not taking effect when the Button's `shape` is `round`. [#54787](https://github.com/ant-design/ant-design/pull/54787)
+  - 🐞 Fix accessibility issue when Button `href` is disabled. [#54738](https://github.com/ant-design/ant-design/pull/54738) [@doandevhere](https://github.com/doandevhere)
+- 🐞 Fix the Badge `text` property did not support the number 0. [#54747](https://github.com/ant-design/ant-design/pull/54747) [@davidhsing](https://github.com/davidhsing)
+- 💄 Optimize Table to no longer display "no data" when initialized with `dataSource=null` and `loading`. [#54606](https://github.com/ant-design/ant-design/pull/54606)[@Wxh16144](https://github.com/Wxh16144)
+- 💄 Fix Tabs removal icon not being vertically centered. [#54794](https://github.com/ant-design/ant-design/pull/54794) [@Jiyur](https://github.com/Jiyur)
+- 💄 Fix Typography hover underline style not taking effect. [#54763](https://github.com/ant-design/ant-design/pull/54763) [@guoyunhe](https://github.com/guoyunhe)
+- 💄 Fix Radio.Group display having jagged edges and the first element overflowing on the left after wrapping. [#54661](https://github.com/ant-design/ant-design/pull/54661) [@765477020](https://github.com/765477020)
+- 💄 Fix inconsistent hover colors for Tree.DirectoryTree. [#54725](https://github.com/ant-design/ant-design/pull/54725) [@Meet-student](https://github.com/Meet-student)
+- 🇻🇳 Add the missing Vietnamese translations for ColorPicker/QRCode/Typography.Text. [#54748](https://github.com/ant-design/ant-design/pull/54748) [@Jiyur](https://github.com/Jiyur)
+
 ## 5.27.1

 `2025-08-19`
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@@ -173,6 +173,21 @@ tag: vVERSION
 - 🚫 Modal `closable` 支持 `onClose` 属性以任意方式关闭时触发。[#54607](https://github.com/ant-design/ant-design/pull/54607) [@EmilyyyLiu](https://github.com/EmilyyyLiu)
 - 🛠 移除 Dropdown.Button，请使用 Space.Compact。[#53793](https://github.com/ant-design/ant-design/pull/53793) [@Meet-student](https://github.com/Meet-student)

+## 5.27.2
+
+`2025-09-02`
+
+- Button
+  - 🐞 修复 Button 在 `shape="round"` 时自定义 `token.paddingInline` 不生效的问题。[#54787](https://github.com/ant-design/ant-design/pull/54787)
+  - 🐞 修复 Button `href` 已禁用时无障碍访问性不正确的问题。[#54738](https://github.com/ant-design/ant-design/pull/54738) [@doandevhere](https://github.com/doandevhere)
+- 🐞 修复 Badge 的 `text` 属性不支持数字 0 的问题。[#54747](https://github.com/ant-design/ant-design/pull/54747) [@davidhsing](https://github.com/davidhsing)
+- 💄 优化 Table 在初始化 `dataSource=null` 并且 `loading` 时不再会显示“没有数据”。[#54606](https://github.com/ant-design/ant-design/pull/54606)[@Wxh16144](https://github.com/Wxh16144)
+- 💄 修复 Tabs 移除图标未垂直居中对齐的样式问题。[#54794](https://github.com/ant-design/ant-design/pull/54794) [@Jiyur](https://github.com/Jiyur)
+- 💄 修复 Typography hover 下划线不生效的样式问题。[#54763](https://github.com/ant-design/ant-design/pull/54763) [@guoyunhe](https://github.com/guoyunhe)
+- 💄 修复 Radio.Group 展示出现锯齿和换行后第一个元素左侧溢出问题。[#54661](https://github.com/ant-design/ant-design/pull/54661) [@765477020](https://github.com/765477020)
+- 💄 修复 Tree.DirectoryTree hover 颜色不符的样式问题。[#54725](https://github.com/ant-design/ant-design/pull/54725) [@Meet-student](https://github.com/Meet-student)
+- 🇻🇳 补充 ColorPicker、QRCode、Typography.Text 越南语翻译。[#54748](https://github.com/ant-design/ant-design/pull/54748) [@Jiyur](https://github.com/Jiyur)
+
 ## 5.27.1

 `2025-08-19`
--- a/components/button/demo/component-token.tsx
+++ b/components/button/demo/component-token.tsx
@@ -87,12 +87,20 @@ const App: React.FC = () => (
    </ConfigProvider>
    <ConfigProvider
      theme={{
-        components: { Button: { paddingInline: 100 } },
+        components: { Button: { paddingInline: 100, paddingInlineLG: 150, paddingInlineSM: 50 } },
      }}
    >
-      <Flex gap="small" wrap>
+      <Flex gap="small" vertical align="start">
        <Button>Default Button</Button>
        <Button shape="round">Default Button</Button>
+        <Button size="large">Default Button</Button>
+        <Button shape="round" size="large">
+          Default Button
+        </Button>
+        <Button size="small">Default Button</Button>
+        <Button shape="round" size="small">
+          Default Button
+        </Button>
      </Flex>
    </ConfigProvider>
  </Flex>
--- a/components/button/style/index.ts
+++ b/components/button/style/index.ts
@@ -140,7 +140,7 @@ const genCircleButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => (

 const genRoundButtonStyle: GenerateStyle<ButtonToken, CSSObject> = (token) => ({
  borderRadius: token.controlHeight,
-  paddingInline: token.paddingInline ?? token.calc(token.controlHeight).div(2).equal(),
+  paddingInline: token.buttonPaddingHorizontal ?? token.calc(token.controlHeight).div(2).equal(),
 });

 // =============================== Size ===============================
--- a/components/locale/it_IT.ts
+++ b/components/locale/it_IT.ts
@@ -131,6 +131,17 @@ const localeValues: Locale = {
      },
    },
  },
+  QRCode: {
+    expired: 'Codice QR scaduto',
+    refresh: 'Ricarica',
+    scanned: 'Scansionato',
+  },
+  ColorPicker: {
+    presetEmpty: 'Vuoto',
+    transparent: 'Trasparente',
+    singleColor: 'Tinta unita',
+    gradientColor: 'Gradiente',
+  },
 };

 export default localeValues;
--- a/components/pagination/style/index.ts
+++ b/components/pagination/style/index.ts
@@ -372,7 +372,10 @@ const genPaginationSimpleStyle: GenerateStyle<PaginationToken, CSSObject> = (tok

        [`${componentCls}-simple-pager`]: {
          height: token.itemSizeSM,
-          width: token.paginationMiniQuickJumperInputWidth,
+
+          input: {
+            width: token.paginationMiniQuickJumperInputWidth,
+          },
        },
      },
    },
--- a/package.json
+++ b/package.json
@@ -306,7 +306,6 @@
    "react-intersection-observer": "^9.13.1",
    "react-resizable": "^3.0.5",
    "react-router-dom": "^7.0.1",
-    "react-scan": "^0.4.2",
    "react-sticky-box": "^2.0.5",
    "regenerator-runtime": "^0.14.1",
    "rehype-stringify": "^10.0.1",