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.

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

Fixes layout issues with centred snackbars on xs screen sizes #382

Merged
merged 3 commits into from
May 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Thanks to all contributers who improved notistack by opening an issue/PR.

### `[email protected]`
###### May 18, 2021
* **@angeshpc91** Fixes issues with centered snackbars on xs screen sizes [#380](https://github.com/iamhosseindhv/notistack/issues/380)

<br />

### `[email protected]`
###### May 8, 2021
* **@whytspace** Multiple Snackbars always left aligned [#373](https://github.com/iamhosseindhv/notistack/issues/373)
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "notistack",
"version": "1.0.7",
"version": "1.0.8",
"description": "Highly customizable notification snackbars (toasts) that can be stacked on top of each other",
"main": "dist/index.js",
"module": "dist/notistack.esm.js",
Expand Down
32 changes: 10 additions & 22 deletions src/SnackbarContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ const collapse = {
wrapper: '& > .MuiCollapse-container > .MuiCollapse-wrapper',
};

const xsWidthMargin = 16;

const useStyle = makeStyles((theme) => ({
root: {
boxSizing: 'border-box',
Expand All @@ -26,57 +28,48 @@ const useStyle = makeStyles((theme) => ({
},
[collapse.wrapper]: {
padding: `${SNACKBAR_INDENTS.snackbar.default}px 0px`,
transition: 'padding 300ms ease 0ms',
},
maxWidth: `calc(100% - ${SNACKBAR_INDENTS.view.default * 2}px)`,
[theme.breakpoints.down('xs')]: {
left: '16px',
right: '16px',
width: '100%',
maxWidth: 'calc(100% - 32px)',
maxWidth: `calc(100% - ${xsWidthMargin * 2}px)`,
},
},

rootDense: {
maxWidth: `calc(100% - ${SNACKBAR_INDENTS.view.dense * 2}px)`,
[collapse.wrapper]: {
padding: `${SNACKBAR_INDENTS.snackbar.dense}px 0px`,
},
},

top: {
top: SNACKBAR_INDENTS.view.default - SNACKBAR_INDENTS.snackbar.default,
flexDirection: 'column',
},
topDense: { top: SNACKBAR_INDENTS.view.dense - SNACKBAR_INDENTS.snackbar.dense },

bottom: {
bottom: SNACKBAR_INDENTS.view.default - SNACKBAR_INDENTS.snackbar.default,
flexDirection: 'column-reverse',
},
bottomDense: { bottom: SNACKBAR_INDENTS.view.dense - SNACKBAR_INDENTS.snackbar.dense },

left: {
left: SNACKBAR_INDENTS.view.default,
[theme.breakpoints.up('sm')]: {
alignItems: 'flex-start',
},
[theme.breakpoints.down('xs')]: {
left: `${xsWidthMargin}px`,
},
},
leftDense: { left: SNACKBAR_INDENTS.view.dense },

right: {
right: SNACKBAR_INDENTS.view.default,
[theme.breakpoints.up('sm')]: {
alignItems: 'flex-end',
},
[theme.breakpoints.down('xs')]: {
right: `${xsWidthMargin}px`,
},
},
rightDense: { right: SNACKBAR_INDENTS.view.dense },

center: {
left: '50%',
transform: 'translateX(-50%)',
[theme.breakpoints.down('xs')]: {
transform: 'translateX(0)',
},
[theme.breakpoints.up('sm')]: {
alignItems: 'center',
},
Expand All @@ -98,11 +91,6 @@ const SnackbarContainer: React.FC<SnackbarContainerProps> = (props) => {
const combinedClassname = clsx(
classes[anchorOrigin.vertical],
classes[anchorOrigin.horizontal],
// @ts-ignore
{ [classes[`${anchorOrigin.vertical}Dense`]]: dense },
// @ts-ignore
{ [classes[`${anchorOrigin.horizontal}Dense`]]: dense },
// @ts-ignore
{ [classes.rootDense]: dense },
classes.root, // root should come after others to override maxWidth
className,
Expand Down