chore: auto merge branches (#43746)

chore: merge master into feature

.dumi/theme/builtins/ImagePreview/index.tsx

@@ -69,9 +69,8 @@ const ImagePreview: React.FC<ImagePreviewProps> = (props) => {
     : {};
 
   const hasCarousel = imgs.length > 1 && !comparable;
-  const previewClassName = classNames(rootClassName, {
-    'preview-image-boxes': true,
-    clearfix: true,
+
+  const previewClassName = classNames(rootClassName, 'clearfix', 'preview-image-boxes', {
     'preview-image-boxes-compare': comparable,
     'preview-image-boxes-with-carousel': hasCarousel,
   });

.dumi/theme/slots/Content/index.tsx

@@ -26,6 +26,7 @@ const useStyle = createStyles(({ token, css }) => {
       flex-wrap: wrap;
       margin-top: 120px !important;
       clear: both;
+      height: 24px;
 
       li,
       ${antCls}-avatar + ${antCls}-avatar {

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

@@ -11,7 +11,7 @@ exports[`renders components/progress/demo/circle.tsx extend context correctly 1`
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -68,7 +68,7 @@ exports[`renders components/progress/demo/circle.tsx extend context correctly 1`
   >
     <div
       aria-valuenow="70"
-      class="ant-progress ant-progress-circle ant-progress-status-exception ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-exception ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -142,7 +142,7 @@ exports[`renders components/progress/demo/circle.tsx extend context correctly 1`
   >
     <div
       aria-valuenow="100"
-      class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -217,7 +217,7 @@ exports[`renders components/progress/demo/circle-dynamic.tsx extend context corr
 Array [
   <div
     aria-valuenow="0"
-    class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
     role="progressbar"
     style="margin-right: 8px;"
   >
@@ -341,7 +341,7 @@ exports[`renders components/progress/demo/circle-micro.tsx extend context correc
 Array [
   <div
     aria-valuenow="60"
-    class="ant-progress ant-progress-inline-circle ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+    class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-inline-circle ant-progress-show-info"
     role="progressbar"
   >
     <div
@@ -431,7 +431,7 @@ exports[`renders components/progress/demo/circle-mini.tsx extend context correct
   >
     <div
       aria-valuenow="30"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
       role="progressbar"
     >
       <div
@@ -488,7 +488,7 @@ exports[`renders components/progress/demo/circle-mini.tsx extend context correct
   >
     <div
       aria-valuenow="70"
-      class="ant-progress ant-progress-circle ant-progress-status-exception ant-progress-show-info"
+      class="ant-progress ant-progress-status-exception ant-progress-circle ant-progress-show-info"
       role="progressbar"
     >
       <div
@@ -562,7 +562,7 @@ exports[`renders components/progress/demo/circle-mini.tsx extend context correct
   >
     <div
       aria-valuenow="100"
-      class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info"
+      class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info"
       role="progressbar"
     >
       <div
@@ -644,7 +644,7 @@ exports[`renders components/progress/demo/dashboard.tsx extend context correctly
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -701,7 +701,7 @@ exports[`renders components/progress/demo/dashboard.tsx extend context correctly
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -759,7 +759,7 @@ exports[`renders components/progress/demo/dynamic.tsx extend context correctly 1
 Array [
   <div
     aria-valuenow="0"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -862,7 +862,7 @@ exports[`renders components/progress/demo/format.tsx extend context correctly 1`
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -919,7 +919,7 @@ exports[`renders components/progress/demo/format.tsx extend context correctly 1`
   >
     <div
       aria-valuenow="100"
-      class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -977,7 +977,7 @@ exports[`renders components/progress/demo/gradient-line.tsx extend context corre
 Array [
   <div
     aria-valuenow="99"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1002,7 +1002,7 @@ Array [
   </div>,
   <div
     aria-valuenow="99"
-    class="ant-progress ant-progress-line ant-progress-status-active ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-active ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1035,7 +1035,7 @@ Array [
     >
       <div
         aria-valuenow="90"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1111,7 +1111,7 @@ Array [
     >
       <div
         aria-valuenow="100"
-        class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1206,7 +1206,7 @@ exports[`renders components/progress/demo/line.tsx extend context correctly 1`]
 Array [
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1231,7 +1231,7 @@ Array [
   </div>,
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-line ant-progress-status-active ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-active ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1256,7 +1256,7 @@ Array [
   </div>,
   <div
     aria-valuenow="70"
-    class="ant-progress ant-progress-line ant-progress-status-exception ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-exception ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1298,7 +1298,7 @@ Array [
   </div>,
   <div
     aria-valuenow="100"
-    class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-success ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1340,7 +1340,7 @@ Array [
   </div>,
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1366,7 +1366,7 @@ exports[`renders components/progress/demo/line-mini.tsx extend context correctly
 >
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1391,7 +1391,7 @@ exports[`renders components/progress/demo/line-mini.tsx extend context correctly
   </div>
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-line ant-progress-status-active ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-active ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1416,7 +1416,7 @@ exports[`renders components/progress/demo/line-mini.tsx extend context correctly
   </div>
   <div
     aria-valuenow="70"
-    class="ant-progress ant-progress-line ant-progress-status-exception ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-exception ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1458,7 +1458,7 @@ exports[`renders components/progress/demo/line-mini.tsx extend context correctly
   </div>
   <div
     aria-valuenow="100"
-    class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-success ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1505,7 +1505,7 @@ exports[`renders components/progress/demo/linecap.tsx extend context correctly 1
 Array [
   <div
     aria-valuenow="75"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1539,7 +1539,7 @@ Array [
     >
       <div
         aria-valuenow="75"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1596,7 +1596,7 @@ Array [
     >
       <div
         aria-valuenow="75"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1655,7 +1655,7 @@ exports[`renders components/progress/demo/segment.tsx extend context correctly 1
 Array [
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1711,7 +1711,7 @@ Array [
     >
       <div
         aria-valuenow="30"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1787,7 +1787,7 @@ Array [
     >
       <div
         aria-valuenow="30"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1872,7 +1872,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1902,7 +1902,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -1931,7 +1931,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -1967,7 +1967,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -2024,7 +2024,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -2080,7 +2080,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-inline-circle ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-inline-circle ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2163,7 +2163,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -2220,7 +2220,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -2276,7 +2276,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2360,7 +2360,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -2393,7 +2393,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -2426,7 +2426,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2459,7 +2459,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2494,7 +2494,7 @@ exports[`renders components/progress/demo/steps.tsx extend context correctly 1`]
 Array [
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -2523,7 +2523,7 @@ Array [
   <br />,
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -2560,7 +2560,7 @@ Array [
   <br />,
   <div
     aria-valuenow="100"
-    class="ant-progress ant-progress-steps ant-progress-status-success ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-success ant-progress-steps ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -2614,7 +2614,7 @@ Array [
   <br />,
   <div
     aria-valuenow="60"
-    class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div

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

@@ -11,7 +11,7 @@ exports[`renders components/progress/demo/circle.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -68,7 +68,7 @@ exports[`renders components/progress/demo/circle.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="70"
-      class="ant-progress ant-progress-circle ant-progress-status-exception ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-exception ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -142,7 +142,7 @@ exports[`renders components/progress/demo/circle.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="100"
-      class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -217,7 +217,7 @@ exports[`renders components/progress/demo/circle-dynamic.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="0"
-    class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
     role="progressbar"
     style="margin-right:8px"
   >
@@ -341,7 +341,7 @@ exports[`renders components/progress/demo/circle-micro.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="60"
-    class="ant-progress ant-progress-inline-circle ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+    class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-inline-circle ant-progress-show-info"
     role="progressbar"
   >
     <div
@@ -407,7 +407,7 @@ exports[`renders components/progress/demo/circle-mini.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="30"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
       role="progressbar"
     >
       <div
@@ -464,7 +464,7 @@ exports[`renders components/progress/demo/circle-mini.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="70"
-      class="ant-progress ant-progress-circle ant-progress-status-exception ant-progress-show-info"
+      class="ant-progress ant-progress-status-exception ant-progress-circle ant-progress-show-info"
       role="progressbar"
     >
       <div
@@ -538,7 +538,7 @@ exports[`renders components/progress/demo/circle-mini.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="100"
-      class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info"
+      class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info"
       role="progressbar"
     >
       <div
@@ -620,7 +620,7 @@ exports[`renders components/progress/demo/dashboard.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -677,7 +677,7 @@ exports[`renders components/progress/demo/dashboard.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -735,7 +735,7 @@ exports[`renders components/progress/demo/dynamic.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="0"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -838,7 +838,7 @@ exports[`renders components/progress/demo/format.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="75"
-      class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -895,7 +895,7 @@ exports[`renders components/progress/demo/format.tsx correctly 1`] = `
   >
     <div
       aria-valuenow="100"
-      class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info ant-progress-default"
+      class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info ant-progress-default"
       role="progressbar"
     >
       <div
@@ -953,7 +953,7 @@ exports[`renders components/progress/demo/gradient-line.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="99"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -978,7 +978,7 @@ Array [
   </div>,
   <div
     aria-valuenow="99"
-    class="ant-progress ant-progress-line ant-progress-status-active ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-active ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1011,7 +1011,7 @@ Array [
     >
       <div
         aria-valuenow="90"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1087,7 +1087,7 @@ Array [
     >
       <div
         aria-valuenow="100"
-        class="ant-progress ant-progress-circle ant-progress-status-success ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-success ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1182,7 +1182,7 @@ exports[`renders components/progress/demo/line.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1207,7 +1207,7 @@ Array [
   </div>,
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-line ant-progress-status-active ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-active ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1232,7 +1232,7 @@ Array [
   </div>,
   <div
     aria-valuenow="70"
-    class="ant-progress ant-progress-line ant-progress-status-exception ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-exception ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1274,7 +1274,7 @@ Array [
   </div>,
   <div
     aria-valuenow="100"
-    class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-success ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1316,7 +1316,7 @@ Array [
   </div>,
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1342,7 +1342,7 @@ exports[`renders components/progress/demo/line-mini.tsx correctly 1`] = `
 >
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1367,7 +1367,7 @@ exports[`renders components/progress/demo/line-mini.tsx correctly 1`] = `
   </div>
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-line ant-progress-status-active ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-active ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1392,7 +1392,7 @@ exports[`renders components/progress/demo/line-mini.tsx correctly 1`] = `
   </div>
   <div
     aria-valuenow="70"
-    class="ant-progress ant-progress-line ant-progress-status-exception ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-exception ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1434,7 +1434,7 @@ exports[`renders components/progress/demo/line-mini.tsx correctly 1`] = `
   </div>
   <div
     aria-valuenow="100"
-    class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-success ant-progress-line ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -1481,7 +1481,7 @@ exports[`renders components/progress/demo/linecap.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="75"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1515,7 +1515,7 @@ Array [
     >
       <div
         aria-valuenow="75"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1572,7 +1572,7 @@ Array [
     >
       <div
         aria-valuenow="75"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1631,7 +1631,7 @@ exports[`renders components/progress/demo/segment.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -1668,7 +1668,7 @@ Array [
     >
       <div
         aria-valuenow="30"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1725,7 +1725,7 @@ Array [
     >
       <div
         aria-valuenow="30"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1791,7 +1791,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1821,7 +1821,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -1850,7 +1850,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -1886,7 +1886,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -1943,7 +1943,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -1999,7 +1999,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-inline-circle ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-inline-circle ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2058,7 +2058,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -2115,7 +2115,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -2171,7 +2171,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2231,7 +2231,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
         role="progressbar"
       >
         <div
@@ -2264,7 +2264,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-small"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-small"
         role="progressbar"
       >
         <div
@@ -2297,7 +2297,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2330,7 +2330,7 @@ Array [
     >
       <div
         aria-valuenow="50"
-        class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info"
+        class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info"
         role="progressbar"
       >
         <div
@@ -2365,7 +2365,7 @@ exports[`renders components/progress/demo/steps.tsx correctly 1`] = `
 Array [
   <div
     aria-valuenow="50"
-    class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -2394,7 +2394,7 @@ Array [
   <br />,
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -2431,7 +2431,7 @@ Array [
   <br />,
   <div
     aria-valuenow="100"
-    class="ant-progress ant-progress-steps ant-progress-status-success ant-progress-show-info ant-progress-small"
+    class="ant-progress ant-progress-status-success ant-progress-steps ant-progress-show-info ant-progress-small"
     role="progressbar"
   >
     <div
@@ -2485,7 +2485,7 @@ Array [
   <br />,
   <div
     aria-valuenow="60"
-    class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div

components/progress/__tests__/__snapshots__/index.test.tsx.snap

@@ -3,7 +3,7 @@
 exports[`Progress render dashboard 295 gapDegree 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -58,7 +58,7 @@ exports[`Progress render dashboard 295 gapDegree 1`] = `
 exports[`Progress render dashboard 296 gapDegree 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -113,7 +113,7 @@ exports[`Progress render dashboard 296 gapDegree 1`] = `
 exports[`Progress render dashboard zero gapDegree 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -168,7 +168,7 @@ exports[`Progress render dashboard zero gapDegree 1`] = `
 exports[`Progress render format 1`] = `
 <div
   aria-valuenow="10"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -200,7 +200,7 @@ exports[`Progress render format 1`] = `
 exports[`Progress render negative progress 1`] = `
 <div
   aria-valuenow="-20"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -228,7 +228,7 @@ exports[`Progress render negative progress 1`] = `
 exports[`Progress render negative successPercent 1`] = `
 <div
   aria-valuenow="-20"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -260,7 +260,7 @@ exports[`Progress render negative successPercent 1`] = `
 exports[`Progress render normal progress 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -288,7 +288,7 @@ exports[`Progress render normal progress 1`] = `
 exports[`Progress render out-of-range progress 1`] = `
 <div
   aria-valuenow="120"
-  class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-success ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -333,7 +333,7 @@ exports[`Progress render out-of-range progress 1`] = `
 exports[`Progress render out-of-range progress with info 1`] = `
 <div
   aria-valuenow="120"
-  class="ant-progress ant-progress-line ant-progress-status-success ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-success ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -378,7 +378,7 @@ exports[`Progress render out-of-range progress with info 1`] = `
 exports[`Progress render strokeColor 1`] = `
 <div
   aria-valuenow="50"
-  class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -433,7 +433,7 @@ exports[`Progress render strokeColor 1`] = `
 exports[`Progress render strokeColor 2`] = `
 <div
   aria-valuenow="50"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -461,7 +461,7 @@ exports[`Progress render strokeColor 2`] = `
 exports[`Progress render strokeColor 3`] = `
 <div
   aria-valuenow="50"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -490,7 +490,7 @@ exports[`Progress render strokeWidth of progress 1`] = `
 <div>
   <div
     aria-valuenow="30"
-    class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+    class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
     role="progressbar"
   >
     <div
@@ -546,7 +546,7 @@ exports[`Progress render strokeWidth of progress 1`] = `
 exports[`Progress render successColor progress 1`] = `
 <div
   aria-valuenow="30"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -578,7 +578,7 @@ exports[`Progress render successColor progress 1`] = `
 exports[`Progress render successColor progress type="circle" 1`] = `
 <div
   aria-valuenow="30"
-  class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -633,7 +633,7 @@ exports[`Progress render successColor progress type="circle" 1`] = `
 exports[`Progress render successColor progress type="dashboard" 1`] = `
 <div
   aria-valuenow="30"
-  class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -688,7 +688,7 @@ exports[`Progress render successColor progress type="dashboard" 1`] = `
 exports[`Progress render trailColor progress 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div
@@ -717,7 +717,7 @@ exports[`Progress render trailColor progress 1`] = `
 exports[`Progress rtl render component should be rendered correctly in RTL direction 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-line ant-progress-status-normal ant-progress-show-info ant-progress-default ant-progress-rtl"
+  class="ant-progress ant-progress-status-normal ant-progress-line ant-progress-show-info ant-progress-default ant-progress-rtl"
   role="progressbar"
 >
   <div
@@ -745,7 +745,7 @@ exports[`Progress rtl render component should be rendered correctly in RTL direc
 exports[`Progress should support steps 1`] = `
 <div
   aria-valuenow="0"
-  class="ant-progress ant-progress-steps ant-progress-status-normal ant-progress-show-info ant-progress-default"
+  class="ant-progress ant-progress-status-normal ant-progress-steps ant-progress-show-info ant-progress-default"
   role="progressbar"
 >
   <div

components/progress/progress.tsx

@@ -164,10 +164,10 @@ const Progress = React.forwardRef<HTMLDivElement, ProgressProps>((props, ref) =>
 
   const classString = classNames(
     prefixCls,
+    `${prefixCls}-status-${progressStatus}`,
+    `${prefixCls}-${(type === 'dashboard' && 'circle') || (steps && 'steps') || type}`,
     {
       [`${prefixCls}-inline-circle`]: type === 'circle' && getSize(size, 'circle')[0] <= 20,
-      [`${prefixCls}-${(type === 'dashboard' && 'circle') || (steps && 'steps') || type}`]: true,
-      [`${prefixCls}-status-${progressStatus}`]: true,
       [`${prefixCls}-show-info`]: showInfo,
       [`${prefixCls}-${size}`]: typeof size === 'string',
       [`${prefixCls}-rtl`]: direction === 'rtl',

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

@@ -2583,7 +2583,7 @@ Array [
           >
             <div
               aria-valuenow="60"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3350,7 +3350,7 @@ exports[`renders components/steps/demo/progress.tsx extend context correctly 1`]
         >
           <div
             aria-valuenow="60"
-            class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+            class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
             role="progressbar"
           >
             <div
@@ -3598,7 +3598,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3781,7 +3781,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3964,7 +3964,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -4147,7 +4147,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div

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

@@ -2255,7 +2255,7 @@ Array [
           >
             <div
               aria-valuenow="60"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3022,7 +3022,7 @@ exports[`renders components/steps/demo/progress.tsx correctly 1`] = `
         >
           <div
             aria-valuenow="60"
-            class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+            class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
             role="progressbar"
           >
             <div
@@ -3270,7 +3270,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3453,7 +3453,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3636,7 +3636,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div
@@ -3819,7 +3819,7 @@ Array [
           >
             <div
               aria-valuenow="0"
-              class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info"
+              class="ant-progress ant-progress-status-normal ant-progress-circle ant-progress-show-info"
               role="progressbar"
             >
               <div

components/tooltip/index.tsx

@@ -339,9 +339,7 @@ const Tooltip = React.forwardRef<TooltipRef, TooltipProps>((props, ref) => {
   const childProps = child.props;
   const childCls =
     !childProps.className || typeof childProps.className === 'string'
-      ? classNames(childProps.className, {
-          [openClassName || `${prefixCls}-open`]: true,
-        })
+      ? classNames(childProps.className, openClassName || `${prefixCls}-open`)
       : childProps.className;
 
   // Style
@@ -349,8 +347,11 @@ const Tooltip = React.forwardRef<TooltipRef, TooltipProps>((props, ref) => {
 
   // Color
   const colorInfo = parseColor(prefixCls, color);
-  const formattedOverlayInnerStyle = { ...overlayInnerStyle, ...colorInfo.overlayStyle };
   const arrowContentStyle = colorInfo.arrowStyle;
+  const formattedOverlayInnerStyle: React.CSSProperties = {
+    ...overlayInnerStyle,
+    ...colorInfo.overlayStyle,
+  };
 
   const customOverlayClassName = classNames(
     overlayClassName,

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

@@ -665,7 +665,7 @@ Array [
     </span>
   </button>,
   <div
-    class="ant-tour ant-tour-placement-bottom"
+    class="ant-tour"
     style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box; z-index: 1001;"
   >
     <div

components/tour/__tests__/__snapshots__/index.test.tsx.snap

@@ -214,7 +214,7 @@ exports[`Tour controlled current 1`] = `
       </button>
     </div>
     <div
-      class="ant-tour ant-tour-primary ant-tour-placement-bottom"
+      class="ant-tour ant-tour-primary"
       style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box; z-index: 1001;"
     >
       <div
@@ -338,7 +338,7 @@ exports[`Tour controlled current 1`] = `
 
 exports[`Tour custom step pre btn & next btn className & style 1`] = `
 <div
-  class="ant-tour ant-tour-placement-bottom"
+  class="ant-tour"
   style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box; z-index: 1001;"
 >
   <div

components/tour/index.en-US.md

@@ -31,7 +31,7 @@ Use when you want to guide users through a product.
 | Property | Description | Type | Default | Version |
 | --- | --- | --- | --- | --- |
 | arrow | Whether to show the arrow, including the configuration whether to point to the center of the element | `boolean`\|`{ pointAtCenter: boolean}` | `true` |  |
-| placement | Position of the guide card relative to the target element | `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` | `bottom` |  |
+| placement | Position of the guide card relative to the target element | `center` `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` | `bottom` |  |
 | onClose | Callback function on shutdown | `Function` | - |  |
 | mask | Whether to enable masking, change mask style and fill color by pass custom props | `boolean \| { style?: React.CSSProperties; color?: string; }` | `true` |  |
 | type | Type, affects the background color and text color | `default` `primary` | `default` |  |
@@ -51,7 +51,7 @@ Use when you want to guide users through a product.
 | cover | Displayed pictures or videos | `ReactNode` | - |  |
 | title | title | `ReactNode` | - |  |
 | description | description | `ReactNode` | - |  |
-| placement | Position of the guide card relative to the target element | `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` | `bottom` |  |
+| placement | Position of the guide card relative to the target element | `center` `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` | `bottom` |  |
 | onClose | Callback function on shutdown | `Function` | - |  |
 | mask | Whether to enable masking, change mask style and fill color by pass custom props, the default follows the `mask` property of Tour | `boolean \| { style?: React.CSSProperties; color?: string; }` | `true` |  |
 | type | Type, affects the background color and text color | `default` `primary` | `default` |  |

components/tour/index.zh-CN.md

@@ -32,7 +32,7 @@ demo:
 | 属性 | 说明 | 类型 | 默认值 | 版本 |
 | --- | --- | --- | --- | --- |
 | arrow | 是否显示箭头，包含是否指向元素中心的配置 | `boolean` \| `{ pointAtCenter: boolean}` | `true` |  |
-| placement | 引导卡片相对于目标元素的位置 | `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` | `bottom` |  |
+| placement | 引导卡片相对于目标元素的位置 | `center` `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` | `bottom` |  |
 | onClose | 关闭引导时的回调函数 | `Function` | - |  |
 | onFinish | 引导完成时的回调 | `Function` | - |  |
 | mask | 是否启用蒙层，也可传入配置改变蒙层样式和填充色 | `boolean \| { style?: React.CSSProperties; color?: string; }` | `true` |  |
@@ -53,7 +53,7 @@ demo:
 | cover | 展示的图片或者视频 | `ReactNode` | - |  |
 | title | 标题 | `ReactNode` | - |  |
 | description | 主要描述部分 | `ReactNode` | - |  |
-| placement | 引导卡片相对于目标元素的位置 | `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` `bottom` |  |  |
+| placement | 引导卡片相对于目标元素的位置 | `center` `left` `leftTop` `leftBottom` `right` `rightTop` `rightBottom` `top` `topLeft` `topRight` `bottom` `bottomLeft` `bottomRight` `bottom` |  |  |
 | onClose | 关闭引导时的回调函数 | `Function` | - |  |
 | mask | 是否启用蒙层，也可传入配置改变蒙层样式和填充色，默认跟随 Tour 的 `mask` 属性 | `boolean \| { style?: React.CSSProperties; color?: string; }` | `true` |  |
 | type | 类型，影响底色与文字颜色 | `default` \| `primary` | `default` |  |

components/upload/UploadList/ListItem.tsx

@@ -95,8 +95,7 @@ const ListItem = React.forwardRef<HTMLDivElement, ListItemProps>(
     let icon = <div className={`${prefixCls}-icon`}>{iconNode}</div>;
     if (listType === 'picture' || listType === 'picture-card' || listType === 'picture-circle') {
       if (mergedStatus === 'uploading' || (!file.thumbUrl && !file.url)) {
-        const uploadingClassName = classNames({
-          [`${prefixCls}-list-item-thumbnail`]: true,
+        const uploadingClassName = classNames(`${prefixCls}-list-item-thumbnail`, {
           [`${prefixCls}-list-item-file`]: mergedStatus !== 'uploading',
         });
         icon = <div className={uploadingClassName}>{iconNode}</div>;

components/upload/UploadList/index.tsx

@@ -165,17 +165,10 @@ const InternalUploadList: React.ForwardRefRenderFunction<UploadListRef, UploadLi
   const prefixCls = getPrefixCls('upload', customizePrefixCls);
   const rootPrefixCls = getPrefixCls();
 
-  const listClassNames = classNames(`${prefixCls}-list`, {
-    [`${prefixCls}-list-${listType}`]: true,
-  });
+  const listClassNames = classNames(`${prefixCls}-list`, `${prefixCls}-list-${listType}`);
 
   // >>> Motion config
-  const motionKeyList = [
-    ...items.map((file) => ({
-      key: file.uid,
-      file,
-    })),
-  ];
+  const motionKeyList = [...items.map((file) => ({ key: file.uid, file }))];
 
   const animationDirection =
     listType === 'picture-card' || listType === 'picture-circle' ? 'animate-inline' : 'animate';

docs/react/use-with-next.en-US.md

@@ -31,6 +31,8 @@ Now we install `antd` from yarn or npm or pnpm.
 Modify `src/app/page.tsx`, import Button component from `antd`.
 
 ```jsx
+'use client'; // If used in Pages Router, is no need to add this line
+
 import React from 'react';
 import { Button } from 'antd';
 
@@ -58,8 +60,10 @@ If you are using the Pages Router in Next.js and using antd as your component li
 2. Rewrite `pages/_document.tsx`
 
 ```tsx
+import React from 'react';
 import { StyleProvider, createCache, extractStyle } from '@ant-design/cssinjs';
-import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document';
+import Document, { Head, Html, Main, NextScript } from 'next/document';
+import type { DocumentContext } from 'next/document';
 
 const MyDocument = () => (
   <Html lang="en">
@@ -76,24 +80,21 @@ MyDocument.getInitialProps = async (ctx: DocumentContext) => {
   const originalRenderPage = ctx.renderPage;
   ctx.renderPage = () =>
     originalRenderPage({
-      enhanceApp: (App) => (props) =>
-        (
-          <StyleProvider cache={cache}>
-            <App {...props} />
-          </StyleProvider>
-        ),
+      enhanceApp: (App) => (props) => (
+        <StyleProvider cache={cache}>
+          <App {...props} />
+        </StyleProvider>
+      ),
     });
 
   const initialProps = await Document.getInitialProps(ctx);
-  // 1.1 extract style which had been used
   const style = extractStyle(cache, true);
   return {
     ...initialProps,
     styles: (
       <>
         {initialProps.styles}
-        {/* 1.2 inject css */}
-        <style dangerouslySetInnerHTML={{ __html: style }}></style>
+        <style dangerouslySetInnerHTML={{ __html: style }} />
       </>
     ),
   };
@@ -121,6 +122,7 @@ export default theme;
 4. Rewrite `pages/_app.tsx`
 
 ```tsx
+import React from 'react';
 import { ConfigProvider } from 'antd';
 import type { AppProps } from 'next/app';
 import theme from './themeConfig';
@@ -137,6 +139,7 @@ export default App;
 5. Use antd in page component
 
 ```tsx
+import React from 'react';
 import { Button } from 'antd';
 
 const Home = () => (
@@ -163,9 +166,9 @@ If you are using the App Router in Next.js and using antd as your component libr
 ```tsx
 'use client';
 
+import React from 'react';
 import { StyleProvider, createCache, extractStyle } from '@ant-design/cssinjs';
 import { useServerInsertedHTML } from 'next/navigation';
-import React from 'react';
 
 const StyledComponentsRegistry = ({ children }: { children: React.ReactNode }) => {
   const cache = createCache();
@@ -181,10 +184,10 @@ export default StyledComponentsRegistry;
 3. Use it in `app/layout.tsx`
 
 ```tsx
-import { Inter } from 'next/font/google';
 import React from 'react';
+import { Inter } from 'next/font/google';
 import StyledComponentsRegistry from '../lib/AntdRegistry';
-import './globals.css';
+import '@/globals.css';
 
 const inter = Inter({ subsets: ['latin'] });
 
@@ -223,11 +226,11 @@ export default theme;
 5. Use in page
 
 ```tsx
-import { Button, ConfigProvider } from 'antd';
 import React from 'react';
+import { Button, ConfigProvider } from 'antd';
 import theme from './themeConfig';
 
-const HomePage: React.FC = () => (
+const HomePage = () => (
   <ConfigProvider theme={theme}>
     <div className="App">
       <Button type="primary">Button</Button>
@@ -238,6 +241,6 @@ const HomePage: React.FC = () => (
 export default HomePage;
 ```
 
-> Tips: The above method does not use sub-components such as `Select.Option` and `Typography.text` in the page, so it can be used normally. However, if you use a sub-component like this in your page, you will currently see the following warning in next.js: `Error: Cannot access .Option on the server. You cannot dot into a client module from a server component. You can only pass the imported name through.`, currently need to wait for Next.js official solution. Before again, if you use the above sub-components in your page, you can add "use client" to the first line of the page component to avoid warnings. See examples for more details: [with-sub-components](https://github.com/ant-design/ant-design-examples/blob/main/examples/with-nextjs-app-router-inline-style/src/app/with-sub-components/page.tsx).
+> Tips: The above method does not use sub-components such as `<Select.Option />` and `<Typography.text />` in the page, so it can be used normally. However, if you use a sub-component like this in your page, you will currently see the following warning in next.js: `Error: Cannot access .Option on the server. You cannot dot into a client module from a server component. You can only pass the imported name through.`, currently need to wait for Next.js official solution. Before again, if you use the above sub-components in your page, you can add `"use client"` to the first line of the page component to avoid warnings. See examples for more details: [with-sub-components](https://github.com/ant-design/ant-design-examples/blob/main/examples/with-nextjs-app-router-inline-style/src/app/with-sub-components/page.tsx).
 
 For more detailed information, please refer to [with-nextjs-app-router-inline-style](https://github.com/ant-design/ant-design-examples/tree/main/examples/with-nextjs-app-router-inline-style)。

docs/react/use-with-next.zh-CN.md

@@ -31,7 +31,7 @@ $ npm run dev
 修改 `src/app/page.tsx`，引入 antd 的按钮组件。
 
 ```jsx
-'use client';
+'use client'; // 如果是在 Pages Router 中使用，则不需要加这行
 
 import React from 'react';
 import { Button } from 'antd';
@@ -60,8 +60,10 @@ export default Home;
 2. 改写 `pages/_document.tsx`
 
 ```tsx
+import React from 'react';
 import { StyleProvider, createCache, extractStyle } from '@ant-design/cssinjs';
-import Document, { DocumentContext, Head, Html, Main, NextScript } from 'next/document';
+import Document, { Head, Html, Main, NextScript } from 'next/document';
+import type { DocumentContext } from 'next/document';
 
 const MyDocument = () => (
   <Html lang="en">
@@ -78,24 +80,21 @@ MyDocument.getInitialProps = async (ctx: DocumentContext) => {
   const originalRenderPage = ctx.renderPage;
   ctx.renderPage = () =>
     originalRenderPage({
-      enhanceApp: (App) => (props) =>
-        (
-          <StyleProvider cache={cache}>
-            <App {...props} />
-          </StyleProvider>
-        ),
+      enhanceApp: (App) => (props) => (
+        <StyleProvider cache={cache}>
+          <App {...props} />
+        </StyleProvider>
+      ),
     });
 
   const initialProps = await Document.getInitialProps(ctx);
-  // 1.1 extract style which had been used
   const style = extractStyle(cache, true);
   return {
     ...initialProps,
     styles: (
       <>
         {initialProps.styles}
-        {/* 1.2 inject css */}
-        <style dangerouslySetInnerHTML={{ __html: style }}></style>
+        <style dangerouslySetInnerHTML={{ __html: style }} />
       </>
     ),
   };
@@ -123,6 +122,7 @@ export default theme;
 4. 改写 `pages/_app.tsx`
 
 ```tsx
+import React from 'react';
 import { ConfigProvider } from 'antd';
 import type { AppProps } from 'next/app';
 import theme from './themeConfig';
@@ -139,6 +139,7 @@ export default App;
 5. 在页面中使用 antd
 
 ```tsx
+import React from 'react';
 import { Button } from 'antd';
 
 const Home = () => (
@@ -163,9 +164,11 @@ export default Home;
 2. 创建 `lib/AntdRegistry.tsx`
 
 ```tsx
+'use client';
+
+import React from 'react';
 import { StyleProvider, createCache, extractStyle } from '@ant-design/cssinjs';
 import { useServerInsertedHTML } from 'next/navigation';
-import React from 'react';
 
 const StyledComponentsRegistry = ({ children }: { children: React.ReactNode }) => {
   const cache = createCache();
@@ -181,10 +184,10 @@ export default StyledComponentsRegistry;
 3. 在 `app/layout.tsx` 中使用
 
 ```tsx
-import { Inter } from 'next/font/google';
 import React from 'react';
+import { Inter } from 'next/font/google';
 import StyledComponentsRegistry from '../lib/AntdRegistry';
-import './globals.css';
+import '@/globals.css';
 
 const inter = Inter({ subsets: ['latin'] });
 
@@ -223,11 +226,11 @@ export default theme;
 5. 在页面中使用
 
 ```tsx
-import { Button, ConfigProvider } from 'antd';
 import React from 'react';
+import { Button, ConfigProvider } from 'antd';
 import theme from './themeConfig';
 
-const HomePage: React.FC = () => (
+const HomePage = () => (
   <ConfigProvider theme={theme}>
     <div className="App">
       <Button type="primary">Button</Button>
@@ -238,6 +241,6 @@ const HomePage: React.FC = () => (
 export default HomePage;
 ```
 
-> 注意: 上述方式没有在页面中使用如：`Select.Option` 、 `Typography.Text` 等子组件，因此可以正常使用。但如果你的页面中有使用类似这样的子组件，目前在 Next.js 中会看到如下警告：`Error: Cannot access .Option on the server. You cannot dot into a client module from a server component. You can only pass the imported name through.`，目前需等待 Next.js 官方解决。在此之前，如果你的页面中使用了上述子组件，可在页面组件第一行加上 `"use client";` 来避免警告。更多细节可以参考示例：[with-sub-components](https://github.com/ant-design/ant-design-examples/blob/main/examples/with-nextjs-app-router-inline-style/src/app/with-sub-components/page.tsx)。
+> 注意: 上述方式没有在页面中使用类似 `<Select.Option />`、`<Typography.Text />` 等子组件，因此可以正常使用。但如果你的页面中有使用类似这样的子组件，目前在 Next.js 中会看到如下警告：`Error: Cannot access .Option on the server. You cannot dot into a client module from a server component. You can only pass the imported name through.`，目前需等待 Next.js 官方解决。在此之前，如果你的页面中使用了上述子组件，可在页面组件第一行加上 `"use client"` 来避免警告。更多细节可以参考示例：[with-sub-components](https://github.com/ant-design/ant-design-examples/blob/main/examples/with-nextjs-app-router-inline-style/src/app/with-sub-components/page.tsx)。
 
 更多详细的细节可以参考 [with-nextjs-app-router-inline-style](https://github.com/ant-design/ant-design-examples/tree/main/examples/with-nextjs-app-router-inline-style)。

package.json

@@ -116,7 +116,7 @@
     "@ctrl/tinycolor": "^3.6.0",
     "@rc-component/color-picker": "~1.4.0",
     "@rc-component/mutate-observer": "^1.0.0",
-    "@rc-component/tour": "~1.8.0",
+    "@rc-component/tour": "~1.8.1",
     "@rc-component/trigger": "^1.13.0",
     "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.2.0",
@@ -148,7 +148,7 @@
     "rc-switch": "~4.1.0",
     "rc-table": "~7.32.1",
     "rc-tabs": "~12.9.0",
-    "rc-textarea": "~1.3.2",
+    "rc-textarea": "~1.3.3",
     "rc-tooltip": "~6.0.0",
     "rc-tree": "~5.7.6",
     "rc-tree-select": "~5.10.0",

scripts/generate-authors.ts

@@ -30,7 +30,7 @@ async function execute() {
   logs = _.sortBy(_.unionBy(logs, 'author_email'), 'author_name');
   fs.writeFileSync(
     path.join(cwd, 'AUTHORS.txt'),
-    logs.map((item) => `${item.author_name} <${item.author_email}>`).join('\n'),
+    Array.from(new Set(logs.map((item) => item.author_name))).join('\n'),
   );
 }