Skip to content

Commit a0d9372

Browse files
tangjinzhoutangjinzhou
committed
refactor: progress
1 parent 05c0d2e commit a0d9372

File tree

16 files changed

+133
-136
lines changed

16 files changed

+133
-136
lines changed

‎components/_util/hooks/useRef.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import type { Ref } from 'vue';
22
import { onBeforeUpdate, ref } from 'vue';
33

44
export type UseRef = [(el: any, key: string | number) => void, Ref<any>];
5-
5+
export type Refs = Record<string | number, any>;
66
export const useRef = (): UseRef => {
7-
const refs = ref<any>({});
7+
const refs = ref<Refs>({});
88
const setRef = (el: any, key: string | number) => {
99
refs.value[key] = el;
1010
};
@@ -13,3 +13,5 @@ export const useRef = (): UseRef => {
1313
});
1414
return [setRef, refs];
1515
};
16+
17+
export default useRef;

‎components/progress/Circle.tsx

+7-40
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { CSSProperties, ExtractPropTypes } from 'vue';
22
import { computed, defineComponent } from 'vue';
3+
import { presetPrimaryColors } from '@ant-design/colors';
34
import { Circle as VCCircle } from '../vc-progress';
45
import { getSuccessPercent, validProgress } from './utils';
56
import { progressProps } from './props';
@@ -12,39 +13,9 @@ const circleProps = {
1213
};
1314
export type CircleProps = Partial<ExtractPropTypes<typeof circleProps>>;
1415

15-
const statusColorMap = {
16-
normal: '#108ee9',
17-
exception: '#ff5500',
18-
success: '#87d068',
19-
};
20-
21-
function getPercentage(
22-
percent: CircleProps['percent'],
23-
success: CircleProps['success'],
24-
successPercent: CircleProps['successPercent'],
25-
) {
26-
const ptg = validProgress(percent);
27-
const realSuccessPercent = getSuccessPercent(success, successPercent);
28-
if (!realSuccessPercent) {
29-
return ptg;
30-
}
31-
return [
32-
validProgress(realSuccessPercent),
33-
validProgress(ptg - validProgress(realSuccessPercent)),
34-
];
35-
}
36-
37-
function getStrokeColor(
38-
success: CircleProps['success'],
39-
strokeColor: CircleProps['strokeColor'],
40-
successPercent: CircleProps['successPercent'],
41-
) {
42-
const color = strokeColor || null;
43-
const realSuccessPercent = getSuccessPercent(success, successPercent);
44-
if (!realSuccessPercent) {
45-
return color;
46-
}
47-
return [statusColorMap.success, color];
16+
function getPercentage({ percent, success, successPercent }: CircleProps) {
17+
const realSuccessPercent = validProgress(getSuccessPercent({ success, successPercent }));
18+
return [realSuccessPercent, validProgress(validProgress(percent) - realSuccessPercent)];
4819
}
4920

5021
export default defineComponent({
@@ -77,14 +48,10 @@ export default defineComponent({
7748
);
7849

7950
// using className to style stroke color
80-
const strokeColor = computed(() =>
81-
getStrokeColor(props.success, props.strokeColor, props.successPercent),
82-
);
83-
const percent = computed(() =>
84-
getPercentage(props.percent, props.success, props.successPercent),
85-
);
51+
const strokeColor = computed(() => [presetPrimaryColors.green, props.strokeColor || null]);
52+
const percent = computed(() => getPercentage(props));
8653
const isGradient = computed(
87-
() => Object.prototype.toString.call(strokeColor.value) === '[object Object]',
54+
() => Object.prototype.toString.call(props.strokeColor) === '[object Object]',
8855
);
8956

9057
const wrapperClassName = computed(() => ({

‎components/progress/Line.tsx

+5-8
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ export const handleGradient = (strokeColor: ProgressGradient, directionConfig: D
6969

7070
export default defineComponent({
7171
props: lineProps,
72+
name: 'Line',
7273
setup(props, { slots }) {
7374
const backgroundProps = computed(() => {
7475
const { strokeColor, direction } = props;
@@ -98,7 +99,7 @@ export default defineComponent({
9899
});
99100

100101
const successPercent = computed(() => {
101-
return getSuccessPercent(props.success, props.successPercent);
102+
return getSuccessPercent(props);
102103
});
103104
const successPercentStyle = computed<CSSProperties>(() => {
104105
const { strokeWidth, size, strokeLinecap, success } = props;
@@ -110,18 +111,14 @@ export default defineComponent({
110111
};
111112
});
112113

113-
const successSegment = computed(() =>
114-
successPercent.value !== undefined ? (
115-
<div class={`${props.prefixCls}-success-bg`} style={successPercentStyle.value} />
116-
) : null,
117-
);
118-
119114
return () => (
120115
<>
121116
<div class={`${props.prefixCls}-outer`}>
122117
<div class={`${props.prefixCls}-inner`} style={trailStyle.value}>
123118
<div class={`${props.prefixCls}-bg`} style={percentStyle.value} />
124-
{successSegment.value}
119+
{successPercent.value !== undefined ? (
120+
<div class={`${props.prefixCls}-success-bg`} style={successPercentStyle.value} />
121+
) : null}
125122
</div>
126123
</div>
127124
{slots.default?.()}

‎components/progress/__tests__/__snapshots__/index.test.js.snap

+12
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ exports[`Progress render dashboard 295 gapDegree 1`] = `
1010
<path d="M 50,50 m 0,47
1111
a 47,47 0 1 1 0,-94
1212
a 47,47 0 1 1 0,94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -147.5px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
13+
<path d="M 50,50 m 0,47
14+
a 47,47 0 1 1 0,-94
15+
a 47,47 0 1 1 0,94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke: #52C41A; stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -147.5px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
1316
</svg><span class="ant-progress-text" title="0%">0%</span></div>
1417
</div>
1518
`;
@@ -24,6 +27,9 @@ exports[`Progress render dashboard 296 gapDegree 1`] = `
2427
<path d="M 50,50 m 0,47
2528
a 47,47 0 1 1 0,-94
2629
a 47,47 0 1 1 0,94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -148px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
30+
<path d="M 50,50 m 0,47
31+
a 47,47 0 1 1 0,-94
32+
a 47,47 0 1 1 0,94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke: #52C41A; stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -148px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
2733
</svg><span class="ant-progress-text" title="0%">0%</span></div>
2834
</div>
2935
`;
@@ -38,6 +44,9 @@ exports[`Progress render dashboard zero gapDegree 1`] = `
3844
<path d="M 50,50 m 0,47
3945
a 47,47 0 1 1 0,-94
4046
a 47,47 0 1 1 0,94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -0px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
47+
<path d="M 50,50 m 0,47
48+
a 47,47 0 1 1 0,-94
49+
a 47,47 0 1 1 0,94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke: #52C41A; stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -0px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
4150
</svg><span class="ant-progress-text" title="0%">0%</span></div>
4251
</div>
4352
`;
@@ -118,6 +127,9 @@ exports[`Progress render strokeColor 1`] = `
118127
<path d="M 50,50 m 0,-47
119128
a 47,47 0 1 1 0,94
120129
a 47,47 0 1 1 0,-94" stroke="" stroke-linecap="round" stroke-width="6" opacity="1" fill-opacity="0" class="ant-progress-circle-path" style="stroke: red; stroke-dasharray: 147.6548547187203px 295.3097094374406px; stroke-dashoffset: -0px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
130+
<path d="M 50,50 m 0,-47
131+
a 47,47 0 1 1 0,94
132+
a 47,47 0 1 1 0,-94" stroke="" stroke-linecap="round" stroke-width="6" opacity="0" fill-opacity="0" class="ant-progress-circle-path" style="stroke: #52C41A; stroke-dasharray: 0px 295.3097094374406px; stroke-dashoffset: -0px; transition: stroke-dashoffset .3s ease 0s, stroke-dasharray .3s ease 0s, stroke .3s, stroke-width .06s ease .3s, opacity .3s ease 0s;"></path>
121133
</svg><span class="ant-progress-text" title="50%">50%</span></div>
122134
</div>
123135
`;

‎components/progress/__tests__/index.test.js

+12-12
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('Progress', () => {
8282
const wrapper = mount(Progress, {
8383
props: {
8484
percent: 50,
85-
successPercent: 10,
85+
success: { percent: 10 },
8686
format: (percent, successPercent) => `${percent} ${successPercent}`,
8787
},
8888
sync: false,
@@ -213,17 +213,17 @@ describe('Progress', () => {
213213
expect(wrapper.findAll('.ant-progress-status-success')).toHaveLength(1);
214214
});
215215

216-
// https://github.com/ant-design/ant-design/pull/15951#discussion_r273062969
217-
it('should show success status when status is invalid', () => {
218-
const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
219-
const wrapper = mount({
220-
render() {
221-
return <Progress percent={100} status="invalid" />;
222-
},
223-
});
224-
expect(wrapper.findAll('.ant-progress-status-success')).toHaveLength(1);
225-
errorSpy.mockRestore();
226-
});
216+
// // https://github.com/ant-design/ant-design/pull/15951#discussion_r273062969
217+
// it('should show success status when status is invalid', () => {
218+
// const errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {});
219+
// const wrapper = mount({
220+
// render() {
221+
// return <Progress percent={100} status="invalid" />;
222+
// },
223+
// });
224+
// expect(wrapper.findAll('.ant-progress-status-success')).toHaveLength(1);
225+
// errorSpy.mockRestore();
226+
// });
227227

228228
it('should support steps', () => {
229229
const wrapper = mount({

‎components/progress/progress.tsx

+21-24
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import Steps from './Steps';
1111
import { getSuccessPercent, validProgress } from './utils';
1212
import useConfigInject from '../_util/hooks/useConfigInject';
1313
import devWarning from '../vc-util/devWarning';
14-
import type { ProgressStatusesType } from './props';
1514
import { progressProps, progressStatuses } from './props';
1615

1716
export default defineComponent({
@@ -26,9 +25,14 @@ export default defineComponent({
2625
gapDegree: 0,
2726
strokeLinecap: 'round',
2827
}),
28+
slots: ['format'],
2929
setup(props, { slots }) {
3030
const { prefixCls, direction } = useConfigInject('progress', props);
31-
31+
devWarning(
32+
props.successPercent == undefined,
33+
'Progress',
34+
'`successPercent` is deprecated. Please use `success.percent` instead.',
35+
);
3236
const classString = computed(() => {
3337
const { type, showInfo, size } = props;
3438
const pre = prefixCls.value;
@@ -41,59 +45,52 @@ export default defineComponent({
4145
};
4246
});
4347

44-
const getPercentNumber = () => {
48+
const percentNumber = computed(() => {
4549
const { percent = 0 } = props;
46-
const successPercent = getSuccessPercent(props.success, props.successPercent);
50+
const successPercent = getSuccessPercent(props);
4751
return parseInt(
4852
successPercent !== undefined ? successPercent.toString() : percent.toString(),
4953
10,
5054
);
51-
};
55+
});
5256

53-
const getProgressStatus = () => {
57+
const progressStatus = computed(() => {
5458
const { status } = props;
55-
if (progressStatuses.indexOf(status) < 0 && getPercentNumber() >= 100) {
59+
if (progressStatuses.indexOf(status) < 0 && percentNumber.value >= 100) {
5660
return 'success';
5761
}
5862
return status || 'normal';
59-
};
63+
});
6064

61-
const renderProcessInfo = (prefixCls: string, progressStatus: ProgressStatusesType) => {
65+
const renderProcessInfo = () => {
6266
const { showInfo, format, type, percent } = props;
63-
const successPercent = getSuccessPercent(props.success, props.successPercent);
67+
const successPercent = getSuccessPercent(props);
6468
if (!showInfo) return null;
6569

6670
let text: VNodeChild;
67-
const textFormatter = format || slots?.format || (percentNumber => `${percentNumber}%`);
71+
const textFormatter = format || slots?.format || ((val: number) => `${val}%`);
6872
const isLineType = type === 'line';
6973
if (
7074
format ||
7175
slots?.format ||
72-
(progressStatus !== 'exception' && progressStatus !== 'success')
76+
(progressStatus.value !== 'exception' && progressStatus.value !== 'success')
7377
) {
7478
text = textFormatter(validProgress(percent), validProgress(successPercent));
75-
} else if (progressStatus === 'exception') {
79+
} else if (progressStatus.value === 'exception') {
7680
text = isLineType ? <CloseCircleFilled /> : <CloseOutlined />;
77-
} else if (progressStatus === 'success') {
81+
} else if (progressStatus.value === 'success') {
7882
text = isLineType ? <CheckCircleFilled /> : <CheckOutlined />;
7983
}
8084
return (
81-
<span class={`${prefixCls}-text`} title={typeof text === 'string' ? text : undefined}>
85+
<span class={`${prefixCls.value}-text`} title={typeof text === 'string' ? text : undefined}>
8286
{text}
8387
</span>
8488
);
8589
};
8690

8791
return () => {
8892
const { type, steps, strokeColor } = props;
89-
const progressStatus = getProgressStatus();
90-
const progressInfo = renderProcessInfo(prefixCls.value, progressStatus);
91-
92-
devWarning(
93-
props.successPercent == undefined,
94-
'Progress',
95-
'`successPercent` is deprecated. Please use `success.percent` instead.',
96-
);
93+
const progressInfo = renderProcessInfo();
9794

9895
let progress: VNodeChild;
9996
// Render progress shape
@@ -122,7 +119,7 @@ export default defineComponent({
122119

123120
const classNames = {
124121
...classString.value,
125-
[`${prefixCls.value}-status-${progressStatus}`]: true,
122+
[`${prefixCls.value}-status-${progressStatus.value}`]: true,
126123
};
127124

128125
return <div class={classNames}>{progress}</div>;

‎components/progress/props.ts

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ export type ProgressGradient = { direction?: string } & (StringGradients | FromT
1414

1515
export interface SuccessProps {
1616
percent?: number;
17-
/** @deprecated Use `percent` instead */
18-
progress?: number;
1917
strokeColor?: string;
2018
}
2119

‎components/progress/style/index.less

+3-3
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@
189189

190190
@keyframes ~"@{ant-prefix}-progress-active" {
191191
0% {
192-
width: 0;
192+
transform: translateX(-100%) scaleX(0);
193193
opacity: 0.1;
194194
}
195195
20% {
196-
width: 0;
196+
transform: translateX(-100%) scaleX(0);
197197
opacity: 0.5;
198198
}
199199
100% {
200-
width: 100%;
200+
transform: translateX(0) scaleX(1);
201201
opacity: 0;
202202
}
203203
}

‎components/progress/style/index.ts renamed to ‎components/progress/style/index.tsx

File renamed without changes.

‎components/progress/utils.ts

+10-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import devWarning from '../vc-util/devWarning';
2-
import type { ProgressProps } from './props';
32

43
export function validProgress(progress: number | undefined) {
54
if (!progress || progress < 0) {
@@ -11,10 +10,16 @@ export function validProgress(progress: number | undefined) {
1110
return progress;
1211
}
1312

14-
export function getSuccessPercent(
15-
success?: ProgressProps['success'],
16-
successPercent?: ProgressProps['successPercent'],
17-
) {
13+
export function getSuccessPercent({
14+
success,
15+
successPercent,
16+
}: {
17+
success?: {
18+
progress?: number;
19+
percent?: number;
20+
};
21+
successPercent?: number;
22+
}) {
1823
let percent = successPercent;
1924
/** @deprecated Use `percent` instead */
2025
if (success && 'progress' in success) {

‎components/vc-progress/index.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// based on rc-progress 2.5.2
1+
// based on rc-progress 3.1.4
22
import Progress, { Line, Circle } from './src';
33

4-
export { Line, Circle };
4+
import type { ProgressProps } from './src';
5+
export { Line, Circle, ProgressProps };
56

67
export default Progress;

0 commit comments

Comments
 (0)