Skip to content

[Dialog] Improve scroll=body CSS logic #15896

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

Merged
merged 4 commits into from
May 31, 2019
Merged

[Dialog] Improve scroll=body CSS logic #15896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a9115c8
[Dialog][scroll=body] Vertically center paper and fix fullWidth=false
May 27, 2019
67a8ed6
[Docs] Remove debug stuff from ScrollDialog
May 27, 2019
299a17c
[Dialog] Styling improvements
May 28, 2019
5da996d
fix the print mode
oliviertassinari May 28, 2019
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
3 changes: 3 additions & 0 deletions docs/src/modules/components/AppFrame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ const styles = theme => ({
duration: theme.transitions.duration.enteringScreen,
}),
},
'@media print': {
display: 'none',
},
},
appBar: {
transition: theme.transitions.create('width'),
Expand Down
40 changes: 23 additions & 17 deletions packages/material-ui/src/Dialog/Dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ export const styles = theme => ({
/* Styles applied to the root element. */
root: {
'@media print': {
position: 'absolute',
// Use !important to override the Modal inline-style.
position: 'absolute !important',
},
},
/* Styles applied to the root element if `scroll="paper"`. */
Expand All @@ -29,6 +30,14 @@ export const styles = theme => ({
scrollBody: {
overflowY: 'auto',
overflowX: 'hidden',
textAlign: 'center',
'&:after': {
content: '""',
display: 'inline-block',
verticalAlign: 'middle',
height: '100%',
width: '0',
},
},
/* Styles applied to the container element. */
container: {
Expand All @@ -41,8 +50,6 @@ export const styles = theme => ({
},
/* Styles applied to the `Paper` component. */
paper: {
display: 'flex',
flexDirection: 'column',
margin: 48,
position: 'relative',
overflowY: 'auto', // Fix IE 11 issue, to remove at some point.
Expand All @@ -53,25 +60,26 @@ export const styles = theme => ({
},
/* Styles applied to the `Paper` component if `scroll="paper"`. */
paperScrollPaper: {
flex: '0 1 auto',
display: 'flex',
flexDirection: 'column',
maxHeight: 'calc(100% - 96px)',
},
/* Styles applied to the `Paper` component if `scroll="body"`. */
paperScrollBody: {
margin: '48px auto',
display: 'inline-block',
verticalAlign: 'middle',
textAlign: 'left', // 'initial' doesn't work on IE 11
},
/* Styles applied to the `Paper` component if `maxWidth=false`. */
paperWidthFalse: {
'&$paperScrollBody': {
margin: 48,
},
maxWidth: 'calc(100% - 96px)',
},
/* Styles applied to the `Paper` component if `maxWidth="xs"`. */
paperWidthXs: {
maxWidth: Math.max(theme.breakpoints.values.xs, 444),
'&$paperScrollBody': {
[theme.breakpoints.down(Math.max(theme.breakpoints.values.xs, 444) + 48 * 2)]: {
margin: 48,
maxWidth: 'calc(100% - 96px)',
},
},
},
Expand All @@ -80,7 +88,7 @@ export const styles = theme => ({
maxWidth: theme.breakpoints.values.sm,
'&$paperScrollBody': {
[theme.breakpoints.down(theme.breakpoints.values.sm + 48 * 2)]: {
margin: 48,
maxWidth: 'calc(100% - 96px)',
},
},
},
Expand All @@ -89,7 +97,7 @@ export const styles = theme => ({
maxWidth: theme.breakpoints.values.md,
'&$paperScrollBody': {
[theme.breakpoints.down(theme.breakpoints.values.md + 48 * 2)]: {
margin: 48,
maxWidth: 'calc(100% - 96px)',
},
},
},
Expand All @@ -98,7 +106,7 @@ export const styles = theme => ({
maxWidth: theme.breakpoints.values.lg,
'&$paperScrollBody': {
[theme.breakpoints.down(theme.breakpoints.values.lg + 48 * 2)]: {
margin: 48,
maxWidth: 'calc(100% - 96px)',
},
},
},
Expand All @@ -107,16 +115,13 @@ export const styles = theme => ({
maxWidth: theme.breakpoints.values.xl,
'&$paperScrollBody': {
[theme.breakpoints.down(theme.breakpoints.values.xl + 48 * 2)]: {
margin: 48,
maxWidth: 'calc(100% - 96px)',
},
},
},
/* Styles applied to the `Paper` component if `fullWidth={true}`. */
paperFullWidth: {
width: '100%',
'&$paperScrollBody': {
width: 'initial',
},
width: 'calc(100% - 96px)',
},
/* Styles applied to the `Paper` component if `fullScreen={true}`. */
paperFullScreen: {
Expand All @@ -128,6 +133,7 @@ export const styles = theme => ({
borderRadius: 0,
'&$paperScrollBody': {
margin: 0,
maxWidth: '100%',
},
},
});
Expand Down