diff --git a/.dumi/pages/index/components/BannerRecommends.tsx b/.dumi/pages/index/components/BannerRecommends.tsx index d80d886f91..8c6dfc16c2 100644 --- a/.dumi/pages/index/components/BannerRecommends.tsx +++ b/.dumi/pages/index/components/BannerRecommends.tsx @@ -36,6 +36,7 @@ const useStyle = createStyles(({ token, css, cx }) => { cardItem: css` &:hover { box-shadow: ${token.boxShadowCard}; + border-color: transparent; } `, sliderItem: css` diff --git a/.github/workflows/pr-check-ci.yml b/.github/workflows/pr-auto-merge.yml similarity index 100% rename from .github/workflows/pr-check-ci.yml rename to .github/workflows/pr-auto-merge.yml diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index bfd1e041d6..58a865973c 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -15,6 +15,16 @@ tag: vVERSION --- +## 5.21.4 + +`2024-10-14` + +- 🐞 Fixed Input.Search not applying the `hoverBorderColor/activeBorderColor` token for hover/active states. [#51226](https://github.com/ant-design/ant-design/pull/51226) [@iqingting](https://github.com/iqingting) +- 🐞 Fix Tree icon align issue. [#51181](https://github.com/ant-design/ant-design/pull/51181) [@Meowu](https://github.com/Meowu) +- 🐞 Fix Splitter occasionally shows unnecessary scrollbars in nested combinations. [#51169](https://github.com/ant-design/ant-design/pull/51169) [@zombieJ](https://github.com/zombieJ) +- 💄 Modify Button `textHoverBg` hover background to `colorFillTertiary`. [#51187](https://github.com/ant-design/ant-design/pull/51187) [@coding-ice](https://github.com/coding-ice) +- TypeScript + - 🤖 Improve type of Switch `eventHandler`. [#51165](https://github.com/ant-design/ant-design/pull/51165) [@thinkasany](https://github.com/thinkasany) ## 5.21.3 `2024-10-09` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 01d3131f86..2cecb29841 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -15,6 +15,16 @@ tag: vVERSION --- +## 5.21.4 + +`2024-10-14` + +- 🐞 修复 Input.Search 无法使用 Input Token `hoverBorderColor/activeBorderColor` 修改边框颜色的问题。[#51226](https://github.com/ant-design/ant-design/pull/51226) [@iqingting](https://github.com/iqingting) +- 🐞 修复 Tree 的图标不对齐的问题。[#51181](https://github.com/ant-design/ant-design/pull/51181) [@Meowu](https://github.com/Meowu) +- 🐞 修复 Splitter 在嵌套组合时，偶尔会出现多余滚动条的问题。[#51169](https://github.com/ant-design/ant-design/pull/51169) [@zombieJ](https://github.com/zombieJ) +- 💄 修改 Button `textHoverBg` 在悬浮状态下的背景色为 `colorFillTertiary`。[#51187](https://github.com/ant-design/ant-design/pull/51187) [@coding-ice](https://github.com/coding-ice) +- TypeScript + - 🤖 优化 Switch `eventHandler` 类型。[#51165](https://github.com/ant-design/ant-design/pull/51165) [@thinkasany](https://github.com/thinkasany) ## 5.21.3 `2024-10-09` diff --git a/components/badge/style/index.ts b/components/badge/style/index.ts index 10cd60e1c9..6f035b468a 100644 --- a/components/badge/style/index.ts +++ b/components/badge/style/index.ts @@ -377,7 +377,7 @@ export const prepareToken: (token: Parameters>[0]) => BadgeT const badgeFontHeight = fontHeight; const badgeShadowSize = lineWidth; - const badgeTextColor = token.colorBgContainer; + const badgeTextColor = token.colorTextLightSolid; const badgeColor = token.colorError; const badgeColorHover = token.colorErrorHover; diff --git a/components/badge/style/ribbon.ts b/components/badge/style/ribbon.ts index 7675066a1d..e456659dc9 100644 --- a/components/badge/style/ribbon.ts +++ b/components/badge/style/ribbon.ts @@ -34,7 +34,7 @@ const genRibbonStyle: GenerateStyle = (token) => { backgroundColor: token.colorPrimary, borderRadius: token.borderRadiusSM, [`${ribbonPrefixCls}-text`]: { - color: token.colorTextLightSolid, + color: token.badgeTextColor, }, [`${ribbonPrefixCls}-corner`]: { position: 'absolute', diff --git a/components/input/style/index.ts b/components/input/style/index.ts index 065c2580b3..a1585c51a8 100644 --- a/components/input/style/index.ts +++ b/components/input/style/index.ts @@ -650,8 +650,6 @@ const genSearchInputStyle: GenerateStyle = (token: InputToken) => { [searchPrefixCls]: { [componentCls]: { '&:hover, &:focus': { - borderColor: token.colorPrimaryHover, - [`+ ${componentCls}-group-addon ${searchPrefixCls}-button:not(${antCls}-btn-primary)`]: { borderInlineStartColor: token.colorPrimaryHover, }, diff --git a/components/splitter/style/index.ts b/components/splitter/style/index.ts index 221d0b1b2d..06a96d6b3f 100644 --- a/components/splitter/style/index.ts +++ b/components/splitter/style/index.ts @@ -6,12 +6,18 @@ import { genStyleHooks } from '../../theme/internal'; export interface ComponentToken { /** - * @desc 可改变大小标识 元素大小 - * @descEN Height of content area + * @desc 拖拽标识元素大小 + * @descEN Drag and drop the identity element size + * @deprecated Please use `splitBarDraggableSize` instead. */ resizeSpinnerSize: number; /** * @desc 拖拽标识元素大小 + * @descEN Drag and drop the identity element size + */ + splitBarDraggableSize: number; + /** + * @desc 拖拽元素大小 * @descEN Drag the element size */ splitBarSize: number; @@ -71,7 +77,7 @@ const genSplitterStyle: GenerateStyle = (token: SplitterToken): C const { componentCls, colorFill, - resizeSpinnerSize, + splitBarDraggableSize, splitBarSize, splitTriggerSize, controlItemBgHover, @@ -223,7 +229,7 @@ const genSplitterStyle: GenerateStyle = (token: SplitterToken): C }, '&:after': { - height: resizeSpinnerSize, + height: splitBarDraggableSize, width: splitBarSize, }, }, @@ -278,7 +284,7 @@ const genSplitterStyle: GenerateStyle = (token: SplitterToken): C }, '&:after': { - width: resizeSpinnerSize, + width: splitBarDraggableSize, height: splitBarSize, }, }, @@ -329,11 +335,14 @@ export const prepareComponentToken: GetDefaultToken<'Splitter'> = (token) => { const splitBarSize = token.splitBarSize || 2; const splitTriggerSize = token.splitTriggerSize || 6; + // https://github.com/ant-design/ant-design/pull/51223 const resizeSpinnerSize = token.resizeSpinnerSize || 20; + const splitBarDraggableSize = token.splitBarDraggableSize ?? resizeSpinnerSize; return { splitBarSize, splitTriggerSize, + splitBarDraggableSize, resizeSpinnerSize, }; }; diff --git a/components/typography/style/mixins.ts b/components/typography/style/mixins.ts index 75433d4915..74c4932f53 100644 --- a/components/typography/style/mixins.ts +++ b/components/typography/style/mixins.ts @@ -60,6 +60,7 @@ export const getLinkStyles: GenerateStyle = (token) return { 'a&, a': { ...operationUnit(token), + userSelect: 'text', [`&[disabled], &${componentCls}-disabled`]: { color: token.colorTextDisabled, diff --git a/package.json b/package.json index bcf87456ea..788f01d092 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "antd", - "version": "5.21.3", + "version": "5.21.4", "description": "An enterprise-class UI design language and React components implementation", "license": "MIT", "funding": {