Skip to content

Commit

Permalink
Merge branch 'master' into add-roboto-import-nextjs
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli committed Nov 23, 2024
2 parents 87dbb4e + 7d0e66b commit f99aa43
Show file tree
Hide file tree
Showing 143 changed files with 2,528 additions and 1,735 deletions.
8 changes: 8 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -529,5 +529,13 @@ module.exports = /** @type {Config} */ ({
'react/react-in-jsx-scope': 'off',
},
},
{
files: ['docs/data/material/getting-started/templates/**/*'],
rules: {
// So we can use # to improve the page UX
// and so developer get eslint warning to remind them to fix the links
'jsx-a11y/anchor-is-valid': 'off',
},
},
],
});
34 changes: 0 additions & 34 deletions .github/workflows/cherry-pick-next-to-master.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
18 changes: 18 additions & 0 deletions .github/workflows/create-cherry-pick-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Create cherry-pick PR
on:
pull_request_target:
branches:
- 'next'
- 'v*.x'
- 'master'
types: ['closed']

permissions: {}

jobs:
create_pr:
name: Create cherry-pick PR
uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@master
permissions:
contents: write
pull-requests: write
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
with:
sarif_file: results.sarif
51 changes: 51 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,56 @@
# [Versions](https://mui.com/versions/)

## v6.1.8

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

_Nov 20, 2024_

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

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

- [Autocomplete] Use `ul` element for the listbox (#44422) @DiegoAndai
- [Grid2] Remove item and zeroMinWidth classes from grid2Classes (#44419) @sai6855
- [StepIcon] Add SvgIconOwnProps type to StepIcon props (#44337) @sai6855
- Add generic back to `useMediaQuery` to prevent a breaking change (#44455) @siriwatknp
- [Tooltip] Deprecate `*Component` and `*Props` for v6 (#44350) @siriwatknp

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

- Warn when calling `setMode` without configuring `colorSchemeSelector` (#43783) @siriwatknp

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

- Add back removed internal function (#44421) @mnajdova

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

- Skip deep clone React element (#44400) @siriwatknp
- Add documentation to `useForkRef` (#44410) @JCQuintas

### Docs

- [Accordion] Replace hardcoded classes with constants in demos (#44453) @ZeeshanTamboli
- [material-ui][Autocomplete] Fix virtualization demo (#44382) @DiegoAndai
- Revert #44388 (#44454) @prakhargupta1
- Add App starters in related-projects.md (#44315) @oliviertassinari
- Bring back `*Component` and `*Props` codemods and deprecation messages (#44383) @DiegoAndai
- [docs] Copyedit Templates page (#44461) @samuelsycamore

### Core

- Remove `stylis-plugin-rtl-sc` (#44447) @renovate[bot]
- [test][Autocomplete] Make virtualize regression screenshots deterministic (#44425) @DiegoAndai
- [blog] Fix reference to subdomain on MUI X v8 alpha zero post (#44416) @joserodolfofreitas
- [blog] MUI X v8 alpha zero blog post (#44377) @joserodolfofreitas
- [code-infra] Use vitest-compatible skip in `describeConformance` (#44412) @JCQuintas
- Keep OpenSSF badge up-to-date (aef2bf2) @oliviertassinari
- Polish useForkRef docs (#44424) @oliviertassinari
- [infra] Upgrade Cherry-pick workflow to latest (#44448) @oliviertassinari

All contributors of this release in alphabetical order: @DiegoAndai, @JCQuintas, @joserodolfofreitas, @mnajdova, @oliviertassinari, @prakhargupta1, @sai6855, samuelsycamore, @siriwatknp, @ZeeshanTamboli

## v6.1.7

<!-- generated comparing v6.1.6..master -->
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ View the [Joy UI documentation](https://mui.com/joy-ui/getting-started/).
<p>
<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>
<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>
<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>
</p>

Diamond sponsors are those who have pledged \$1,500/month or more to MUI.
Expand Down Expand Up @@ -100,6 +99,8 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
&nbsp;
<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>
&nbsp;
<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>
&nbsp;
</p>

Gold sponsors are those who have pledged \$500/month or more to MUI.
Expand Down
7 changes: 0 additions & 7 deletions docs/data/base/components/switch/UseSwitchesCustom.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,10 @@ const SwitchThumb = styled('span')`
content: '';
width: 100%;
height: 100%;
/* false positive: */
/* stylelint-disable unit-no-unknown */
background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 20 20"><path fill="${encodeURIComponent(
'#fff',
)}" d="M9.305 1.667V3.75h1.389V1.667h-1.39zm-4.707 1.95l-.982.982L5.09 6.072l.982-.982-1.473-1.473zm10.802 0L13.927 5.09l.982.982 1.473-1.473-.982-.982zM10 5.139a4.872 4.872 0 00-4.862 4.86A4.872 4.872 0 0010 14.862 4.872 4.872 0 0014.86 10 4.872 4.872 0 0010 5.139zm0 1.389A3.462 3.462 0 0113.471 10a3.462 3.462 0 01-3.473 3.472A3.462 3.462 0 016.527 10 3.462 3.462 0 0110 6.528zM1.665 9.305v1.39h2.083v-1.39H1.666zm14.583 0v1.39h2.084v-1.39h-2.084zM5.09 13.928L3.616 15.4l.982.982 1.473-1.473-.982-.982zm9.82 0l-.982.982 1.473 1.473.982-.982-1.473-1.473zM9.305 16.25v2.083h1.389V16.25h-1.39z"/></svg>')
center center no-repeat;
/* stylelint-enable unit-no-unknown */
}
&.focusVisible {
Expand All @@ -97,12 +93,9 @@ const SwitchThumb = styled('span')`
transform: translateX(24px);
&::before {
/* false positive: */
/* stylelint-disable unit-no-unknown */
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 20 20"><path fill="${encodeURIComponent(
'#fff',
)}" d="M4.2 2.5l-.7 1.8-1.8.7 1.8.7.7 1.8.6-1.8L6.7 5l-1.9-.7-.6-1.8zm15 8.3a6.7 6.7 0 11-6.6-6.6 5.8 5.8 0 006.6 6.6z"/></svg>');
/* stylelint-enable unit-no-unknown */
}
}
`;
Expand Down
7 changes: 0 additions & 7 deletions docs/data/base/components/switch/UseSwitchesCustom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,10 @@ const SwitchThumb = styled('span')`
content: '';
width: 100%;
height: 100%;
/* false positive: */
/* stylelint-disable unit-no-unknown */
background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 20 20"><path fill="${encodeURIComponent(
'#fff',
)}" d="M9.305 1.667V3.75h1.389V1.667h-1.39zm-4.707 1.95l-.982.982L5.09 6.072l.982-.982-1.473-1.473zm10.802 0L13.927 5.09l.982.982 1.473-1.473-.982-.982zM10 5.139a4.872 4.872 0 00-4.862 4.86A4.872 4.872 0 0010 14.862 4.872 4.872 0 0014.86 10 4.872 4.872 0 0010 5.139zm0 1.389A3.462 3.462 0 0113.471 10a3.462 3.462 0 01-3.473 3.472A3.462 3.462 0 016.527 10 3.462 3.462 0 0110 6.528zM1.665 9.305v1.39h2.083v-1.39H1.666zm14.583 0v1.39h2.084v-1.39h-2.084zM5.09 13.928L3.616 15.4l.982.982 1.473-1.473-.982-.982zm9.82 0l-.982.982 1.473 1.473.982-.982-1.473-1.473zM9.305 16.25v2.083h1.389V16.25h-1.39z"/></svg>')
center center no-repeat;
/* stylelint-enable unit-no-unknown */
}
&.focusVisible {
Expand All @@ -97,12 +93,9 @@ const SwitchThumb = styled('span')`
transform: translateX(24px);
&::before {
/* false positive: */
/* stylelint-disable unit-no-unknown */
background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" height="20" width="20" viewBox="0 0 20 20"><path fill="${encodeURIComponent(
'#fff',
)}" d="M4.2 2.5l-.7 1.8-1.8.7 1.8.7.7 1.8.6-1.8L6.7 5l-1.9-.7-.6-1.8zm15 8.3a6.7 6.7 0 11-6.6-6.6 5.8 5.8 0 006.6 6.6z"/></svg>');
/* stylelint-enable unit-no-unknown */
}
}
`;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
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>
<Button>Fetch data</Button>
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
<LoadingButton>Fetch data</LoadingButton>
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
Save
</Button>
</LoadingButton>
</ButtonGroup>
);
}
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
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>
<Button>Fetch data</Button>
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
<LoadingButton>Fetch data</LoadingButton>
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
Save
</Button>
</LoadingButton>
</ButtonGroup>
);
}
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>
<Button>Fetch data</Button>
<Button loading loadingPosition="start" startIcon={<SaveIcon />}>
<LoadingButton>Fetch data</LoadingButton>
<LoadingButton loading loadingPosition="start" startIcon={<SaveIcon />}>
Save
</Button>
</LoadingButton>
</ButtonGroup>
8 changes: 5 additions & 3 deletions docs/data/material/components/button-group/button-group.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
productId: material-ui
title: React Button Group component
components: Button, ButtonGroup
components: Button, ButtonGroup, LoadingButton
githubLabel: 'component: ButtonGroup'
githubSource: packages/mui-material/src/ButtonGroup
---
Expand Down Expand Up @@ -49,8 +49,10 @@ You can remove the elevation with the `disableElevation` prop.

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

## Loading
## Experimental APIs

Use the `loading` prop from `Button` to set buttons in a loading state and disable interactions.
### Loading button

You can use the [`<LoadingButton />`](/material-ui/react-button/#loading-button) from [`@mui/lab`](/material-ui/about-the-lab/) in the button group.

{{"demo": "LoadingButtonGroup.js"}}
37 changes: 0 additions & 37 deletions docs/data/material/components/buttons/IconButtonWithBadge.js

This file was deleted.

37 changes: 0 additions & 37 deletions docs/data/material/components/buttons/IconButtonWithBadge.tsx

This file was deleted.

This file was deleted.

Loading

0 comments on commit f99aa43

Please sign in to comment.