Skip to content

Commit 7f9ef65

Browse files
flaviendelangleflaviendelangle
committed
Merge remote-tracking branch 'origin/describeConformance-ownerState' into describeConformance-ownerState
2 parents 19ac501 + ea9521f commit 7f9ef65

File tree

86 files changed

+1824
-995
lines changed

Some content is hidden

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

86 files changed

+1824
-995
lines changed

‎CHANGELOG.md

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

3+
## v6.1.8
4+
5+
<!-- generated comparing v6.1.7..master -->
6+
7+
_Nov 20, 2024_
8+
9+
A big thanks to the 10 contributors who made this release possible.
10+
11+
### `@mui/[email protected]`
12+
13+
- [Autocomplete] Use `ul` element for the listbox (#44422) @DiegoAndai
14+
- [Grid2] Remove item and zeroMinWidth classes from grid2Classes (#44419) @sai6855
15+
- [StepIcon] Add SvgIconOwnProps type to StepIcon props (#44337) @sai6855
16+
- Add generic back to `useMediaQuery` to prevent a breaking change (#44455) @siriwatknp
17+
- [Tooltip] Deprecate `*Component` and `*Props` for v6 (#44350) @siriwatknp
18+
19+
### `@mui/[email protected]`
20+
21+
- Warn when calling `setMode` without configuring `colorSchemeSelector` (#43783) @siriwatknp
22+
23+
### `@mui/[email protected]`
24+
25+
- Add back removed internal function (#44421) @mnajdova
26+
27+
### `@mui/[email protected]`
28+
29+
- Skip deep clone React element (#44400) @siriwatknp
30+
- Add documentation to `useForkRef` (#44410) @JCQuintas
31+
32+
### Docs
33+
34+
- [Accordion] Replace hardcoded classes with constants in demos (#44453) @ZeeshanTamboli
35+
- [material-ui][Autocomplete] Fix virtualization demo (#44382) @DiegoAndai
36+
- Revert #44388 (#44454) @prakhargupta1
37+
- Add App starters in related-projects.md (#44315) @oliviertassinari
38+
- Bring back `*Component` and `*Props` codemods and deprecation messages (#44383) @DiegoAndai
39+
- [docs] Copyedit Templates page (#44461) @samuelsycamore
40+
41+
### Core
42+
43+
- Remove `stylis-plugin-rtl-sc` (#44447) @renovate[bot]
44+
- [test][Autocomplete] Make virtualize regression screenshots deterministic (#44425) @DiegoAndai
45+
- [blog] Fix reference to subdomain on MUI X v8 alpha zero post (#44416) @joserodolfofreitas
46+
- [blog] MUI X v8 alpha zero blog post (#44377) @joserodolfofreitas
47+
- [code-infra] Use vitest-compatible skip in `describeConformance` (#44412) @JCQuintas
48+
- Keep OpenSSF badge up-to-date (aef2bf2) @oliviertassinari
49+
- Polish useForkRef docs (#44424) @oliviertassinari
50+
- [infra] Upgrade Cherry-pick workflow to latest (#44448) @oliviertassinari
51+
52+
All contributors of this release in alphabetical order: @DiegoAndai, @JCQuintas, @joserodolfofreitas, @mnajdova, @oliviertassinari, @prakhargupta1, @sai6855, samuelsycamore, @siriwatknp, @ZeeshanTamboli
53+
354
## v6.1.7
455

556
<!-- generated comparing v6.1.6..master -->

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ View the [Joy UI documentation](https://mui.com/joy-ui/getting-started/).
6161
<p>
6262
<a href="https://octopus.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="128" width="128" src="https://mui.com/static/sponsors/octopus-square.svg" alt="octopus" title="Repeatable, reliable deployments" loading="lazy" /></a>
6363
<a href="https://www.doit.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="128" width="128" src="https://mui.com/static/sponsors/doit-square.svg" alt="doit" title="Management Platform for Google Cloud and AWS" loading="lazy" /></a>
64-
<a href="https://www.marblism.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="128" width="128" src="https://mui.com/static/sponsors/marblism-square.svg" alt="marblism" title="AI web app generation" loading="lazy" /></a>
6564
</p>
6665

6766
Diamond sponsors are those who have pledged \$1,500/month or more to MUI.
@@ -100,6 +99,8 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
10099
&nbsp;
101100
<a href="https://views4you.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="26" src="https://images.opencollective.com/buy-instagram-followers-v4y/6364714/logo/78.png" alt="views4you.com" title="Views4you: Social media growth services." loading="lazy" />Views4You</a>
102101
&nbsp;
102+
<a href="https://poprey.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="26" src="https://images.opencollective.com/instagram-likes/2a72a03/logo/78.png" alt="poprey.com" title="Poprey: Buy Instagram likes with crypto." loading="lazy" />Poprey</a>
103+
&nbsp;
103104
</p>
104105

105106
Gold sponsors are those who have pledged \$500/month or more to MUI.

‎docs/data/material/components/button-group/LoadingButtonGroup.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import * as React from 'react';
22
import ButtonGroup from '@mui/material/ButtonGroup';
33
import Button from '@mui/material/Button';
4+
import LoadingButton from '@mui/lab/LoadingButton';
45
import SaveIcon from '@mui/icons-material/Save';
56

67
export default function LoadingButtonGroup() {
78
return (
89
<ButtonGroup variant="outlined" aria-label="Loading button group">
910
<Button>Submit</Button>
10-
<Button>Fetch data</Button>
11-
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
11+
<LoadingButton>Fetch data</LoadingButton>
12+
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
1213
Save
13-
</Button>
14+
</LoadingButton>
1415
</ButtonGroup>
1516
);
1617
}

‎docs/data/material/components/button-group/LoadingButtonGroup.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import * as React from 'react';
22
import ButtonGroup from '@mui/material/ButtonGroup';
33
import Button from '@mui/material/Button';
4+
import LoadingButton from '@mui/lab/LoadingButton';
45
import SaveIcon from '@mui/icons-material/Save';
56

67
export default function LoadingButtonGroup() {
78
return (
89
<ButtonGroup variant="outlined" aria-label="Loading button group">
910
<Button>Submit</Button>
10-
<Button>Fetch data</Button>
11-
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
11+
<LoadingButton>Fetch data</LoadingButton>
12+
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
1213
Save
13-
</Button>
14+
</LoadingButton>
1415
</ButtonGroup>
1516
);
1617
}

‎docs/data/material/components/button-group/LoadingButtonGroup.tsx.preview

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ButtonGroup variant="outlined" aria-label="Loading button group">
22
<Button>Submit</Button>
3-
<Button>Fetch data</Button>
4-
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
3+
<LoadingButton>Fetch data</LoadingButton>
4+
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
55
Save
6-
</Button>
6+
</LoadingButton>
77
</ButtonGroup>

‎docs/data/material/components/button-group/button-group.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
productId: material-ui
33
title: React Button Group component
4-
components: Button, ButtonGroup
4+
components: Button, ButtonGroup, LoadingButton
55
githubLabel: 'component: ButtonGroup'
66
githubSource: packages/mui-material/src/ButtonGroup
77
---
@@ -49,8 +49,10 @@ You can remove the elevation with the `disableElevation` prop.
4949

5050
{{"demo": "DisableElevation.js"}}
5151

52-
## Loading
52+
## Experimental APIs
5353

54-
Use the `loading` prop from `Button` to set buttons in a loading state and disable interactions.
54+
### Loading button
55+
56+
You can use the [`<LoadingButton />`](/material-ui/react-button/#loading-button) from [`@mui/lab`](/material-ui/about-the-lab/) in the button group.
5557

5658
{{"demo": "LoadingButtonGroup.js"}}

‎docs/data/material/components/buttons/IconButtonWithBadge.js

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎docs/data/material/components/buttons/IconButtonWithBadge.tsx

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎docs/data/material/components/buttons/IconButtonWithBadge.tsx.preview

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎docs/data/material/components/buttons/LoadingButtons.js

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,25 @@
11
import * as React from 'react';
2-
import Button from '@mui/material/Button';
2+
import LoadingButton from '@mui/lab/LoadingButton';
33
import SaveIcon from '@mui/icons-material/Save';
44
import Stack from '@mui/material/Stack';
55

66
export default function LoadingButtons() {
77
return (
8-
<Stack spacing={2}>
9-
<Stack direction="row" spacing={2}>
10-
<Button loading variant="outlined">
11-
Submit
12-
</Button>
13-
<Button loading loadingIndicator="Loading…" variant="outlined">
14-
Fetch data
15-
</Button>
16-
<Button
17-
loading
18-
loadingPosition="start"
19-
startIcon={<SaveIcon />}
20-
variant="outlined"
21-
>
22-
Save
23-
</Button>
24-
</Stack>
25-
<Button
26-
fullWidth
8+
<Stack direction="row" spacing={2}>
9+
<LoadingButton loading variant="outlined">
10+
Submit
11+
</LoadingButton>
12+
<LoadingButton loading loadingIndicator="Loading…" variant="outlined">
13+
Fetch data
14+
</LoadingButton>
15+
<LoadingButton
2716
loading
2817
loadingPosition="start"
2918
startIcon={<SaveIcon />}
3019
variant="outlined"
3120
>
32-
Full width
33-
</Button>
34-
<Button
35-
fullWidth
36-
loading
37-
loadingPosition="end"
38-
endIcon={<SaveIcon />}
39-
variant="outlined"
40-
>
41-
Full width
42-
</Button>
21+
Save
22+
</LoadingButton>
4323
</Stack>
4424
);
4525
}

0 commit comments

Comments
 (0)