Skip to content

Commit

Permalink
fix(Progress): update Progress bar to reflect proper demo behavior in…
Browse files Browse the repository at this point in the history
… core

Changed logic to always show status icon if present regardless if label/value should be displayed.
This matches behavior in pf-next.
  • Loading branch information
kmcfaul committed Nov 26, 2018
1 parent b7d0217 commit ff7760e
Showing 1 changed file with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,11 @@ const ProgressContainer = ({ value, title, parentId, label, variant, measureLoca
{(measureLocation === ProgressMeasureLocation.top || measureLocation === ProgressMeasureLocation.outside) && (
<span className={css(progressStyle.progressMeasure)}>{label || `${value}%`}</span>
)}
{measureLocation !== ProgressMeasureLocation.none &&
variantToIcon.hasOwnProperty(variant) && (
<span className={css(progressStyle.progressStatusIcon)}>
<StatusIcon />
</span>
)}
{variantToIcon.hasOwnProperty(variant) && (
<span className={css(progressStyle.progressStatusIcon)}>
<StatusIcon />
</span>
)}
</div>
<ProgressBar value={value}>{measureLocation === ProgressMeasureLocation.inside && `${value}%`}</ProgressBar>
</Fragment>
Expand Down

0 comments on commit ff7760e

Please sign in to comment.