From a30dd26052e6cc7349f174ed23665c3f090e9682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=81=8F=E5=8F=B3?= <afc163@gmail.com>
Date: Wed, 19 Jun 2019 19:41:37 +0800
Subject: [PATCH] :up: upgrade rc-progress to 2.4.0 (#17168)

---
 components/progress/Circle.tsx                |  12 +-
 .../__tests__/__snapshots__/demo.test.js.snap | 128 +++++++++---------
 .../__snapshots__/index.test.js.snap          |   8 +-
 components/progress/progress.tsx              |   2 +-
 package.json                                  |   2 +-
 5 files changed, 78 insertions(+), 74 deletions(-)

diff --git a/components/progress/Circle.tsx b/components/progress/Circle.tsx
index 6aa7520d9877..bf6b7865dc87 100644
--- a/components/progress/Circle.tsx
+++ b/components/progress/Circle.tsx
@@ -17,7 +17,9 @@ const statusColorMap: Record<string, string> = {
 
 function getPercentage({ percent, successPercent }: CircleProps) {
   const ptg = validProgress(percent);
-  if (!successPercent) return ptg;
+  if (!successPercent) {
+    return ptg;
+  }
 
   const successPtg = validProgress(successPercent);
   return [successPercent, validProgress(ptg - successPtg)];
@@ -25,7 +27,9 @@ function getPercentage({ percent, successPercent }: CircleProps) {
 
 function getStrokeColor({ progressStatus, successPercent, strokeColor }: CircleProps) {
   const color = strokeColor || statusColorMap[progressStatus];
-  if (!successPercent) return color;
+  if (!successPercent) {
+    return color;
+  }
   return [statusColorMap.success, color];
 }
 
@@ -49,7 +53,7 @@ const Circle: React.SFC<CircleProps> = props => {
   };
   const circleWidth = strokeWidth || 6;
   const gapPos = gapPosition || (type === 'dashboard' && 'bottom') || 'top';
-  const gapDeg = gapDegree || (type === 'dashboard' && 75);
+  const gapDeg = gapDegree ? gapDegree : (type === 'dashboard' ? 75 : 0);
 
   return (
     <div className={`${prefixCls}-inner`} style={circleStyle}>
@@ -57,7 +61,7 @@ const Circle: React.SFC<CircleProps> = props => {
         percent={getPercentage(props)}
         strokeWidth={circleWidth}
         trailWidth={circleWidth}
-        strokeColor={getStrokeColor(props)}
+        strokeColor={getStrokeColor(props) as string}
         strokeLinecap={strokeLinecap}
         trailColor={trailColor}
         prefixCls={prefixCls}
diff --git a/components/progress/__tests__/__snapshots__/demo.test.js.snap b/components/progress/__tests__/__snapshots__/demo.test.js.snap
index d42401bf9194..e71491d785b5 100644
--- a/components/progress/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/progress/__tests__/__snapshots__/demo.test.js.snap
@@ -16,8 +16,8 @@ exports[`renders ./components/progress/demo/circle.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -27,8 +27,8 @@ exports[`renders ./components/progress/demo/circle.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -57,8 +57,8 @@ exports[`renders ./components/progress/demo/circle.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -68,8 +68,8 @@ exports[`renders ./components/progress/demo/circle.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -115,8 +115,8 @@ exports[`renders ./components/progress/demo/circle.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -126,8 +126,8 @@ exports[`renders ./components/progress/demo/circle.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -178,8 +178,8 @@ exports[`renders ./components/progress/demo/circle-dynamic.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -189,8 +189,8 @@ exports[`renders ./components/progress/demo/circle-dynamic.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="0"
@@ -279,8 +279,8 @@ exports[`renders ./components/progress/demo/circle-mini.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -290,8 +290,8 @@ exports[`renders ./components/progress/demo/circle-mini.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -320,8 +320,8 @@ exports[`renders ./components/progress/demo/circle-mini.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -331,8 +331,8 @@ exports[`renders ./components/progress/demo/circle-mini.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -378,8 +378,8 @@ exports[`renders ./components/progress/demo/circle-mini.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -389,8 +389,8 @@ exports[`renders ./components/progress/demo/circle-mini.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -440,8 +440,8 @@ exports[`renders ./components/progress/demo/dashboard.md correctly 1`] = `
       <path
         class="ant-progress-circle-trail"
         d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
         fill-opacity="0"
         stroke="#f3f3f3"
         stroke-linecap="round"
@@ -451,8 +451,8 @@ exports[`renders ./components/progress/demo/dashboard.md correctly 1`] = `
       <path
         class="ant-progress-circle-path"
         d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
         fill-opacity="0"
         stroke-linecap="round"
         stroke-width="6"
@@ -569,8 +569,8 @@ exports[`renders ./components/progress/demo/format.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -580,8 +580,8 @@ exports[`renders ./components/progress/demo/format.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -610,8 +610,8 @@ exports[`renders ./components/progress/demo/format.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -621,8 +621,8 @@ exports[`renders ./components/progress/demo/format.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
@@ -1023,8 +1023,8 @@ exports[`renders ./components/progress/demo/linecap.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="square"
@@ -1034,8 +1034,8 @@ exports[`renders ./components/progress/demo/linecap.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="square"
           stroke-width="6"
@@ -1064,8 +1064,8 @@ exports[`renders ./components/progress/demo/linecap.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="square"
@@ -1075,8 +1075,8 @@ exports[`renders ./components/progress/demo/linecap.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
           fill-opacity="0"
           stroke-linecap="square"
           stroke-width="6"
@@ -1138,8 +1138,8 @@ exports[`renders ./components/progress/demo/segment.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -1149,22 +1149,22 @@ exports[`renders ./components/progress/demo/segment.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
-          style="stroke:#87d068;stroke-dasharray:88.59291283123217px 295.3097094374406px;stroke-dashoffset:-0px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
+          style="stroke:#108ee9;stroke-dasharray:88.59291283123217px 295.3097094374406px;stroke-dashoffset:-88.59291283123217px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
         />
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
-          style="stroke:#108ee9;stroke-dasharray:88.59291283123217px 295.3097094374406px;stroke-dashoffset:-88.59291283123217px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
+          style="stroke:#87d068;stroke-dasharray:88.59291283123217px 295.3097094374406px;stroke-dashoffset:-0px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
         />
       </svg>
       <span
@@ -1189,8 +1189,8 @@ exports[`renders ./components/progress/demo/segment.md correctly 1`] = `
         <path
           class="ant-progress-circle-trail"
           d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
           fill-opacity="0"
           stroke="#f3f3f3"
           stroke-linecap="round"
@@ -1200,22 +1200,22 @@ exports[`renders ./components/progress/demo/segment.md correctly 1`] = `
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
-          style="stroke:#87d068;stroke-dasharray:66.09291283123217px 295.3097094374406px;stroke-dashoffset:-37.5px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
+          style="stroke:#108ee9;stroke-dasharray:66.09291283123217px 295.3097094374406px;stroke-dashoffset:-103.59291283123217px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
         />
         <path
           class="ant-progress-circle-path"
           d="M 50,50 m 0,47
-     a 47,47 0 1 1 0,-94
-     a 47,47 0 1 1 0,94"
+   a 47,47 0 1 1 0,-94
+   a 47,47 0 1 1 0,94"
           fill-opacity="0"
           stroke-linecap="round"
           stroke-width="6"
-          style="stroke:#108ee9;stroke-dasharray:66.09291283123217px 295.3097094374406px;stroke-dashoffset:-103.59291283123217px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
+          style="stroke:#87d068;stroke-dasharray:66.09291283123217px 295.3097094374406px;stroke-dashoffset:-37.5px;transition:stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s"
         />
       </svg>
       <span
diff --git a/components/progress/__tests__/__snapshots__/index.test.js.snap b/components/progress/__tests__/__snapshots__/index.test.js.snap
index b17c86a2cf10..620fdd1578ea 100644
--- a/components/progress/__tests__/__snapshots__/index.test.js.snap
+++ b/components/progress/__tests__/__snapshots__/index.test.js.snap
@@ -219,8 +219,8 @@ exports[`Progress render strokeColor 1`] = `
       <path
         class="ant-progress-circle-trail"
         d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
         fill-opacity="0"
         stroke="#f3f3f3"
         stroke-linecap="round"
@@ -230,8 +230,8 @@ exports[`Progress render strokeColor 1`] = `
       <path
         class="ant-progress-circle-path"
         d="M 50,50 m 0,-47
-     a 47,47 0 1 1 0,94
-     a 47,47 0 1 1 0,-94"
+   a 47,47 0 1 1 0,94
+   a 47,47 0 1 1 0,-94"
         fill-opacity="0"
         stroke-linecap="round"
         stroke-width="6"
diff --git a/components/progress/progress.tsx b/components/progress/progress.tsx
index 067ef1db1aec..7e8fee7a4583 100644
--- a/components/progress/progress.tsx
+++ b/components/progress/progress.tsx
@@ -25,7 +25,7 @@ export interface ProgressProps {
   status?: (typeof ProgressStatuses)[number];
   showInfo?: boolean;
   strokeWidth?: number;
-  strokeLinecap?: string;
+  strokeLinecap?: 'butt' | 'square' | 'round';
   strokeColor?: string | ProgressGradient;
   trailColor?: string;
   width?: number;
diff --git a/package.json b/package.json
index 6d5a0bd3dab4..c5f1822322cf 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "rc-menu": "~7.4.23",
     "rc-notification": "~3.3.1",
     "rc-pagination": "~1.20.1",
-    "rc-progress": "~2.3.0",
+    "rc-progress": "~2.4.1",
     "rc-rate": "~2.5.0",
     "rc-select": "~9.1.4",
     "rc-slider": "~8.6.11",