Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into add-buttons-templ…
Browse files Browse the repository at this point in the history
…ates
  • Loading branch information
zanivan committed Nov 1, 2024
2 parents b4c7249 + e7783b5 commit 9dd8d27
Show file tree
Hide file tree
Showing 39 changed files with 322 additions and 212 deletions.
52 changes: 52 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,57 @@
# [Versions](https://mui.com/versions/)

## 6.1.6

<!-- generated comparing v6.1.5..master -->

_Oct 30, 2024_

A big thanks to the 13 contributors who made this release possible.

### `@mui/[email protected]`

- [Autocomplete] Add missing `onMouseDown` type to AutocompleteRenderInputParams (#44183) @sai6855
- [Avatar] Fix AvatarGroup spacing (#44208) @aarongarciah
- [AvatarGroup] Fix spacing CSS variable (#44202) @navedqb
- [Divider] Fix CSS specificity order (#44204) @o-alexandrov
- [Slider] Fix value prop type warning (#44131) @joshkel
- Replace `useThemeProps` with `useDefaultProps` (#44193) @siriwatknp

### `@mui/[email protected]`

- Support Next 15.0.0 (#42428) @nphmuller

### `@mui/[email protected]`

- [Tabs] Fix type of TabPanel component (#44207) @blackcow1987

### `@mui/[email protected]`

- Fix system props default import specifier (#44170) @siriwatknp

### `@mui/[email protected]`

- Bring back useIsFocusVisible (#44256) @aarongarciah
- Bring back getReactNodeRef (#44248) @aarongarciah

### Docs

- [material-ui][Avatar] Add AvatarGroup spacing demo (#44209) @aarongarciah
- Fix a typo in CONTRIBUTING.md (#44200) @prakhargupta1
- Mark the Hidden component as deprecated in the sidenav (#44068) @jimmycallin
- Use () when referencing functions (#44184) @oliviertassinari
- Follow types description convention (#44187) @oliviertassinari

### Core

- Lock file maintenance (#43947)
- Run @mui/icon-material src:icons (#44097) @oliviertassinari
- [test][material-ui] Add tests for Pigment Grid and Stack (#44132) @DiegoAndai
- [test] Distinguish private with public tests API (#44188) @oliviertassinari
- [docs-infra] Add recursively the relative modules in the demos (#44150) @mnajdova

All contributors of this release in alphabetical order: @aarongarciah, @blackcow1987, @DiegoAndai, @jimmycallin, @joshkel, @mnajdova, @navedqb, @nphmuller, @o-alexandrov, @oliviertassinari, @prakhargupta1, @sai6855, @siriwatknp

## 6.1.5

<!-- generated comparing v6.1.4..master -->
Expand Down
10 changes: 6 additions & 4 deletions docs/data/material/components/text-fields/text-fields.md
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,12 @@ const MyInputComponent = React.forwardRef((props, ref) => {

// usage
<TextField
InputProps={{
inputComponent: MyInputComponent,
inputProps: {
component: SomeThirdPartyComponent,
slotProps={{
input: {
inputComponent: MyInputComponent,
inputProps: {
component: SomeThirdPartyComponent,
},
},
}}
/>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ export default function SignInCard() {
fullWidth
variant="outlined"
color={emailError ? 'error' : 'primary'}
sx={{ ariaLabel: 'email' }}
/>
</FormControl>
<FormControl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ export default function SignInCard() {
fullWidth
variant="outlined"
color={emailError ? 'error' : 'primary'}
sx={{ ariaLabel: 'email' }}
/>
</FormControl>
<FormControl>
Expand Down
45 changes: 20 additions & 25 deletions docs/data/material/getting-started/templates/sign-in/SignIn.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,10 @@ export default function SignIn(props) {
fullWidth
variant="outlined"
color={emailError ? 'error' : 'primary'}
sx={{ ariaLabel: 'email' }}
/>
</FormControl>
<FormControl>
<Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
<FormLabel htmlFor="password">Password</FormLabel>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'baseline' }}
>
Forgot your password?
</Link>
</Box>
<FormLabel htmlFor="password">Password</FormLabel>
<TextField
error={passwordError}
helperText={passwordErrorMessage}
Expand Down Expand Up @@ -198,18 +186,15 @@ export default function SignIn(props) {
>
Sign in
</Button>
<Typography sx={{ textAlign: 'center' }}>
Don&apos;t have an account?{' '}
<span>
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign up
</Link>
</span>
</Typography>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'center' }}
>
Forgot your password?
</Link>
</Box>
<Divider>or</Divider>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
Expand All @@ -229,6 +214,16 @@ export default function SignIn(props) {
>
Sign in with Facebook
</Button>
<Typography sx={{ textAlign: 'center' }}>
Don&apos;t have an account?{' '}
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign up
</Link>
</Typography>
</Box>
</Card>
</SignInContainer>
Expand Down
45 changes: 20 additions & 25 deletions docs/data/material/getting-started/templates/sign-in/SignIn.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,22 +154,10 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
fullWidth
variant="outlined"
color={emailError ? 'error' : 'primary'}
sx={{ ariaLabel: 'email' }}
/>
</FormControl>
<FormControl>
<Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
<FormLabel htmlFor="password">Password</FormLabel>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'baseline' }}
>
Forgot your password?
</Link>
</Box>
<FormLabel htmlFor="password">Password</FormLabel>
<TextField
error={passwordError}
helperText={passwordErrorMessage}
Expand Down Expand Up @@ -198,18 +186,15 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
>
Sign in
</Button>
<Typography sx={{ textAlign: 'center' }}>
Don&apos;t have an account?{' '}
<span>
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign up
</Link>
</span>
</Typography>
<Link
component="button"
type="button"
onClick={handleClickOpen}
variant="body2"
sx={{ alignSelf: 'center' }}
>
Forgot your password?
</Link>
</Box>
<Divider>or</Divider>
<Box sx={{ display: 'flex', flexDirection: 'column', gap: 2 }}>
Expand All @@ -229,6 +214,16 @@ export default function SignIn(props: { disableCustomTheme?: boolean }) {
>
Sign in with Facebook
</Button>
<Typography sx={{ textAlign: 'center' }}>
Don&apos;t have an account?{' '}
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign up
</Link>
</Typography>
</Box>
</Card>
</SignInContainer>
Expand Down
22 changes: 10 additions & 12 deletions docs/data/material/getting-started/templates/sign-up/SignUp.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,18 +194,6 @@ export default function SignUp(props) {
>
Sign up
</Button>
<Typography sx={{ textAlign: 'center' }}>
Already have an account?{' '}
<span>
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign in
</Link>
</span>
</Typography>
</Box>
<Divider>
<Typography sx={{ color: 'text.secondary' }}>or</Typography>
Expand All @@ -227,6 +215,16 @@ export default function SignUp(props) {
>
Sign up with Facebook
</Button>
<Typography sx={{ textAlign: 'center' }}>
Already have an account?{' '}
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign in
</Link>
</Typography>
</Box>
</Card>
</SignUpContainer>
Expand Down
22 changes: 10 additions & 12 deletions docs/data/material/getting-started/templates/sign-up/SignUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -194,18 +194,6 @@ export default function SignUp(props: { disableCustomTheme?: boolean }) {
>
Sign up
</Button>
<Typography sx={{ textAlign: 'center' }}>
Already have an account?{' '}
<span>
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign in
</Link>
</span>
</Typography>
</Box>
<Divider>
<Typography sx={{ color: 'text.secondary' }}>or</Typography>
Expand All @@ -227,6 +215,16 @@ export default function SignUp(props: { disableCustomTheme?: boolean }) {
>
Sign up with Facebook
</Button>
<Typography sx={{ textAlign: 'center' }}>
Already have an account?{' '}
<Link
href="/material-ui/getting-started/templates/sign-in/"
variant="body2"
sx={{ alignSelf: 'center' }}
>
Sign in
</Link>
</Typography>
</Box>
</Card>
</SignUpContainer>
Expand Down
1 change: 1 addition & 0 deletions docs/pages/material-ui/api/rating.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"props": {
"classes": { "type": { "name": "object" }, "additionalInfo": { "cssApi": true } },
"component": { "type": { "name": "elementType" } },
"defaultValue": { "type": { "name": "number" }, "default": "null" },
"disabled": { "type": { "name": "bool" }, "default": "false" },
"emptyIcon": { "type": { "name": "node" }, "default": "<StarBorder fontSize=\"inherit\" />" },
Expand Down
3 changes: 3 additions & 0 deletions docs/translations/api-docs/rating/rating.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
"componentDescription": "",
"propDescriptions": {
"classes": { "description": "Override or extend the styles applied to the component." },
"component": {
"description": "The component used for the root node. Either a string to use a HTML element or a component."
},
"defaultValue": {
"description": "The default value. Use when the component is not controlled."
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/monorepo",
"version": "6.1.5",
"version": "6.1.6",
"private": true,
"scripts": {
"preinstall": "npx only-allow pnpm",
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/babel-plugin-minify-errors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-babel-plugin-minify-errors",
"version": "1.0.12",
"version": "1.0.13",
"author": "MUI Team",
"description": "This is an internal package not meant for general use.",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/scripts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-scripts",
"version": "1.0.25",
"version": "1.0.26",
"author": "MUI Team",
"description": "Utilities supporting MUI libraries build and docs generation. This is an internal package not meant for general use.",
"main": "build/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages-internal/test-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-test-utils",
"version": "1.0.18",
"version": "1.0.19",
"author": "MUI Team",
"description": "Utilities for MUI tests. This is an internal package not meant for general use.",
"main": "./build/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/internal-markdown",
"version": "1.0.18",
"version": "1.0.19",
"author": "MUI Team",
"description": "MUI markdown parser. This is an internal package not meant for general use.",
"main": "./index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-base/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/base",
"version": "5.0.0-beta.60",
"version": "5.0.0-beta.61",
"private": false,
"author": "MUI Team",
"description": "Base UI is a library of headless ('unstyled') React components and low-level hooks. You gain complete control over your app's CSS and accessibility features.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/codemod",
"version": "6.1.5",
"version": "6.1.6",
"bin": "./codemod.js",
"private": false,
"author": "MUI Team",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-core-downloads-tracker/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/core-downloads-tracker",
"version": "6.1.5",
"version": "6.1.6",
"private": false,
"author": "MUI Team",
"description": "Internal package to track number of downloads of our design system libraries",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/docs",
"version": "6.1.5",
"version": "6.1.6",
"private": false,
"author": "MUI Team",
"description": "MUI Docs - Documentation building blocks.",
Expand Down
2 changes: 1 addition & 1 deletion packages/mui-envinfo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mui/envinfo",
"version": "2.0.28",
"version": "2.0.29",
"private": false,
"author": "MUI Team",
"description": "Logs infos about the environment relevant to @mui/*",
Expand Down
Loading

0 comments on commit 9dd8d27

Please sign in to comment.