refactor(progress): progress size #40903

kiner-tang · 2023-02-24T06:57:34Z

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language	Changelog
🇺🇸 English	refactor progress size
🇨🇳 Chinese	重构进度条尺寸逻辑

☑️ Self-Check before Merge

⚠️ Please check all items below before requesting a reviewing. ⚠️

Doc is updated/provided or not needed
Demo is updated/provided or not needed
TypeScript definition is updated/provided or not needed
Changelog is provided or not needed

github-actions · 2023-02-24T06:57:46Z

codecov · 2023-02-24T07:49:08Z

Codecov Report

Patch coverage: 100.00% and no project coverage change

Comparison is base (cd9ad44) 100.00% compared to head (fdef6e2) 100.00%.

Additional details and impacted files

@@            Coverage Diff            @@
##           feature    #40903   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          608       608           
  Lines        10340     10389   +49     
  Branches      2803      2829   +26     
=========================================
+ Hits         10340     10389   +49

Impacted Files	Coverage Δ
components/steps/index.tsx	`100.00% <ø> (ø)`
components/progress/Circle.tsx	`100.00% <100.00%> (ø)`
components/progress/Line.tsx	`100.00% <100.00%> (ø)`
components/progress/Steps.tsx	`100.00% <100.00%> (ø)`
components/progress/progress.tsx	`100.00% <100.00%> (ø)`
components/progress/utils.ts	`100.00% <100.00%> (ø)`
components/breadcrumb/Breadcrumb.tsx	`100.00% <0.00%> (ø)`
components/breadcrumb/style/index.ts	`100.00% <0.00%> (ø)`
components/breadcrumb/BreadcrumbItem.tsx	`100.00% <0.00%> (ø)`

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

components/progress/index.zh-CN.md

components/progress/index.en-US.md

components/progress/index.zh-CN.md

components/progress/index.en-US.md

Co-authored-by: lijianan <[email protected]>

components/progress/utils.ts

Co-authored-by: MadCcc <[email protected]>

components/progress/Circle.tsx

Co-authored-by: MadCcc <[email protected]>

MadCcc · 2023-02-27T09:27:48Z

components/progress/Circle.tsx

+ let { strokeWidth } = props;
+ if (strokeWidth === undefined) {
+ strokeWidth = Math.max(getMinPercent(width), 6);
+ }


这里还是放到默认值里面去吧

计算默认的strokeWidth 依赖于getSize返回的最终宽度，所以不好放在默认值

components/progress/Line.tsx

MadCcc · 2023-02-27T09:37:54Z

components/progress/Line.tsx

 return (
 <>
- <div className={`${prefixCls}-outer`}>
+ <div className={`${prefixCls}-outer`} style={outterStyle}>


这里有必要添加 style 吗，原本没有 style 是不是也 work

这个是为了设置进度条的宽度用的，目前我们的进度条只能铺盘父级容器，但既然只吃了[number,number]，感觉也可以支持一下设置宽度

components/progress/index.zh-CN.md

components/progress/utils.ts

MadCcc · 2023-02-27T09:45:52Z

理论上重构应该不影响 snapshot？

kiner-tang · 2023-02-27T10:01:23Z

理论上重构应该不影响 snapshot？

主要是在条形进度条外层增加了style用于设置宽高

MadCcc · 2023-02-28T09:28:49Z

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

@@ -2908,7 +2908,7 @@ Array [
 class="ant-steps-progress-icon"
 >
 <div
- class="ant-progress ant-progress-circle ant-progress-status-normal ant-progress-show-info ant-progress-default"


这个 class 去掉了是预期的么

是的，因为demo里面都改用了新的size的方式了，只有不传size或size为default|small才会加上这个class

* feat: progress size * feat: update snapshots * feat: update demo * feat: update demo * docs: fix lint * feat: update demo * feat: update demo * docs: update doc * feat: update snapshots * docs: update doc * docs: update doc * docs: update doc * Update components/progress/index.en-US.md Co-authored-by: lijianan <[email protected]> * Update components/progress/index.zh-CN.md Co-authored-by: lijianan <[email protected]> * feat: optimize code * feat: optimize code * feat: optimize code * feat: optimize code * feat: optimize code * Update components/progress/utils.ts Co-authored-by: MadCcc <[email protected]> * feat: optimize code * feat: optimize code * feat: optimize code * Update components/progress/Circle.tsx Co-authored-by: MadCcc <[email protected]> * feat: optimize code * feat: optimize code * docs: update doc --------- Co-authored-by: 二货机器人 <[email protected]> Co-authored-by: lijianan <[email protected]> Co-authored-by: MadCcc <[email protected]>

feat: progress size

65ae72a

kiner-tang requested a review from zombieJ February 24, 2023 06:57

kiner-tang self-assigned this Feb 24, 2023

kiner-tang marked this pull request as draft February 24, 2023 06:57

feat: update snapshots

c9933f0

kiner-tang added 2 commits February 24, 2023 16:30

feat: update demo

9d1fc9e

feat: update demo

133ea7c

kiner-tang marked this pull request as ready for review February 24, 2023 09:05

zombieJ and others added 3 commits February 24, 2023 17:24

docs: fix lint

f70c047

feat: update demo

c40c963

feat: update demo

025bd13

kiner-tang requested review from afc163, li-jia-nan and MadCcc February 24, 2023 12:08

docs: update doc

8c8509b

li-jia-nan reviewed Feb 24, 2023

View reviewed changes

components/progress/index.zh-CN.md Outdated Show resolved Hide resolved

feat: update snapshots

21b208b

li-jia-nan reviewed Feb 24, 2023

View reviewed changes

components/progress/index.en-US.md Show resolved Hide resolved

kiner-tang added 2 commits February 24, 2023 22:46

docs: update doc

9762ad7

docs: update doc

5ec4a00

li-jia-nan reviewed Feb 24, 2023

View reviewed changes

components/progress/index.zh-CN.md Outdated Show resolved Hide resolved

li-jia-nan reviewed Feb 24, 2023

View reviewed changes

components/progress/index.en-US.md Outdated Show resolved Hide resolved

kiner-tang and others added 3 commits February 24, 2023 22:48

docs: update doc

d8893ed

Update components/progress/index.en-US.md

08444b0

Co-authored-by: lijianan <[email protected]>

Update components/progress/index.zh-CN.md

f8a91cc

Co-authored-by: lijianan <[email protected]>

kiner-tang requested a review from li-jia-nan February 25, 2023 01:43

kiner-tang added 2 commits February 25, 2023 20:41

feat: optimize code

fd1c2f5

feat: optimize code

b661b09

kiner-tang added 3 commits February 25, 2023 20:58

feat: optimize code

8726953

feat: optimize code

ad86d28

feat: optimize code

796c472

MadCcc reviewed Feb 27, 2023

View reviewed changes

components/progress/utils.ts Show resolved Hide resolved

kiner-tang and others added 2 commits February 27, 2023 10:58

Update components/progress/utils.ts

4db744a

Co-authored-by: MadCcc <[email protected]>

feat: optimize code

a7a597c

kiner-tang requested a review from MadCcc February 27, 2023 03:55

kiner-tang added 2 commits February 27, 2023 14:25

feat: optimize code

2c6d274

feat: optimize code

f2e0d80

MadCcc reviewed Feb 27, 2023

View reviewed changes

components/progress/Circle.tsx Outdated Show resolved Hide resolved

kiner-tang and others added 2 commits February 27, 2023 17:33

Update components/progress/Circle.tsx

ff0297a

Co-authored-by: MadCcc <[email protected]>

feat: optimize code

32075ef

MadCcc reviewed Feb 27, 2023

View reviewed changes

feat: optimize code

dcf545d

kiner-tang requested a review from MadCcc February 27, 2023 11:11

MadCcc reviewed Feb 28, 2023

View reviewed changes

docs: update doc

fdef6e2

kiner-tang requested a review from MadCcc March 1, 2023 01:36

MadCcc approved these changes Mar 1, 2023

View reviewed changes

MadCcc merged commit da3babb into ant-design:feature Mar 1, 2023

MadCcc mentioned this pull request Mar 5, 2023

docs: changelog 5.3.0 #41068

Merged

20 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(progress): progress size #40903

refactor(progress): progress size #40903

kiner-tang commented Feb 24, 2023 •

edited

Loading

github-actions bot commented Feb 24, 2023 •

edited

Loading

codecov bot commented Feb 24, 2023 •

edited

Loading

MadCcc Feb 27, 2023

kiner-tang Feb 27, 2023

MadCcc Feb 27, 2023

kiner-tang Feb 27, 2023

MadCcc commented Feb 27, 2023

kiner-tang commented Feb 27, 2023

MadCcc Feb 28, 2023

kiner-tang Feb 28, 2023 •

edited

Loading

refactor(progress): progress size #40903

refactor(progress): progress size #40903

Conversation

kiner-tang commented Feb 24, 2023 • edited Loading

🤔 This is a ...

🔗 Related issue link

💡 Background and solution

📝 Changelog

☑️ Self-Check before Merge

github-actions bot commented Feb 24, 2023 • edited Loading

codecov bot commented Feb 24, 2023 • edited Loading

Codecov Report

MadCcc Feb 27, 2023

Choose a reason for hiding this comment

kiner-tang Feb 27, 2023

Choose a reason for hiding this comment

MadCcc Feb 27, 2023

Choose a reason for hiding this comment

kiner-tang Feb 27, 2023

Choose a reason for hiding this comment

MadCcc commented Feb 27, 2023

kiner-tang commented Feb 27, 2023

MadCcc Feb 28, 2023

Choose a reason for hiding this comment

kiner-tang Feb 28, 2023 • edited Loading

Choose a reason for hiding this comment

kiner-tang commented Feb 24, 2023 •

edited

Loading

github-actions bot commented Feb 24, 2023 •

edited

Loading

codecov bot commented Feb 24, 2023 •

edited

Loading

kiner-tang Feb 28, 2023 •

edited

Loading