Skip to content

fix(Progress): prevented empty elements from rendering #8809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2023
Merged

fix(Progress): prevented empty elements from rendering #8809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 19 additions & 16 deletions packages/react-core/src/components/Progress/ProgressContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,26 @@ export const ProgressContainer: React.FunctionComponent<ProgressContainerProps>

return (
<React.Fragment>
{tooltip ? (
<Tooltip position={tooltipPosition} content={tooltip} isVisible>
{Title}
</Tooltip>
) : (
Title
{title &&
(tooltip ? (
<Tooltip position={tooltipPosition} content={tooltip} isVisible>
{Title}
</Tooltip>
) : (
Title
))}
{(measureLocation !== ProgressMeasureLocation.none || StatusIcon) && (
<div className={css(progressStyle.progressStatus)} aria-hidden="true">
{(measureLocation === ProgressMeasureLocation.top || measureLocation === ProgressMeasureLocation.outside) && (
<span className={css(progressStyle.progressMeasure)}>{label || `${value}%`}</span>
)}
{StatusIcon && (
<span className={css(progressStyle.progressStatusIcon)}>
<StatusIcon />
</span>
)}
</div>
)}
<div className={css(progressStyle.progressStatus)} aria-hidden="true">
{(measureLocation === ProgressMeasureLocation.top || measureLocation === ProgressMeasureLocation.outside) && (
<span className={css(progressStyle.progressMeasure)}>{label || `${value}%`}</span>
)}
{variantToIcon.hasOwnProperty(variant) && (
<span className={css(progressStyle.progressStatusIcon)}>
<StatusIcon />
</span>
)}
</div>
<ProgressBar role="progressbar" progressBarAriaProps={progressBarAriaProps} value={value}>
{measureLocation === ProgressMeasureLocation.inside && `${value}%`}
</ProgressBar>
Expand Down
104 changes: 0 additions & 104 deletions packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ exports[`Progress measure location inside 1`] = `
class="pf-c-progress pf-m-inside pf-m-lg pf-m-singleline"
id="inside-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="inside-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -43,11 +38,6 @@ exports[`Progress measure location inside and small should render large 1`] = `
class="pf-c-progress pf-m-inside pf-m-lg pf-m-singleline"
id="large-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="large-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -80,15 +70,6 @@ exports[`Progress measure location none 1`] = `
class="pf-c-progress pf-m-singleline"
id="none-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="none-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
/>
<div
aria-valuemax="100"
aria-valuemin="0"
Expand All @@ -115,11 +96,6 @@ exports[`Progress measure location outside 1`] = `
class="pf-c-progress pf-m-outside pf-m-singleline"
id="outside-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="outside-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -156,11 +132,6 @@ exports[`Progress measure location top 1`] = `
class="pf-c-progress pf-m-singleline"
id="top-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="top-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -197,11 +168,6 @@ exports[`Progress size lg 1`] = `
class="pf-c-progress pf-m-lg pf-m-singleline"
id="lg-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="lg-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -238,11 +204,6 @@ exports[`Progress size md 1`] = `
class="pf-c-progress pf-m-singleline"
id="md-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="md-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -279,11 +240,6 @@ exports[`Progress size sm 1`] = `
class="pf-c-progress pf-m-sm pf-m-singleline"
id="sm-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="sm-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -320,11 +276,6 @@ exports[`Progress variant danger 1`] = `
class="pf-c-progress pf-m-danger pf-m-singleline"
id="danger-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="danger-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -378,11 +329,6 @@ exports[`Progress variant success 1`] = `
class="pf-c-progress pf-m-success pf-m-singleline"
id="success-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="success-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -436,11 +382,6 @@ exports[`Progress variant warning 1`] = `
class="pf-c-progress pf-m-warning pf-m-singleline"
id="warning-progress"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="warning-progress-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -494,11 +435,6 @@ exports[`Progress with aria-valuetext 1`] = `
class="pf-c-progress pf-m-singleline"
id="progress-aria-valuetext"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="progress-aria-valuetext-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -536,11 +472,6 @@ exports[`Simple progress 1`] = `
class="pf-c-progress pf-m-singleline"
id="progress-simple-example"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="progress-simple-example-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -577,11 +508,6 @@ exports[`additional label 1`] = `
class="pf-c-progress pf-m-singleline"
id="additional-label"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="additional-label-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -618,11 +544,6 @@ exports[`no value specified 1`] = `
class="pf-c-progress pf-m-singleline"
id="no-value"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="no-value-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -659,11 +580,6 @@ exports[`value higher than maxValue 1`] = `
class="pf-c-progress pf-m-singleline"
id="higher-max-value"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="higher-max-value-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -700,11 +616,6 @@ exports[`value lower than minValue 1`] = `
class="pf-c-progress pf-m-singleline"
id="lower-min-value"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="lower-min-value-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -741,11 +652,6 @@ exports[`value scaled between minValue and maxValue 1`] = `
class="pf-c-progress pf-m-singleline"
id="scaled-range-value"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="scaled-range-value-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -782,11 +688,6 @@ exports[`value scaled with maxValue 1`] = `
class="pf-c-progress pf-m-singleline"
id="scaled-max-value"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="scaled-max-value-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down Expand Up @@ -823,11 +724,6 @@ exports[`value scaled with minValue 1`] = `
class="pf-c-progress pf-m-singleline"
id="scaled-min-value"
>
<div
aria-hidden="true"
class="pf-c-progress__description"
id="scaled-min-value-description"
/>
<div
aria-hidden="true"
class="pf-c-progress__status"
Expand Down