Skip to content

Commit

Permalink
[Select] Fix SelectDisplayProps className concat (#23211)
Browse files Browse the repository at this point in the history
  • Loading branch information
reedanders committed Oct 22, 2020
1 parent 3745c1e commit e950315
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions packages/material-ui/src/Select/SelectInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,16 +353,6 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
return (
<React.Fragment>
<div
className={clsx(
classes.root, // TODO v5: merge root and select
classes.select,
classes.selectMenu,
classes[variant],
{
[classes.disabled]: disabled,
},
className,
)}
ref={setDisplayNode}
tabIndex={tabIndex}
role="button"
Expand All @@ -376,6 +366,17 @@ const SelectInput = React.forwardRef(function SelectInput(props, ref) {
onBlur={handleBlur}
onFocus={onFocus}
{...SelectDisplayProps}
className={clsx(
classes.root, // TODO v5: merge root and select
classes.select,
classes.selectMenu,
classes[variant],
{
[classes.disabled]: disabled,
},
className,
SelectDisplayProps.className,
)}
// The id is required for proper a11y
id={buttonId}
>
Expand Down

0 comments on commit e950315

Please sign in to comment.