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

[Drawer] Fix PaperProps className merge #18866

Merged
merged 4 commits into from
Dec 16, 2019
Merged

[Drawer] Fix PaperProps className merge #18866

merged 4 commits into from
Dec 16, 2019

Conversation

kristenmills
Copy link
Contributor

There was a bug in #18740 so this is the actual fix to #18714.

I also added some tests to make sure custom className and the normal paper classes are applied.

@mui-pr-bot
Copy link

mui-pr-bot commented Dec 15, 2019 •
edited
Loading

Details of bundle changes.

Comparing: e112a44...35f9686

bundle Size Change Size Gzip Change Gzip
SwipeableDrawer ▲ +2 B (0.00% ) 90.5 kB ▼ -2 B (-0.01% ) 28 kB
@material-ui/core ▲ +2 B (0.00% ) 357 kB ▼ -1 B (-0.00% ) 97.4 kB
@material-ui/core[umd] ▲ +2 B (0.00% ) 314 kB -- 90.4 kB
docs.main ▲ +2 B (0.00% ) 611 kB -- 195 kB
Drawer ▲ +2 B (0.00% ) 83.2 kB -- 25.2 kB
@material-ui/lab -- 175 kB -- 52.5 kB
@material-ui/styles -- 50.8 kB -- 15.3 kB
@material-ui/system -- 14.5 kB -- 4.04 kB
AppBar -- 62.6 kB -- 19.5 kB
Autocomplete -- 128 kB -- 39.9 kB
Avatar -- 63.9 kB -- 20.1 kB
AvatarGroup -- 60.9 kB -- 19.1 kB
Backdrop -- 66.4 kB -- 20.5 kB
Badge -- 64 kB -- 19.8 kB
BottomNavigation -- 61.1 kB -- 19.1 kB
BottomNavigationAction -- 74.1 kB -- 23.4 kB
Box -- 69.4 kB -- 21 kB
Breadcrumbs -- 66.7 kB -- 20.8 kB
Button -- 78.4 kB -- 23.9 kB
ButtonBase -- 72.6 kB -- 22.7 kB
ButtonGroup -- 81.8 kB -- 25 kB
Card -- 61.5 kB -- 19.2 kB
CardActionArea -- 73.7 kB -- 23.1 kB
CardActions -- 60.7 kB -- 19 kB
CardContent -- 60.7 kB -- 18.9 kB
CardHeader -- 63.7 kB -- 20 kB
CardMedia -- 61 kB -- 19.1 kB
Checkbox -- 80.6 kB -- 25.4 kB
Chip -- 81.2 kB -- 24.8 kB
CircularProgress -- 62.8 kB -- 19.7 kB
ClickAwayListener -- 3.85 kB -- 1.55 kB
Collapse -- 66.6 kB -- 20.6 kB
colorManipulator -- 3.85 kB -- 1.52 kB
Container -- 61.9 kB -- 19.3 kB
CssBaseline -- 56.2 kB -- 17.6 kB
Dialog -- 81.4 kB -- 25.4 kB
DialogActions -- 60.8 kB -- 19 kB
DialogContent -- 60.9 kB -- 19 kB
DialogContentText -- 62.7 kB -- 19.7 kB
DialogTitle -- 63 kB -- 19.7 kB
Divider -- 61.3 kB -- 19.2 kB
docs.landing -- 50.3 kB -- 12.2 kB
ExpansionPanel -- 70.1 kB -- 21.9 kB
ExpansionPanelActions -- 60.8 kB -- 19 kB
ExpansionPanelDetails -- 60.6 kB -- 18.9 kB
ExpansionPanelSummary -- 76.8 kB -- 24.2 kB
Fab -- 75.5 kB -- 23.4 kB
Fade -- 22.2 kB -- 7.68 kB
FilledInput -- 72.2 kB -- 22.4 kB
FormControl -- 63.1 kB -- 19.6 kB
FormControlLabel -- 64.2 kB -- 20.1 kB
FormGroup -- 60.7 kB -- 19 kB
FormHelperText -- 61.9 kB -- 19.4 kB
FormLabel -- 62.1 kB -- 19.2 kB
Grid -- 63.8 kB -- 19.9 kB
GridList -- 61.2 kB -- 19.2 kB
GridListTile -- 62.4 kB -- 19.5 kB
GridListTileBar -- 61.9 kB -- 19.3 kB
Grow -- 22.8 kB -- 7.8 kB
Hidden -- 64.6 kB -- 20.2 kB
Icon -- 61.5 kB -- 19.2 kB
IconButton -- 74.8 kB -- 23.3 kB
Input -- 71.2 kB -- 22.1 kB
InputAdornment -- 63.8 kB -- 20 kB
InputBase -- 69.3 kB -- 21.7 kB
InputLabel -- 64 kB -- 19.9 kB
LinearProgress -- 64 kB -- 19.9 kB
Link -- 65.3 kB -- 20.5 kB
List -- 61 kB -- 19 kB
ListItem -- 75.8 kB -- 23.6 kB
ListItemAvatar -- 60.8 kB -- 19 kB
ListItemIcon -- 60.9 kB -- 19 kB
ListItemSecondaryAction -- 60.7 kB -- 19 kB
ListItemText -- 63.6 kB -- 19.9 kB
ListSubheader -- 61.4 kB -- 19.3 kB
Menu -- 87.1 kB -- 26.8 kB
MenuItem -- 76.8 kB -- 23.9 kB
MenuList -- 64.6 kB -- 20.2 kB
MobileStepper -- 66.5 kB -- 20.8 kB
Modal -- 14.3 kB -- 5 kB
NativeSelect -- 75.5 kB -- 23.7 kB
NoSsr -- 2.19 kB -- 1.03 kB
OutlinedInput -- 72.6 kB -- 22.6 kB
Paper -- 61 kB -- 19 kB
Popover -- 81.4 kB -- 25.1 kB
Popper -- 28.7 kB -- 10.3 kB
Portal -- 2.9 kB -- 1.3 kB
Radio -- 81.5 kB -- 25.6 kB
RadioGroup -- 61.9 kB -- 19.3 kB
Rating -- 68.7 kB -- 22 kB
RootRef -- 4.21 kB -- 1.64 kB
Select -- 113 kB -- 33.6 kB
Skeleton -- 61.2 kB -- 19.3 kB
Slide -- 24.3 kB -- 8.3 kB
Slider -- 74.3 kB -- 23.3 kB
Snackbar -- 73.8 kB -- 23 kB
SnackbarContent -- 62.2 kB -- 19.5 kB
SpeedDial -- 84.7 kB -- 26.7 kB
SpeedDialAction -- 116 kB -- 36.6 kB
SpeedDialIcon -- 63.2 kB -- 19.8 kB
Step -- 61.3 kB -- 19.2 kB
StepButton -- 80.9 kB -- 25.5 kB
StepConnector -- 61.4 kB -- 19.3 kB
StepContent -- 67.7 kB -- 21.1 kB
StepIcon -- 63.3 kB -- 19.7 kB
StepLabel -- 67.3 kB -- 21.1 kB
Stepper -- 63.6 kB -- 20 kB
styles/createMuiTheme -- 15.4 kB -- 5.44 kB
SvgIcon -- 61.7 kB -- 19.2 kB
Switch -- 79.8 kB -- 25 kB
Tab -- 75 kB -- 23.7 kB
Table -- 61.2 kB -- 19.2 kB
TableBody -- 60.8 kB -- 19 kB
TableCell -- 62.7 kB -- 19.7 kB
TableContainer -- 60.6 kB -- 18.9 kB
TableFooter -- 60.8 kB -- 19 kB
TableHead -- 60.8 kB -- 19 kB
TablePagination -- 140 kB -- 40.9 kB
TableRow -- 61.2 kB -- 19.1 kB
TableSortLabel -- 76 kB -- 23.8 kB
Tabs -- 84.1 kB -- 26.5 kB
TextareaAutosize -- 5.09 kB -- 2.13 kB
TextField -- 122 kB -- 35.6 kB
ToggleButton -- 74.8 kB -- 23.6 kB
ToggleButtonGroup -- 61.9 kB -- 19.4 kB
Toolbar -- 61 kB -- 19.1 kB
Tooltip -- 99.5 kB -- 31.4 kB
TreeItem -- 72.3 kB -- 22.8 kB
TreeView -- 65 kB -- 20.4 kB
Typography -- 62.3 kB -- 19.4 kB
useAutocomplete -- 12.6 kB -- 4.69 kB
useMediaQuery -- 2.5 kB -- 1.06 kB
Zoom -- 22.3 kB -- 7.68 kB

Generated by 🚫 dangerJS against 35f9686

@oliviertassinari oliviertassinari changed the title [Drawer] Append className from PaperProps instead of overwrite [Drawer] Fix PaperProps className merge Dec 16, 2019
@oliviertassinari oliviertassinari added bug 🐛 Something doesn't work component: drawer This is the name of the generic UI component, not the React module! labels Dec 16, 2019
oliviertassinari
oliviertassinari approved these changes Dec 16, 2019
View reviewed changes
Copy link
Member

@oliviertassinari oliviertassinari left a comment

Choose a reason for hiding this comment

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

Thanks for the follow-up! I have reviewed the first pull request too quickly 🙃.

@oliviertassinari oliviertassinari merged commit b5c4076 into mui:master Dec 16, 2019
@oliviertassinari
Copy link
Member

@kristenmills Well done!

@kristenmills kristenmills deleted the fix-drawer-paper-props branch December 17, 2019 00:17
@snyk-bot snyk-bot mentioned this pull request Jan 7, 2020
Open
@fzaninotto fzaninotto mentioned this pull request Jan 17, 2020
Closed
@fzaninotto
Copy link
Contributor

This has caused a regression in react-admin, so I think it's a breaking change.

@oliviertassinari
Copy link
Member

oliviertassinari commented Jan 17, 2020 •
edited
Loading

It's unfortunate. I hope this was the last "replace" over "merge" case issue of the components.

@snyk-bot snyk-bot mentioned this pull request Feb 15, 2020
Open
@snyk-bot snyk-bot mentioned this pull request Feb 25, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oliviertassinari oliviertassinari oliviertassinari approved these changes

Assignees
No one assigned
Labels
bug 🐛 Something doesn't work component: drawer This is the name of the generic UI component, not the React module!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kristenmills @mui-pr-bot @oliviertassinari @fzaninotto