Skip to content

Commit 8509eb9

Browse files
[core] Batch small changes (#26738)
1 parent aafb54a commit 8509eb9

File tree

13 files changed

+51
-52
lines changed

13 files changed

+51
-52
lines changed

benchmark/browser/webpack.config.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ module.exports = {
3333
],
3434
},
3535
resolve: {
36-
alias: {
37-
'react-dom$': 'react-dom/profiling',
38-
},
3936
extensions: ['.js', '.ts', '.tsx'],
4037
},
4138
};

docs/notifications.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[
2-
{
3-
"id": 27,
4-
"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."
5-
},
62
{
73
"id": 35,
84
"title": "Let's translate!",
95
"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>. 🇨🇳",
106
"userLanguage": "zh"
7+
},
8+
{
9+
"id": 53,
10+
"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."
1111
}
1212
]

docs/pages/branding/mui-x.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,8 @@ const communityData = [
490490
const Slider = styled('div')(({ theme }) => ({
491491
scrollSnapType: 'x mandatory',
492492
display: 'flex',
493-
WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
493+
// Add iOS momentum scrolling for iOS < 13.0
494+
WebkitOverflowScrolling: 'touch',
494495
overflowX: 'scroll',
495496
margin: '0 -15px',
496497
'& > div': {

docs/public/_redirects

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ https://material-ui.dev/* https://material-ui.com/:splat 301!
2525
/r/x-license https://material-ui.com/store/items/material-ui-pro/
2626
/r/migration-v4 /guides/migration-v4/
2727

28+
/x/license/ https://docs.google.com/document/d/1nkd5JP5wCefo6UwpVi6PnbTaw8DxhstkCZlfHV5ZgfI/edit?usp=sharing 301
29+
2830
# Legacy redirection
2931
# Added in chronological order
3032
# To be removed at some point
-2.75 KB
Binary file not shown.

docs/src/modules/components/Ad.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,6 @@ const inHouseAds = [
9797
description:
9898
'<b>For Figma</b>. A large UI kit with over 600 handcrafted Material-UI components 🎨.',
9999
},
100-
{
101-
name: 'divjoy',
102-
link: 'https://divjoy.com?via=material-ui',
103-
img: '/static/ads-in-house/divjoy.png',
104-
description:
105-
'<b>Divjoy</b>. Create your Material-UI app in minutes. You’ll get a nice template, authentication, database integration, subscription payments, and more.',
106-
},
107100
];
108101

109102
function Ad(props) {

docs/src/pages/components/grid/grid.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,11 @@ For instance, we can implement the ["recommended"](https://material.io/design/la
6666

6767
Responsive values is supported by:
6868

69-
- `spacing`
70-
- `direction`
7169
- `columns`
70+
- `columnSpacing`
71+
- `direction`
72+
- `rowSpacing`
73+
- `spacing`
7274
- all the [other props](#system-props) of the system
7375

7476
> ⚠️ When using a responsive `columns` prop, each grid item needs its corresponding breakpoint.

docs/src/pages/components/popper/ScrollPlayground.js

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -148,39 +148,39 @@ export default function ScrollPlayground() {
148148
const classes = useStyles();
149149

150150
const jsx = `
151-
<Popper
152-
placement="${placement}"
153-
disablePortal={${disablePortal}}
154-
modifiers={[
155-
{
156-
name: 'flip',
157-
enabled: ${flip.enabled},
158-
options: {
159-
altBoundary: ${flip.altBoundary},
160-
rootBoundary: '${flip.rootBoundary}',
161-
padding: 8
162-
}
151+
<Popper
152+
placement="${placement}"
153+
disablePortal={${disablePortal}}
154+
modifiers={[
155+
{
156+
name: 'flip',
157+
enabled: ${flip.enabled},
158+
options: {
159+
altBoundary: ${flip.altBoundary},
160+
rootBoundary: '${flip.rootBoundary}',
161+
padding: 8,
163162
},
164-
{
165-
name: 'preventOverflow',
166-
enabled: ${preventOverflow.enabled},
167-
options: {
168-
altAxis: ${preventOverflow.altAxis},
169-
altBoundary: ${preventOverflow.altBoundary},
170-
tether: ${preventOverflow.tether},
171-
rootBoundary: ${preventOverflow.rootBoundary},
172-
padding: 8
173-
}
163+
},
164+
{
165+
name: 'preventOverflow',
166+
enabled: ${preventOverflow.enabled},
167+
options: {
168+
altAxis: ${preventOverflow.altAxis},
169+
altBoundary: ${preventOverflow.altBoundary},
170+
tether: ${preventOverflow.tether},
171+
rootBoundary: '${preventOverflow.rootBoundary}',
172+
padding: 8,
174173
},
175-
{
176-
name: 'arrow',
177-
enabled: ${arrow},
178-
options: {
179-
element: arrowRef,
180-
}
174+
},
175+
{
176+
name: 'arrow',
177+
enabled: ${arrow},
178+
options: {
179+
element: arrowRef,
181180
},
182-
]}
183-
>
181+
},
182+
]}
183+
>
184184
`;
185185
const id = open ? 'scroll-playground' : null;
186186

packages/material-ui/src/DialogContent/DialogContent.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ const DialogContentRoot = styled('div', {
2929
},
3030
})(({ theme, styleProps }) => ({
3131
flex: '1 1 auto',
32-
WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
32+
// Add iOS momentum scrolling for iOS < 13.0
33+
WebkitOverflowScrolling: 'touch',
3334
overflowY: 'auto',
3435
padding: '20px 24px',
3536
...(styleProps.dividers

packages/material-ui/src/Drawer/Drawer.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ const DrawerPaper = styled(Paper, {
7979
height: '100%',
8080
flex: '1 0 auto',
8181
zIndex: theme.zIndex.drawer,
82-
WebkitOverflowScrolling: 'touch', // Add iOS momentum scrolling.
82+
// Add iOS momentum scrolling for iOS < 13.0
83+
WebkitOverflowScrolling: 'touch',
8384
// temporary style
8485
position: 'fixed',
8586
top: 0,

0 commit comments

Comments
 (0)