From 62de172654548aadc89803531af7cdf4ec364978 Mon Sep 17 00:00:00 2001
From: Eric Olkowski <thatblindgeye@gmail.com>
Date: Tue, 14 Mar 2023 14:08:17 -0400
Subject: [PATCH] fix(Progress): prevented empty elements from rendering

---
 .../components/Progress/ProgressContainer.tsx |  35 +++---
 .../__snapshots__/Progress.test.tsx.snap      | 104 ------------------
 2 files changed, 19 insertions(+), 120 deletions(-)

diff --git a/packages/react-core/src/components/Progress/ProgressContainer.tsx b/packages/react-core/src/components/Progress/ProgressContainer.tsx
index 6619af04975..d6e97243c11 100644
--- a/packages/react-core/src/components/Progress/ProgressContainer.tsx
+++ b/packages/react-core/src/components/Progress/ProgressContainer.tsx
@@ -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>
diff --git a/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap b/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
index 654869041da..dd175635562 100644
--- a/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
+++ b/packages/react-core/src/components/Progress/__tests__/__snapshots__/Progress.test.tsx.snap
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"