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 specificity of style overrides #25766

Merged
merged 8 commits into from
Apr 19, 2021
Merged

[Select] Fix specificity of style overrides #25766

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf0d3c0
[Select] Add overrides for selectMenu
robphoenix Apr 14, 2021
b8562f5
[Select] Remove unused overides
robphoenix Apr 14, 2021
24b9dd4
maybe fix
mnajdova Apr 14, 2021
0ae47d9
fix
mnajdova Apr 14, 2021
962db30
Update packages/material-ui/src/Select/SelectInput.js
mnajdova Apr 16, 2021
b1666e4
Update packages/material-ui/src/Select/SelectInput.js
mnajdova Apr 16, 2021
23e894d
Merge branch 'next' into patch-1
mnajdova Apr 16, 2021
e793fda
push one step further
oliviertassinari Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 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 @@ -15,17 +15,14 @@ import useForkRef from '../utils/useForkRef';
import useControlled from '../utils/useControlled';
import selectClasses, { getSelectUtilitiyClasses } from './selectClasses';

// TODO: enable overrides for the icon and nativeInput slots via the components prop
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
export const overridesResolver = (props, styles) => {
const { styleProps } = props;
return deepmerge(
{
...styles.select,
mnajdova marked this conversation as resolved.
Show resolved Hide resolved
...styles[styleProps.variant],
[`& .${selectClasses.icon}`]: {
...styles.icon,
...(styleProps.variant && styles[`icon${capitalize(styleProps.variant)}`]),
...(styleProps.open && styles.iconOpen),
},
[`&.${selectClasses.selectMenu}`]: styles.selectMenu,
[`&.${selectClasses[styleProps.variant]}`]: styles[styleProps.variant],
},
styles.root || {},
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/mui-org/material-ui/blob/d72862cf60b2ea314b5d9e3ed163a0f605e2eef2/packages/material-ui/src/NativeSelect/NativeSelectInput.js#L25

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/mui-org/material-ui/blob/d72862cf60b2ea314b5d9e3ed163a0f605e2eef2/packages/material-ui/src/Select/SelectInput.js#L356-L358

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Referencing #11646 where we plan to simply this

Copy link
Member

@oliviertassinari oliviertassinari Apr 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And #25313, which suggest we have no root on this file so: root, select, selectMenu.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this in a separate PR?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably, yes

);
Expand Down