diff --git a/src/components/ProgressIndicator/ProgressIndicator-story.js b/src/components/ProgressIndicator/ProgressIndicator-story.js
index e928671f889b..7dd9af744c89 100644
--- a/src/components/ProgressIndicator/ProgressIndicator-story.js
+++ b/src/components/ProgressIndicator/ProgressIndicator-story.js
@@ -7,10 +7,11 @@
import React from 'react';
import { storiesOf } from '@storybook/react';
-
import { withKnobs, number } from '@storybook/addon-knobs';
import { ProgressIndicator, ProgressStep } from '../ProgressIndicator';
import ProgressIndicatorSkeleton from '../ProgressIndicator/ProgressIndicator.Skeleton';
+import Tooltip from '../Tooltip';
+import { componentsX } from '../../internal/FeatureFlags';
storiesOf('Progress Indicator', module)
.addDecorator(withKnobs)
@@ -18,26 +19,55 @@ storiesOf('Progress Indicator', module)
'Default',
() => (
+ currentIndex={number('Current progress (currentIndex)', 1)}>
(
+
+
Overflow tooltip content.
+
+ )}
/>
(
+
+
+ Lorem ipsum dolor, sit amet consectetur adipisicing elit. Animi
+ consequuntur hic ratione aliquid cupiditate, nesciunt saepe iste
+ blanditiis cumque maxime tenetur veniam est illo deserunt sint
+ quae pariatur. Laboriosam, consequatur.
+
+
+ )}
/>
),
diff --git a/src/components/ProgressIndicator/ProgressIndicator.js b/src/components/ProgressIndicator/ProgressIndicator.js
index c20e3ccfac01..acdfc4e9d02a 100644
--- a/src/components/ProgressIndicator/ProgressIndicator.js
+++ b/src/components/ProgressIndicator/ProgressIndicator.js
@@ -9,49 +9,96 @@ import PropTypes from 'prop-types';
import React, { Component } from 'react';
import classnames from 'classnames';
import { settings } from 'carbon-components';
+// TODO: import { CheckmarkOutline16 } from '@carbon/icons-react';
+import CheckmarkOutline16 from '@carbon/icons-react/lib/checkmark--outline/16';
+// TODO: import { Warning16 } from '@carbon/icons-react';
+import Warning16 from '@carbon/icons-react/lib/warning/16';
+import { componentsX } from '../../internal/FeatureFlags';
const { prefix } = settings;
-
+const defaultRenderLabel = props =>