Progress indicator: Remove activeStep from docs

Author: interactivellama

components/progress-indicator/index.jsx

@@ -24,15 +24,13 @@ const propTypes = {
 	/**
 	 * **Assistive text for accessibility**
 	 * This object is merged with the default props object on every render.
-	 * * `activeStep`: Label for the active step. The default is `Active Step`
 	 * * `completedStep`: Label for a completed step. The default is `Completed Step`
 	 * * `disabledStep`: Label for disabled step. The default is `Disabled Step`
 	 * * `errorStep`: Label for a step with an error. The default is `Error Step`
 	 * * `percentage`: Label for Progress Bar. The default is `Progress: [this.props.value]%`. You will need to calculate the percentage yourself if changing this string.
 	 * * `step`: Label for a step. It will be typically followed by the number of the step such as "Step 1".
 	 */
 	assistiveText: PropTypes.shape({
-		activeStep: PropTypes.string,
 		completedStep: PropTypes.string,
 		disabledStep: PropTypes.string,
 		percentage: PropTypes.string,
@@ -177,9 +175,10 @@ class ProgressIndicator extends React.Component {
 
 	render () {
 		// Merge objects of strings with their default object
-		const assistiveText = this.props
-			? { ...defaultProps.assistiveText, ...this.props.assistiveText }
-			: defaultProps.assistiveText;
+		const assistiveText = {
+			...defaultProps.assistiveText,
+			...this.props.assistiveText,
+		};
 
 		const {
 			selectedStep,

components/progress-indicator/private/step.jsx

@@ -132,7 +132,7 @@ class Step extends React.Component {
 					{this.props.step.assistiveText ||
 						`${props.assistiveText.step} ${props.index + 1}: ${
 							props.step.label
-						} ${status}`}
+						} - ${status}`}
 				</span>
 			</a>
 		) : (
@@ -166,11 +166,11 @@ class Step extends React.Component {
 		const renderIcon = this.props.isCompleted || this.props.isError;
 		let status = '';
 		if (this.props.isError) {
-			status = `- ${this.props.assistiveText.errorStep}`;
+			status = this.props.assistiveText.errorStep;
 		} else if (this.props.isCompleted) {
-			status = `- ${this.props.assistiveText.completedStep}`;
+			status = this.props.assistiveText.completedStep;
 		} else if (this.props.isDisabled) {
-			status = `- ${this.props.assistiveText.disabledStep}`;
+			status = this.props.assistiveText.disabledStep;
 		}
 
 		const tooltipProps = {