Skip to content

Commit c6a790c

Browse files
authored
fix(Progress): Fix parent element props being spread to children (reactstrap#1970)
1 parent 1bcb50f commit c6a790c

1 file changed

Lines changed: 23 additions & 19 deletions

File tree

src/Progress.js

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,30 +75,34 @@ const Progress = (props) => {
7575
striped || animated ? 'progress-bar-striped' : null
7676
), cssModule);
7777

78-
const ProgressBar = multi ? children : (
79-
<div
80-
{...attributes}
81-
className={progressBarClasses}
82-
style={{
83-
...style,
84-
width: `${percent}%`,
85-
}}
86-
role="progressbar"
87-
aria-valuenow={value}
88-
aria-valuemin={min}
89-
aria-valuemax={max}
90-
aria-valuetext={barAriaValueText}
91-
aria-labelledby={barAriaLabelledBy}
92-
children={children}
93-
/>
94-
);
78+
const progressBarProps = {
79+
className: progressBarClasses,
80+
style: {
81+
...style,
82+
width: `${percent}%`,
83+
},
84+
role: 'progressbar',
85+
'aria-valuenow': value,
86+
'aria-valuemin': min,
87+
'aria-valuemax': max,
88+
'aria-valuetext': barAriaValueText,
89+
'aria-labelledby': barAriaLabelledBy,
90+
children: children
91+
};
9592

9693
if (bar) {
97-
return ProgressBar;
94+
return (
95+
<Tag
96+
{...attributes}
97+
{...progressBarProps}
98+
/>
99+
);
98100
}
99101

100102
return (
101-
<Tag {...attributes} className={progressClasses} children={ProgressBar} />
103+
<Tag {...attributes} className={progressClasses}>
104+
{multi ? children : <div {...progressBarProps} />}
105+
</Tag>
102106
);
103107
};
104108

0 commit comments

Comments
 (0)