-
-
Notifications
You must be signed in to change notification settings - Fork 32.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/mui/material-ui into depr…
…ecation/drawer
- Loading branch information
Showing
159 changed files
with
2,166 additions
and
2,612 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,54 @@ | ||
| # [Versions](https://mui.com/versions/) | ||
|
|
||
| ## 6.4.0 | ||
|
|
||
| <!-- generated comparing v6.3.1..master --> | ||
|
|
||
| _Jan 13, 2025_ | ||
|
|
||
| A big thanks to the 16 contributors who made this release possible. Here are some highlights ✨: | ||
|
|
||
| - Added [`loading` prop](https://mui.com/material-ui/react-button/#loading-2) to the `Button` and `IconButton` components (#44637) @siriwatknp | ||
|
|
||
| ### `@mui/[email protected]` | ||
|
|
||
| - [Alert] complete `slots` and `slotProps` (#44971) @siriwatknp | ||
| - [Autocomplete] Sync runtime and TS types for key in grouped options (#44862) @aarongarciah | ||
| - [Button] Add `loading` prop (#44637) @siriwatknp | ||
| - [CardHeader] Deprecate `*TypographyProps` and complete `slots`, `slotProps` (#44729) @siriwatknp | ||
| - [CircularProgress] Improve indeterminate animation to be symmetric and smooth (#44934) @yashdev16 | ||
| - [LinearProgress] Deprecate composed classes (#44933) @headironc | ||
| - [Link] Fix error for using custom palette with underline (#44927) @siriwatknp | ||
| - [Select] Do not set `aria-controls` when closed (#44919) @siddhantantil39 | ||
| - [Select] Add missing root class (#44928) @sai6855 | ||
| - [Slider] Set onChangeCommitted to receive the last argument passed to onChange (#44795) @good-jinu | ||
| - Add `mergeSlotProps` for extending components (#44809) @siriwatknp | ||
| - Update `mergeSlotProps` to merge `style` (#44959) @siriwatknp | ||
| - Fix slots typing for Tooltip and StepLabel (#44985) @siriwatknp | ||
| - Remove unnecessary blank lines (#44980) @sai6855 | ||
|
|
||
| ### Docs | ||
|
|
||
| - [docs] Fix Dashboard sidenav sroll (#44876) @oliviertassinari | ||
| - [docs] Fix broken anchor link to w3.org (c51af8e) @oliviertassinari | ||
| - [docs] Add details on complementary Menu components (#44957) @samuelsycamore | ||
| - [docs] Remove misleading messaging on MD3 support (#44953) @mnajdova | ||
| - [docs] Fix code copy button obscuring on small screen sizes (#44861) @ZeeshanTamboli | ||
| - [docs] Remove more instances of Adobe XD (#44956) @samuelsycamore | ||
| - [docs] Remove Adobe XD chips, links, and mentions (#44909) @samuelsycamore | ||
| - [docs] Fix incorrect rendering in Typography docs (#44937) @iaziz11 | ||
|
|
||
| ### Core | ||
|
|
||
| - [core] Remove redundant screenshots (#44877) @oliviertassinari | ||
| - [core] Remove Suspense and clock mocking from regressions and e2e tests (#44935) @DiegoAndai | ||
| - [code-infra] Allow react@18 on `@mui/internal-test-utils` (#45023) @LukasTy | ||
| - [code-infra] Stabilize flaky pigment progressbar tests (#44969) @Janpot | ||
| - [example] Update the CDN example to adapt React 19. (#44979) @IceOfSummer | ||
| - [figma] Clarify that Material UI Sync plugin is experimental (#44975) @oliviertassinari | ||
|
|
||
| All contributors of this release in alphabetical order: @aarongarciah, @DiegoAndai, @good-jinu, @headironc, @iaziz11, @IceOfSummer, @Janpot, @LukasTy, @mnajdova, @oliviertassinari, @sai6855, @samuelsycamore, @siddhantantil39, @siriwatknp, @yashdev16, @ZeeshanTamboli | ||
|
|
||
| ## 6.3.1 | ||
|
|
||
| <!-- generated comparing v6.3.0..master --> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 3 additions & 4 deletions
7
docs/data/material/components/button-group/LoadingButtonGroup.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,16 @@ | ||
| import * as React from 'react'; | ||
| import ButtonGroup from '@mui/material/ButtonGroup'; | ||
| import Button from '@mui/material/Button'; | ||
| import LoadingButton from '@mui/lab/LoadingButton'; | ||
| import SaveIcon from '@mui/icons-material/Save'; | ||
|
|
||
| export default function LoadingButtonGroup() { | ||
| return ( | ||
| <ButtonGroup variant="outlined" aria-label="Loading button group"> | ||
| <Button>Submit</Button> | ||
| <LoadingButton>Fetch data</LoadingButton> | ||
| <LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}> | ||
| <Button>Fetch data</Button> | ||
| <Button loading loadingPosition="start" startIcon={<SaveIcon />}> | ||
| Save | ||
| </LoadingButton> | ||
| </Button> | ||
| </ButtonGroup> | ||
| ); | ||
| } |
7 changes: 3 additions & 4 deletions
7
docs/data/material/components/button-group/LoadingButtonGroup.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,16 @@ | ||
| import * as React from 'react'; | ||
| import ButtonGroup from '@mui/material/ButtonGroup'; | ||
| import Button from '@mui/material/Button'; | ||
| import LoadingButton from '@mui/lab/LoadingButton'; | ||
| import SaveIcon from '@mui/icons-material/Save'; | ||
|
|
||
| export default function LoadingButtonGroup() { | ||
| return ( | ||
| <ButtonGroup variant="outlined" aria-label="Loading button group"> | ||
| <Button>Submit</Button> | ||
| <LoadingButton>Fetch data</LoadingButton> | ||
| <LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}> | ||
| <Button>Fetch data</Button> | ||
| <Button loading loadingPosition="start" startIcon={<SaveIcon />}> | ||
| Save | ||
| </LoadingButton> | ||
| </Button> | ||
| </ButtonGroup> | ||
| ); | ||
| } |
6 changes: 3 additions & 3 deletions
6
docs/data/material/components/button-group/LoadingButtonGroup.tsx.preview
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <ButtonGroup variant="outlined" aria-label="Loading button group"> | ||
| <Button>Submit</Button> | ||
| <LoadingButton>Fetch data</LoadingButton> | ||
| <LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}> | ||
| <Button>Fetch data</Button> | ||
| <Button loading loadingPosition="start" startIcon={<SaveIcon />}> | ||
| Save | ||
| </LoadingButton> | ||
| </Button> | ||
| </ButtonGroup> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
docs/data/material/components/buttons/IconButtonWithBadge.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import * as React from 'react'; | ||
| import { styled } from '@mui/material/styles'; | ||
| import IconButton from '@mui/material/IconButton'; | ||
| import Badge, { badgeClasses } from '@mui/material/Badge'; | ||
| import ShoppingCartIcon from '@mui/icons-material/ShoppingCartOutlined'; | ||
|
|
||
| const CartBadge = styled(Badge)` | ||
| & .${badgeClasses.badge} { | ||
| top: -12px; | ||
| right: -6px; | ||
| } | ||
| `; | ||
|
|
||
| export default function IconButtonWithBadge() { | ||
| return ( | ||
| <IconButton> | ||
| <ShoppingCartIcon fontSize="small" /> | ||
| <CartBadge badgeContent={2} color="primary" overlap="circular" /> | ||
| </IconButton> | ||
| ); | ||
| } |
21 changes: 21 additions & 0 deletions
21
docs/data/material/components/buttons/IconButtonWithBadge.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| import * as React from 'react'; | ||
| import { styled } from '@mui/material/styles'; | ||
| import IconButton from '@mui/material/IconButton'; | ||
| import Badge, { badgeClasses } from '@mui/material/Badge'; | ||
| import ShoppingCartIcon from '@mui/icons-material/ShoppingCartOutlined'; | ||
|
|
||
| const CartBadge = styled(Badge)` | ||
| & .${badgeClasses.badge} { | ||
| top: -12px; | ||
| right: -6px; | ||
| } | ||
| `; | ||
|
|
||
| export default function IconButtonWithBadge() { | ||
| return ( | ||
| <IconButton> | ||
| <ShoppingCartIcon fontSize="small" /> | ||
| <CartBadge badgeContent={2} color="primary" overlap="circular" /> | ||
| </IconButton> | ||
| ); | ||
| } |
4 changes: 4 additions & 0 deletions
4
docs/data/material/components/buttons/IconButtonWithBadge.tsx.preview
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| <IconButton> | ||
| <ShoppingCartIcon fontSize="small" /> | ||
| <CartBadge badgeContent={2} color="primary" overlap="circular" /> | ||
| </IconButton> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,61 @@ | ||
| import * as React from 'react'; | ||
| import LoadingButton from '@mui/lab/LoadingButton'; | ||
| import Button from '@mui/material/Button'; | ||
| import SaveIcon from '@mui/icons-material/Save'; | ||
| import Stack from '@mui/material/Stack'; | ||
|
|
||
| export default function LoadingButtons() { | ||
| return ( | ||
| <Stack direction="row" spacing={2}> | ||
| <LoadingButton loading variant="outlined"> | ||
| Submit | ||
| </LoadingButton> | ||
| <LoadingButton loading loadingIndicator="Loading…" variant="outlined"> | ||
| Fetch data | ||
| </LoadingButton> | ||
| <LoadingButton | ||
| <Stack spacing={2}> | ||
| <Stack direction="row" spacing={2}> | ||
| <Button loading variant="outlined"> | ||
| Submit | ||
| </Button> | ||
| <Button loading loadingIndicator="Loading…" variant="outlined"> | ||
| Fetch data | ||
| </Button> | ||
| <Button | ||
| loading | ||
| loadingPosition="start" | ||
| startIcon={<SaveIcon />} | ||
| variant="outlined" | ||
| > | ||
| Save | ||
| </Button> | ||
| </Stack> | ||
| <Button | ||
| fullWidth | ||
| loading | ||
| loadingPosition="start" | ||
| startIcon={<SaveIcon />} | ||
| variant="outlined" | ||
| > | ||
| Save | ||
| </LoadingButton> | ||
| Full width | ||
| </Button> | ||
| <Button | ||
| fullWidth | ||
| loading | ||
| loadingPosition="end" | ||
| endIcon={<SaveIcon />} | ||
| variant="outlined" | ||
| > | ||
| Full width | ||
| </Button> | ||
| <Stack direction="row" spacing={2}> | ||
| <Button loading variant="outlined" loadingPosition="start"> | ||
| Submit | ||
| </Button> | ||
| <Button loading variant="outlined" loadingPosition="end"> | ||
| Submit | ||
| </Button> | ||
| <Button | ||
| loading | ||
| variant="outlined" | ||
| loadingPosition="end" | ||
| startIcon={<SaveIcon />} | ||
| > | ||
| Save | ||
| </Button> | ||
| </Stack> | ||
| </Stack> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,61 @@ | ||
| import * as React from 'react'; | ||
| import LoadingButton from '@mui/lab/LoadingButton'; | ||
| import Button from '@mui/material/Button'; | ||
| import SaveIcon from '@mui/icons-material/Save'; | ||
| import Stack from '@mui/material/Stack'; | ||
|
|
||
| export default function LoadingButtons() { | ||
| return ( | ||
| <Stack direction="row" spacing={2}> | ||
| <LoadingButton loading variant="outlined"> | ||
| Submit | ||
| </LoadingButton> | ||
| <LoadingButton loading loadingIndicator="Loading…" variant="outlined"> | ||
| Fetch data | ||
| </LoadingButton> | ||
| <LoadingButton | ||
| <Stack spacing={2}> | ||
| <Stack direction="row" spacing={2}> | ||
| <Button loading variant="outlined"> | ||
| Submit | ||
| </Button> | ||
| <Button loading loadingIndicator="Loading…" variant="outlined"> | ||
| Fetch data | ||
| </Button> | ||
| <Button | ||
| loading | ||
| loadingPosition="start" | ||
| startIcon={<SaveIcon />} | ||
| variant="outlined" | ||
| > | ||
| Save | ||
| </Button> | ||
| </Stack> | ||
| <Button | ||
| fullWidth | ||
| loading | ||
| loadingPosition="start" | ||
| startIcon={<SaveIcon />} | ||
| variant="outlined" | ||
| > | ||
| Save | ||
| </LoadingButton> | ||
| Full width | ||
| </Button> | ||
| <Button | ||
| fullWidth | ||
| loading | ||
| loadingPosition="end" | ||
| endIcon={<SaveIcon />} | ||
| variant="outlined" | ||
| > | ||
| Full width | ||
| </Button> | ||
| <Stack direction="row" spacing={2}> | ||
| <Button loading variant="outlined" loadingPosition="start"> | ||
| Submit | ||
| </Button> | ||
| <Button loading variant="outlined" loadingPosition="end"> | ||
| Submit | ||
| </Button> | ||
| <Button | ||
| loading | ||
| variant="outlined" | ||
| loadingPosition="end" | ||
| startIcon={<SaveIcon />} | ||
| > | ||
| Save | ||
| </Button> | ||
| </Stack> | ||
| </Stack> | ||
| ); | ||
| } |
Oops, something went wrong.