diff --git a/docs/lib/Components/ProgressPage.js b/docs/lib/Components/ProgressPage.js index b60d1a8db..40e70d196 100644 --- a/docs/lib/Components/ProgressPage.js +++ b/docs/lib/Components/ProgressPage.js @@ -43,6 +43,10 @@ export default class ProgressPage extends React.Component { PropTypes.string, PropTypes.number, ]), + min: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number, + ]), max: PropTypes.oneOf([ PropTypes.string, PropTypes.number, @@ -51,7 +55,9 @@ export default class ProgressPage extends React.Component { striped: PropTypes.bool, color: PropTypes.string, className: PropTypes.string, - barClassName: PropTypes.string // used to add class to the inner progress-bar element + barClassName: PropTypes.string, // used to add class to the inner progress-bar element + barAriaValueText: PropTypes.string, + barAriaLabelledBy: PropTypes.string, }; Progress.defaultProps = { diff --git a/src/Progress.js b/src/Progress.js index 098393232..73dbcdef4 100644 --- a/src/Progress.js +++ b/src/Progress.js @@ -12,6 +12,10 @@ const propTypes = { PropTypes.string, PropTypes.number, ]), + min: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number, + ]), max: PropTypes.oneOfType([ PropTypes.string, PropTypes.number, @@ -23,11 +27,14 @@ const propTypes = { barClassName: PropTypes.string, cssModule: PropTypes.object, style: PropTypes.object, + barAriaValueText: PropTypes.string, + barAriaLabelledBy: PropTypes.string, }; const defaultProps = { tag: 'div', value: 0, + min: 0, max: 100, style: {}, }; @@ -39,6 +46,7 @@ const Progress = (props) => { barClassName, cssModule, value, + min, max, animated, striped, @@ -47,6 +55,8 @@ const Progress = (props) => { multi, tag: Tag, style, + barAriaValueText, + barAriaLabelledBy, ...attributes } = props; @@ -74,8 +84,10 @@ const Progress = (props) => { }} role="progressbar" aria-valuenow={value} - aria-valuemin="0" + aria-valuemin={min} aria-valuemax={max} + aria-valuetext={barAriaValueText} + aria-labelledby={barAriaLabelledBy} children={children} /> );