Merge branch master into master-merge-feature

CHANGELOG.en-US.md

@@ -16,6 +16,14 @@ tag: vVERSION
 
 ---
 
+## 5.12.5
+
+`2023-12-22`
+
+- 💄 Fix Tabs style issue of editable mode when there is only "new" button left. [#46585](https://github.com/ant-design/ant-design/pull/46585) [@hzyhbk](https://github.com/hzyhbk)
+- 💄 Fix Progress style issue of `line` mode with `strokeLinecap`. [#46551](https://github.com/ant-design/ant-design/pull/46551) [@ZN1996](https://github.com/ZN1996)
+- 🐞 Fix ColorPicker not support `prefixCls`. [#46561](https://github.com/ant-design/ant-design/pull/46561)
+
 ## 5.12.4
 
 `2023-12-19`

CHANGELOG.zh-CN.md

@@ -16,6 +16,14 @@ tag: vVERSION
 
 ---
 
+## 5.12.5
+
+`2023-12-22`
+
+- 💄 修复 Tabs 在 可编辑模式下只剩新增按钮时按钮的样式问题[#46585](https://github.com/ant-design/ant-design/pull/46585) [@hzyhbk](https://github.com/hzyhbk)
+- 💄 修复 Progress `strokeLinecap` 不生效的问题。[#46551](https://github.com/ant-design/ant-design/pull/46551) [@ZN1996](https://github.com/ZN1996)
+- 🐞 修复 ColorPicker 配置 `prefixCls` 不生效的问题。[#46561](https://github.com/ant-design/ant-design/pull/46561)
+
 ## 5.12.4
 
 `2023-12-19`

components/progress/Line.tsx

@@ -108,14 +108,16 @@ const Line: React.FC<LineProps> = (props) => {
     warning.deprecated(!('strokeWidth' in props), 'strokeWidth', 'size');
   }
 
+  const percentBorderRadius = strokeLinecap === 'square' || strokeLinecap === 'butt' ? 0 : '100px';
+
   const percentStyle: React.CSSProperties = {
     width: `100%`,
     height,
     borderRadius,
     clipPath:
       direction === 'rtl'
-        ? `inset(0 0 0 ${100 - validProgress(percent)}% round 100px)`
-        : `inset(0 ${100 - validProgress(percent)}% 0 0 round 100px)`,
+        ? `inset(0 0 0 ${100 - validProgress(percent)}% round ${percentBorderRadius})`
+        : `inset(0 ${100 - validProgress(percent)}% 0 0 round ${percentBorderRadius})`,
     ...backgroundProps,
   };
 
@@ -127,8 +129,8 @@ const Line: React.FC<LineProps> = (props) => {
     borderRadius,
     clipPath:
       direction === 'rtl'
-        ? `inset(0 0 0 ${100 - validProgress(successPercent)}% round 100px)`
-        : `inset(0 ${100 - validProgress(successPercent)}% 0 0 round 100px)`,
+        ? `inset(0 0 0 ${100 - validProgress(successPercent)}% round ${percentBorderRadius})`
+        : `inset(0 ${100 - validProgress(successPercent)}% 0 0 round ${percentBorderRadius})`,
     backgroundColor: success?.strokeColor,
   };
 

components/progress/__tests__/__snapshots__/demo-extend.test.ts.snap

@@ -2410,7 +2410,7 @@ Array [
       >
         <div
           class="ant-progress-bg"
-          style="width: 100%; height: 8px; border-radius: 0; clip-path: inset(0 25% 0 0 round 100px);"
+          style="width: 100%; height: 8px; border-radius: 0; clip-path: inset(0 25% 0 0 round 0);"
         />
       </div>
     </div>

components/progress/__tests__/__snapshots__/demo.test.ts.snap

@@ -2318,7 +2318,7 @@ Array [
       >
         <div
           class="ant-progress-bg"
-          style="width:100%;height:8px;border-radius:0;clip-path:inset(0 25% 0 0 round 100px)"
+          style="width:100%;height:8px;border-radius:0;clip-path:inset(0 25% 0 0 round 0)"
         />
       </div>
     </div>

components/tabs/style/index.ts

@@ -939,6 +939,7 @@ const genTabsStyle: GenerateStyle<TabsToken> = (token: TabsToken): CSSObject =>
 
         [`${componentCls}-nav-add`]: {
           minWidth: cardHeight,
+          minHeight: cardHeight,
           marginLeft: {
             _skip_check_: true,
             value: cardGutter,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd",
-  "version": "5.12.4",
+  "version": "5.12.5",
   "description": "An enterprise-class UI design language and React components implementation",
   "keywords": [
     "ant",
@@ -157,7 +157,7 @@
     "rc-tooltip": "~6.1.3",
     "rc-tree": "~5.8.2",
     "rc-tree-select": "~5.15.0",
-    "rc-upload": "~4.3.5",
+    "rc-upload": "~4.3.6",
     "rc-util": "^5.38.1",
     "scroll-into-view-if-needed": "^3.1.0",
     "throttle-debounce": "^5.0.0"
@@ -323,7 +323,7 @@
     "tsx": "^4.6.0",
     "typedoc": "^0.25.4",
     "typescript": "~5.3.0",
-    "vanilla-jsoneditor": "^0.20.0",
+    "vanilla-jsoneditor": "^0.21.1",
     "vanilla-tilt": "^1.8.1",
     "webpack": "^5.89.0",
     "webpack-bundle-analyzer": "^4.10.1",