Merge branch 'master' into next

iamhosseindhv · Jul 25, 2021 · 6afc009 · 6afc009
2 parents fbf104e + 54acc22
commit 6afc009
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 Thanks to all contributers who improved notistack by opening an issue/PR.
 
+### `notistack@1.0.10`
+###### July 25, 2021
+* **@joshkel** Support Collapse with root and container class keys [#408](https://github.com/iamhosseindhv/notistack/pull/408) 
+
+<br />
+
 ### `notistack@1.0.9`
 ###### May 19, 2021
 * **@SimonAmphora** Remove the need to use `!important` to customise variant styles [#215 (comment)](https://github.com/iamhosseindhv/notistack/issues/215#issuecomment-700060481) 

diff --git a/src/SnackbarContainer.tsx b/src/SnackbarContainer.tsx
@@ -5,8 +5,10 @@ import { SNACKBAR_INDENTS } from './utils/constants';
 import { SnackbarProviderProps } from '.';
 
 const collapse = {
-    container: '& > .MuiCollapse-root',
-    wrapper: '& > .MuiCollapse-root > .MuiCollapse-wrapper',
+    // Material-UI 4.12.x and above uses MuiCollapse-root; earlier versions use
+    // Mui-Collapse-container.  https://github.com/mui-org/material-ui/pull/24084
+    container: '& > .MuiCollapse-container, & > .MuiCollapse-root',
+    wrapper: '& > .MuiCollapse-container > .MuiCollapse-wrapper, & > .MuiCollapse-root > .MuiCollapse-wrapper',
 };
 
 const xsWidthMargin = 16;