Skip to content

Commit bb89c17

Browse files
author
vikasrohit
committed
Merge pull request #77 from amolskh/ProgressBarComponent
Final Fixes - Progress Bar Component
2 parents a22929d + dd25b98 commit bb89c17

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

components/ProgressBar/ProgressBar.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,10 @@ const ProgressBar = ({completionPercentage, checkPoints}) => {
5050
<div className="completion-line" style={getLengthScaledStyle(completionPercentage)}>
5151
</div>
5252
<div className="progress-circles">
53-
<div className="circle"/>
5453
{checkPoints.map((checkPoint, index) => {
55-
return <div className={checkPointStyle(checkPoint.completionPercentage)} style={getCheckPointPositionStyle(checkPoint.completionPercentage)} key={index}/>
54+
if(!checkPoint.hideCircle) {
55+
return <div className={checkPointStyle(checkPoint.completionPercentage)} style={getCheckPointPositionStyle(checkPoint.completionPercentage)} key={index}/>
56+
}
5657
})}
5758
</div>
5859
</div>

components/ProgressBar/ProgressBarExample.jsx

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,33 @@ const progressBarData = {
2929
]
3030
}
3131

32+
const progressBarData2 = {
33+
completionPercentage : '56',
34+
checkPoints : [
35+
{
36+
name : 'Checkpoint1',
37+
timeline : 'Mar 23, 12:45',
38+
completionPercentage : '0',
39+
hideCircle: true
40+
},
41+
{
42+
name : 'Review',
43+
timeline : '',
44+
completionPercentage : '100',
45+
hideCircle: true
46+
}
47+
]
48+
}
49+
3250
const ProgressBarExample = () => (
3351
<div>
3452
<div className="divStyle">
3553
<ProgressBar completionPercentage={progressBarData.completionPercentage} checkPoints={progressBarData.checkPoints}/>
3654
</div>
55+
<br/>
56+
<div className="divStyle">
57+
<ProgressBar completionPercentage={progressBarData2.completionPercentage} checkPoints={progressBarData2.checkPoints}/>
58+
</div>
3759
</div>
3860
)
3961

0 commit comments

Comments
 (0)