mui · oliviertassinari · Jun 14, 2021 · Jun 13, 2021 · Jun 13, 2021 · Jun 13, 2021
diff --git a/benchmark/browser/webpack.config.js b/benchmark/browser/webpack.config.js
@@ -33,9 +33,6 @@ module.exports = {
     ],
   },
   resolve: {
-    alias: {
-      'react-dom$': 'react-dom/profiling',
-    },
     extensions: ['.js', '.ts', '.tsx'],
   },
 };
diff --git a/docs/notifications.json b/docs/notifications.json
@@ -1,12 +1,12 @@
 [
-  {
-    "id": 27,
-    "text": "You can <a style=\"color: inherit;\" target=\"_blank\" rel=\"noopener\" href=\"https://twitter.com/MaterialUI\">follow us on Twitter</a> to receive exclusive tips and updates about Material-UI and the React ecosystem."
-  },
   {
     "id": 35,
     "title": "Let's translate!",
     "text": "<a style=\"color: inherit;\" target=\"_blank\" rel=\"noopener\" data-ga-event-category=\"l10n\" data-ga-event-action=\"notification\" data-ga-event-label=\"zh\" href=\"https://translate.material-ui.com/\">帮助 Material-UI 将文档翻译成中文</a>. 🇨🇳",
     "userLanguage": "zh"
+  },
+  {
+    "id": 53,
+    "text": "You can <a style=\"color: inherit;\" target=\"_blank\" rel=\"noopener\" href=\"https://twitter.com/MaterialUI\">follow us on Twitter</a> to receive exclusive tips and updates about Material-UI and the React ecosystem."
   }
 ]
diff --git a/docs/pages/branding/mui-x.tsx b/docs/pages/branding/mui-x.tsx
@@ -490,7 +490,8 @@ const communityData = [
 const Slider = styled('div')(({ theme }) => ({
   scrollSnapType: 'x mandatory',
   display: 'flex',
-  WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
+  // Add iOS momentum scrolling for iOS < 13.0
+  WebkitOverflowScrolling: 'touch',
   overflowX: 'scroll',
   margin: '0 -15px',
   '& > div': {

diff --git a/docs/public/_redirects b/docs/public/_redirects
@@ -25,6 +25,8 @@ https://material-ui.dev/* https://material-ui.com/:splat 301!
 /r/x-license https://material-ui.com/store/items/material-ui-pro/
 /r/migration-v4 /guides/migration-v4/
 
+/x/license/ https://docs.google.com/document/d/1nkd5JP5wCefo6UwpVi6PnbTaw8DxhstkCZlfHV5ZgfI/edit?usp=sharing 301
+
 # Legacy redirection
 # Added in chronological order
 # To be removed at some point

diff --git a/docs/public/static/ads-in-house/divjoy.png b/docs/public/static/ads-in-house/divjoy.png
diff --git a/docs/src/modules/components/Ad.js b/docs/src/modules/components/Ad.js
@@ -97,13 +97,6 @@ const inHouseAds = [
     description:
       '<b>For Figma</b>. A large UI kit with over 600 handcrafted Material-UI components 🎨.',
   },
-  {
-    name: 'divjoy',
-    link: 'https://divjoy.com?via=material-ui',
-    img: '/static/ads-in-house/divjoy.png',
-    description:
-      '<b>Divjoy</b>. Create your Material-UI app in minutes. You’ll get a nice template, authentication, database integration, subscription payments, and more.',
-  },
 ];
 
 function Ad(props) {

diff --git a/docs/src/pages/components/grid/grid.md b/docs/src/pages/components/grid/grid.md
@@ -66,9 +66,11 @@ For instance, we can implement the ["recommended"](https://material.io/design/la
 
 Responsive values is supported by:
 
-- `spacing`
-- `direction`
 - `columns`
+- `columnSpacing`
+- `direction`
+- `rowSpacing`
+- `spacing`
 - all the [other props](#system-props) of the system
 
 > ⚠️ When using a responsive `columns` prop, each grid item needs its corresponding breakpoint.

diff --git a/docs/src/pages/components/popper/ScrollPlayground.js b/docs/src/pages/components/popper/ScrollPlayground.js
@@ -148,39 +148,39 @@ export default function ScrollPlayground() {
   const classes = useStyles();
 
   const jsx = `
-  <Popper
-    placement="${placement}"
-    disablePortal={${disablePortal}}
-    modifiers={[
-      {
-          name: 'flip',
-          enabled: ${flip.enabled},
-          options: {
-            altBoundary: ${flip.altBoundary},
-            rootBoundary: '${flip.rootBoundary}',
-            padding: 8
-          }
+<Popper
+  placement="${placement}"
+  disablePortal={${disablePortal}}
+  modifiers={[
+    {
+      name: 'flip',
+      enabled: ${flip.enabled},
+      options: {
+        altBoundary: ${flip.altBoundary},
+        rootBoundary: '${flip.rootBoundary}',
+        padding: 8,
       },
-      {
-        name: 'preventOverflow',
-        enabled: ${preventOverflow.enabled},
-        options: {
-          altAxis: ${preventOverflow.altAxis},
-          altBoundary: ${preventOverflow.altBoundary},
-          tether: ${preventOverflow.tether},
-          rootBoundary: ${preventOverflow.rootBoundary},
-          padding: 8
-        }
+    },
+    {
+      name: 'preventOverflow',
+      enabled: ${preventOverflow.enabled},
+      options: {
+        altAxis: ${preventOverflow.altAxis},
+        altBoundary: ${preventOverflow.altBoundary},
+        tether: ${preventOverflow.tether},
+        rootBoundary: '${preventOverflow.rootBoundary}',
+        padding: 8,
       },
-      {
-        name: 'arrow',
-        enabled: ${arrow},
-        options: {
-            element: arrowRef,
-        }
+    },
+    {
+      name: 'arrow',
+      enabled: ${arrow},
+      options: {
+        element: arrowRef,
       },
-    ]}
-  >
+    },
+  ]}
+>
   `;
   const id = open ? 'scroll-playground' : null;
 

diff --git a/packages/material-ui/src/DialogContent/DialogContent.js b/packages/material-ui/src/DialogContent/DialogContent.js
@@ -29,7 +29,8 @@ const DialogContentRoot = styled('div', {
   },
 })(({ theme, styleProps }) => ({
   flex: '1 1 auto',
-  WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
+  // Add iOS momentum scrolling for iOS < 13.0
+  WebkitOverflowScrolling: 'touch',
   overflowY: 'auto',
   padding: '20px 24px',
   ...(styleProps.dividers

diff --git a/packages/material-ui/src/Drawer/Drawer.js b/packages/material-ui/src/Drawer/Drawer.js
@@ -79,7 +79,8 @@ const DrawerPaper = styled(Paper, {
   height: '100%',
   flex: '1 0 auto',
   zIndex: theme.zIndex.drawer,
-  WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
+  // Add iOS momentum scrolling for iOS < 13.0
+  WebkitOverflowScrolling: 'touch',
   // temporary style
   position: 'fixed',
   top: 0,

diff --git a/packages/material-ui/src/ImageList/ImageList.js b/packages/material-ui/src/ImageList/ImageList.js
@@ -36,7 +36,8 @@ const ImageListRoot = styled('ul', {
     overflowY: 'auto',
     listStyle: 'none',
     padding: 0,
-    WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
+    // Add iOS momentum scrolling for iOS < 13.0
+    WebkitOverflowScrolling: 'touch',
     /* Styles applied to the root element if `variant="masonry"`. */
     ...(styleProps.variant === 'masonry' && {
       display: 'block',

diff --git a/packages/material-ui/src/Menu/Menu.js b/packages/material-ui/src/Menu/Menu.js
@@ -49,7 +49,7 @@ const MenuPaper = styled(Paper, {
   // height. This ensures a tapable area outside of the simple menu with which to dismiss
   // the menu.
   maxHeight: 'calc(100% - 96px)',
-  // Add iOS momentum scrolling.
+  // Add iOS momentum scrolling for iOS < 13.0
   WebkitOverflowScrolling: 'touch',
 });
 

diff --git a/packages/material-ui/src/Tabs/Tabs.js b/packages/material-ui/src/Tabs/Tabs.js
@@ -113,7 +113,8 @@ const TabsRoot = styled('div', {
 })(({ styleProps, theme }) => ({
   overflow: 'hidden',
   minHeight: 48,
-  WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
+  // Add iOS momentum scrolling for iOS < 13.0
+  WebkitOverflowScrolling: 'touch',
   display: 'flex',
   ...(styleProps.vertical && {
     flexDirection: 'column',