From e3f7edc8d6d20ccde7aa5f057f2059db8afd84b0 Mon Sep 17 00:00:00 2001
From: Jan Hassel <jan.hassel@ibm.com>
Date: Tue, 15 Mar 2022 18:12:08 +0100
Subject: [PATCH] feat(progress-bar): add alignment variants (#10769)

Co-authored-by: Abbey Hart <abbeyhrt@gmail.com>
Co-authored-by: Taylor Jones <tay1orjones@users.noreply.github.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 .../progress-bar/_progress-bar.scss           | 21 +++++++++++++++++++
 .../__snapshots__/PublicAPI-test.js.snap      | 10 +++++++++
 .../ProgressBar/ProgressBar-story.js          |  7 +++++++
 .../src/components/ProgressBar/ProgressBar.js |  7 +++++++
 .../progress-bar/_progress-bar.scss           | 21 +++++++++++++++++++
 5 files changed, 66 insertions(+)

diff --git a/packages/components/src/components/progress-bar/_progress-bar.scss b/packages/components/src/components/progress-bar/_progress-bar.scss
index cb7872e10f0a..0b3f53aa9bf5 100644
--- a/packages/components/src/components/progress-bar/_progress-bar.scss
+++ b/packages/components/src/components/progress-bar/_progress-bar.scss
@@ -84,6 +84,27 @@
       background-position-x: -105%;
     }
   }
+
+  .#{$prefix}--progress-bar--inline {
+    display: flex;
+    align-items: center;
+  }
+
+  .#{$prefix}--progress-bar--inline .#{$prefix}--progress-bar__label {
+    flex-shrink: 0;
+    margin-right: $spacing-05;
+    margin-bottom: 0;
+  }
+
+  .#{$prefix}--progress-bar--inline .#{$prefix}--progress-bar__helper-text {
+    @include hidden;
+  }
+
+  .#{$prefix}--progress-bar--indented .#{$prefix}--progress-bar__label,
+  .#{$prefix}--progress-bar--indented .#{$prefix}--progress-bar__helper-text {
+    padding-right: $spacing-05;
+    padding-left: $spacing-05;
+  }
 }
 
 @include exports('progress-bar') {
diff --git a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
index 19f6c2a50818..c1a99c4d6b5a 100644
--- a/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
+++ b/packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
@@ -8718,6 +8718,16 @@ Map {
         ],
         "type": "oneOf",
       },
+      "type": Object {
+        "args": Array [
+          Array [
+            "default",
+            "inline",
+            "indented",
+          ],
+        ],
+        "type": "oneOf",
+      },
       "value": Object {
         "type": "number",
       },
diff --git a/packages/react/src/components/ProgressBar/ProgressBar-story.js b/packages/react/src/components/ProgressBar/ProgressBar-story.js
index 7a4660dcd7f3..0cbdd979a451 100644
--- a/packages/react/src/components/ProgressBar/ProgressBar-story.js
+++ b/packages/react/src/components/ProgressBar/ProgressBar-story.js
@@ -21,12 +21,19 @@ const sizes = {
   'Big (big) - default': 'big',
 };
 
+const types = {
+  'Default  (default)': 'default',
+  'Inline (inline)': 'inline',
+  'indented (indented)': 'indented',
+};
+
 const props = () => ({
   helperText: text('Helper text (helperText)', 'Optional helper text'),
   hideLabel: boolean('Hide the label (hideLabel)', false),
   label: text('Label text (label)', 'Progress bar label'),
   max: number('Maximum value (max)', 100),
   size: select('Size (size)', sizes, 'big'),
+  type: select('Type (type)', types, 'default'),
   value: number('Current value (value)', 75),
 });
 
diff --git a/packages/react/src/components/ProgressBar/ProgressBar.js b/packages/react/src/components/ProgressBar/ProgressBar.js
index c607be4d2f00..06ffc2aa2dc2 100644
--- a/packages/react/src/components/ProgressBar/ProgressBar.js
+++ b/packages/react/src/components/ProgressBar/ProgressBar.js
@@ -20,6 +20,7 @@ function ProgressBar({
   label,
   max = 100,
   size = 'big',
+  type = 'default',
   value,
 }) {
   const labelId = useId('progress-bar');
@@ -40,6 +41,7 @@ function ProgressBar({
   const wrapperClasses = classNames(
     `${prefix}--progress-bar`,
     `${prefix}--progress-bar--${size}`,
+    `${prefix}--progress-bar--${type}`,
     {
       [`${prefix}--progress-bar--indeterminate`]: indeterminate,
     },
@@ -108,6 +110,11 @@ ProgressBar.propTypes = {
    */
   size: PropTypes.oneOf(['small', 'big']),
 
+  /**
+   * Defines the alignment variant of the progress bar.
+   */
+  type: PropTypes.oneOf(['default', 'inline', 'indented']),
+
   /**
    * The current value.
    */
diff --git a/packages/styles/scss/components/progress-bar/_progress-bar.scss b/packages/styles/scss/components/progress-bar/_progress-bar.scss
index 7fad69aec517..fcb776109007 100644
--- a/packages/styles/scss/components/progress-bar/_progress-bar.scss
+++ b/packages/styles/scss/components/progress-bar/_progress-bar.scss
@@ -11,6 +11,7 @@
 @use '../../theme' as *;
 @use '../../type' as *;
 @use '../../utilities/convert' as *;
+@use '../../utilities/visually-hidden' as *;
 
 /// Progress Bar styles
 /// @access public
@@ -87,4 +88,24 @@
       background-position-x: -105%;
     }
   }
+
+  .#{$prefix}--progress-bar--inline {
+    display: flex;
+    align-items: center;
+  }
+
+  .#{$prefix}--progress-bar--inline .#{$prefix}--progress-bar__label {
+    flex-shrink: 0;
+    margin-bottom: 0;
+    margin-inline-end: $spacing-05;
+  }
+
+  .#{$prefix}--progress-bar--inline .#{$prefix}--progress-bar__helper-text {
+    @include visually-hidden;
+  }
+
+  .#{$prefix}--progress-bar--indented .#{$prefix}--progress-bar__label,
+  .#{$prefix}--progress-bar--indented .#{$prefix}--progress-bar__helper-text {
+    padding-inline: $spacing-05;
+  }
 }