Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Select] Fix SelectDisplayProps className concat #23211

Merged
merged 2 commits into from
Oct 22, 2020
Merged

[Select] Fix SelectDisplayProps className concat #23211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c49ef1
Use SelectDisplayProps in classes after spread
reedanders Oct 22, 2020
945d672
Update packages/material-ui/src/Select/SelectInput.js
oliviertassinari Oct 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
21 changes: 11 additions & 10 deletions packages/material-ui/src/Select/SelectInput.js
View file
Open in desktop
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