Skip to content

Commit 9efd627

Browse files
Merge branch 'master' into l10n-Belarusian
2 parents 37546b3 + 0198612 commit 9efd627

File tree

173 files changed

+2499
-2749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+2499
-2749
lines changed

CHANGELOG.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,53 @@
11
# [Versions](https://mui.com/versions/)
22

3+
## 5.11.4
4+
5+
<!-- generated comparing v5.11.3..master -->
6+
7+
_Jan 9, 2023_
8+
9+
A big thanks to the 14 contributors who made this release possible.
10+
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.
11+
12+
13+
14+
- [Autocomplete] Add index to renderOption's AutocompleteRenderOptionState (#35578) @CowDotDev
15+
- [Autocomplete] Fix grammar in console.error in `useAutocomplete` (#35723) @hamirmahal
16+
- [Modal] Fix can't override Backdrop Props using new Slots API (#35140) @ZeeshanTamboli
17+
- [Select] Revert "Update `renderValue` prop's TypeScript type (#34177)" (#35733) @michaldudak
18+
- [Tabs] Throw error only if individual `Tab` is hidden, not the whole `Tabs` (#34026) @Ryczko
19+
- [TextField] Improve WCAG 2.4.7 with error={true} (#35687) @oliviertassinari
20+
- [Tooltip] Remove `data-foo` attribute (#35736) @koolskateguy89
21+
22+
23+
24+
- [Autocomplete][joy] Specify `type` attribute for popup indicator (#35648) @hbjORbj
25+
- [Joy] Miscellaneous improvements (#35769) @siriwatknp
26+
- [Joy] Improve `onKeyDown` event handler for demo (#35642) @hbjORbj
27+
28+
29+
30+
- [Portal][base] Convert code to TypeScript (#35657) @sai6855
31+
32+
### Docs
33+
34+
- [docs] Revise and expand Joy UI Button doc (#35737) @samuelsycamore
35+
- [docs] Document the workaround for crashing a translated page (#35720) @michaldudak
36+
- [docs] Fix API page for `MenuItem` to list all valid props (#35561) @mnajdova
37+
- [docs] Fix ad exception in Joy UI (#35685) @oliviertassinari
38+
- [docs] Fix content wider than screen regression @oliviertassinari
39+
- [examples] Add `Vite.js with TypeScript` example (#35683) @miha53cevic
40+
41+
### Core
42+
43+
- [core] Close 2022 developer survey @oliviertassinari
44+
- [core] Fix the product license reference name (#35703) @oliviertassinari
45+
- [core] Use TypeScript AST instead of TTP for component doc building (#35379) @flaviendelangle
46+
- [test] Always use & for nesting styles (#35702) @oliviertassinari
47+
- [website] Improve Lead Designer role description (#35684) @oliviertassinari
48+
49+
All contributors of this release in alphabetical order: @CowDotDev, @flaviendelangle, @hamirmahal, @hbjORbj, @koolskateguy89, @michaldudak, @miha53cevic, @mnajdova, @oliviertassinari, @Ryczko, @sai6855, @samuelsycamore, @siriwatknp, @ZeeshanTamboli
50+
351
## 5.11.3
452

553
<!-- generated comparing v5.11.2..master -->

benchmark/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"@emotion/react": "^11.10.5",
1616
"@emotion/styled": "^11.10.5",
1717
"@mdx-js/react": "^2.2.1",
18-
"@mui/material": "^5.11.3",
18+
"@mui/material": "^5.11.4",
1919
"@mui/styles": "^5.11.2",
20-
"@mui/system": "^5.11.2",
20+
"@mui/system": "^5.11.4",
2121
"@styled-system/css": "^5.1.5",
2222
"benchmark": "^2.1.4",
2323
"playwright": "^1.29.1",

docs/data/base/components/button/button.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/button/
1010

1111
<p class="description">Buttons let users take actions and make choices with a single tap.</p>
1212

13-
{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
14-
1513
## Introduction
1614

1715
The Unstyled Button component replaces the native HTML `<button>` element, and offers expanded options for styling and accessibility.
1816

1917
{{"demo": "UnstyledButtonIntroduction.tsx", "defaultCodeOpen": false, "bg": "gradient"}}
2018

19+
{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
20+
2121
## Component
2222

2323
### Usage
Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
import * as React from 'react';
22
import AspectRatio from '@mui/joy/AspectRatio';
3-
import Sheet from '@mui/joy/Sheet';
43
import Typography from '@mui/joy/Typography';
54

65
export default function BasicRatio() {
76
return (
8-
<Sheet
9-
variant="outlined"
10-
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
11-
>
12-
<AspectRatio>
13-
<Typography level="h2" component="div">
14-
16/9
15-
</Typography>
16-
</AspectRatio>
17-
</Sheet>
7+
<AspectRatio sx={{ width: 300 }}>
8+
<Typography level="h2" component="div">
9+
16/9
10+
</Typography>
11+
</AspectRatio>
1812
);
1913
}
Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
import * as React from 'react';
22
import AspectRatio from '@mui/joy/AspectRatio';
3-
import Sheet from '@mui/joy/Sheet';
43
import Typography from '@mui/joy/Typography';
54

65
export default function BasicRatio() {
76
return (
8-
<Sheet
9-
variant="outlined"
10-
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
11-
>
12-
<AspectRatio>
13-
<Typography level="h2" component="div">
14-
16/9
15-
</Typography>
16-
</AspectRatio>
17-
</Sheet>
7+
<AspectRatio sx={{ width: 300 }}>
8+
<Typography level="h2" component="div">
9+
16/9
10+
</Typography>
11+
</AspectRatio>
1812
);
1913
}
Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
<Sheet
2-
variant="outlined"
3-
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
4-
>
5-
<AspectRatio>
6-
<Typography level="h2" component="div">
7-
16/9
8-
</Typography>
9-
</AspectRatio>
10-
</Sheet>
1+
<AspectRatio sx={{ width: 300 }}>
2+
<Typography level="h2" component="div">
3+
16/9
4+
</Typography>
5+
</AspectRatio>
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
import * as React from 'react';
22
import AspectRatio from '@mui/joy/AspectRatio';
3-
import Sheet from '@mui/joy/Sheet';
43
import Typography from '@mui/joy/Typography';
54

65
export default function CustomRatio() {
76
return (
8-
<Sheet
7+
<AspectRatio
98
variant="outlined"
10-
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
9+
ratio="4/3"
10+
sx={{
11+
width: 300,
12+
bgcolor: 'background.level2',
13+
borderRadius: 'md',
14+
}}
1115
>
12-
<AspectRatio ratio="4/3">
13-
<Typography level="h2" component="div">
14-
4/3
15-
</Typography>
16-
</AspectRatio>
17-
</Sheet>
16+
<Typography level="h2" component="div">
17+
4/3
18+
</Typography>
19+
</AspectRatio>
1820
);
1921
}
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
import * as React from 'react';
22
import AspectRatio from '@mui/joy/AspectRatio';
3-
import Sheet from '@mui/joy/Sheet';
43
import Typography from '@mui/joy/Typography';
54

65
export default function CustomRatio() {
76
return (
8-
<Sheet
7+
<AspectRatio
98
variant="outlined"
10-
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
9+
ratio="4/3"
10+
sx={{
11+
width: 300,
12+
bgcolor: 'background.level2',
13+
borderRadius: 'md',
14+
}}
1115
>
12-
<AspectRatio ratio="4/3">
13-
<Typography level="h2" component="div">
14-
4/3
15-
</Typography>
16-
</AspectRatio>
17-
</Sheet>
16+
<Typography level="h2" component="div">
17+
4/3
18+
</Typography>
19+
</AspectRatio>
1820
);
1921
}
Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
<Sheet
1+
<AspectRatio
22
variant="outlined"
3-
sx={{ width: 300, borderRadius: 'md', overflow: 'auto' }}
3+
ratio="4/3"
4+
sx={{
5+
width: 300,
6+
bgcolor: 'background.level2',
7+
borderRadius: 'md',
8+
}}
49
>
5-
<AspectRatio ratio="4/3">
6-
<Typography level="h2" component="div">
7-
4/3
8-
</Typography>
9-
</AspectRatio>
10-
</Sheet>
10+
<Typography level="h2" component="div">
11+
4/3
12+
</Typography>
13+
</AspectRatio>

docs/data/joy/components/aspect-ratio/FlexRowRatio.js

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import * as React from 'react';
22
import AspectRatio from '@mui/joy/AspectRatio';
33
import Box from '@mui/joy/Box';
4-
import TextField from '@mui/joy/TextField';
54
import Typography from '@mui/joy/Typography';
65
import Sheet from '@mui/joy/Sheet';
6+
import FormControl from '@mui/joy/FormControl';
7+
import FormLabel from '@mui/joy/FormLabel';
8+
import Input from '@mui/joy/Input';
79

810
export default function FlexRowRatio() {
911
const [flexBasis, setFlexBasis] = React.useState(200);
@@ -38,16 +40,17 @@ export default function FlexRowRatio() {
3840
</Box>
3941
</Sheet>
4042
<br />
41-
<TextField
42-
variant="outlined"
43-
label="flexBasis"
44-
placeholder="number"
45-
endDecorator="px"
46-
type="number"
47-
value={flexBasis}
48-
onChange={(event) => setFlexBasis(event.target.valueAsNumber)}
49-
sx={{ mx: 'auto', width: '100%' }}
50-
/>
43+
<FormControl sx={{ mx: 'auto', width: '100%' }}>
44+
<FormLabel>flexBasis</FormLabel>
45+
<Input
46+
variant="outlined"
47+
type="number"
48+
placeholder="number"
49+
value={flexBasis}
50+
endDecorator="px"
51+
onChange={(event) => setFlexBasis(event.target.valueAsNumber)}
52+
/>
53+
</FormControl>
5154
</Box>
5255
);
5356
}

0 commit comments

Comments
 (0)