Skip to content

Commit 82878cc

Browse files
committed
Merge remote-tracking branch 'upstream/master' into pr/44476
2 parents c3aded4 + a55c0d0 commit 82878cc

File tree

308 files changed

+3422
-2545
lines changed

Some content is hidden

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

308 files changed

+3422
-2545
lines changed

.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,5 +529,13 @@ module.exports = /** @type {Config} */ ({
529529
'react/react-in-jsx-scope': 'off',
530530
},
531531
},
532+
{
533+
files: ['docs/data/material/getting-started/templates/**/*'],
534+
rules: {
535+
// So we can use # to improve the page UX
536+
// and so developer get eslint warning to remind them to fix the links
537+
'jsx-a11y/anchor-is-valid': 'off',
538+
},
539+
},
532540
],
533541
});

.github/workflows/cherry-pick-next-to-master.yml

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

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
22+
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# 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
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
33+
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: Create cherry-pick PR
2+
on:
3+
pull_request_target:
4+
branches:
5+
- 'next'
6+
- 'v*.x'
7+
- 'master'
8+
types: ['closed']
9+
10+
permissions: {}
11+
12+
jobs:
13+
create_pr:
14+
name: Create cherry-pick PR
15+
uses: mui/mui-public/.github/workflows/prs_create-cherry-pick-pr.yml@master
16+
permissions:
17+
contents: write
18+
pull-requests: write

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: Upload to code-scanning
46-
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
46+
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
4747
with:
4848
sarif_file: results.sarif

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+
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+
20+
21+
- Warn when calling `setMode` without configuring `colorSchemeSelector` (#43783) @siriwatknp
22+
23+
24+
25+
- Add back removed internal function (#44421) @mnajdova
26+
27+
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.

apps/pigment-css-next-app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
},
2525
"devDependencies": {
2626
"@pigment-css/nextjs-plugin": "0.0.27",
27-
"@types/node": "^20.17.6",
27+
"@types/node": "^20.17.7",
2828
"@types/react": "^18.3.12",
2929
"@types/react-dom": "^18.3.1",
3030
"eslint": "^8.57.1",
31-
"typescript": "^5.6.3"
31+
"typescript": "^5.7.2"
3232
},
3333
"nx": {
3434
"targets": {

benchmark/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"dependencies": {
1414
"@babel/runtime": "^7.26.0",
1515
"@chakra-ui/system": "^2.6.2",
16-
"@emotion/react": "^11.13.3",
16+
"@emotion/react": "^11.13.5",
1717
"@emotion/server": "^11.11.0",
18-
"@emotion/styled": "^11.13.0",
18+
"@emotion/styled": "^11.13.5",
1919
"@mui/material": "workspace:^",
2020
"@mui/styles": "workspace:^",
2121
"@mui/system": "workspace:^",

docs/data/base/components/autocomplete/AutocompleteIntroduction/system/index.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ const StyledAutocompleteRoot = styled('div')(
146146
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[500]};
147147
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
148148
border: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
149-
box-shadow: 0px 2px 4px ${
149+
box-shadow: 0 2px 4px ${
150150
theme.palette.mode === 'dark' ? 'rgba(0,0,0, 0.5)' : 'rgba(0,0,0, 0.05)'
151151
};
152152
display: flex;
@@ -210,7 +210,7 @@ const StyledListbox = styled('ul')(
210210
background: ${theme.palette.mode === 'dark' ? grey[900] : '#fff'};
211211
border: 1px solid ${theme.palette.mode === 'dark' ? grey[700] : grey[200]};
212212
color: ${theme.palette.mode === 'dark' ? grey[300] : grey[900]};
213-
box-shadow: 0px 4px 6px ${
213+
box-shadow: 0 4px 6px ${
214214
theme.palette.mode === 'dark' ? 'rgba(0,0,0, 0.3)' : 'rgba(0,0,0, 0.05)'
215215
};
216216
`,
@@ -231,7 +231,7 @@ const StyledOption = styled('li')(
231231
cursor: pointer;
232232
}
233233
234-
&[aria-selected=true] {
234+
&[aria-selected="true"] {
235235
background-color: ${theme.palette.mode === 'dark' ? blue[900] : blue[100]};
236236
color: ${theme.palette.mode === 'dark' ? blue[100] : blue[900]};
237237
}
@@ -246,8 +246,8 @@ const StyledOption = styled('li')(
246246
box-shadow: 0 0 0 3px ${theme.palette.mode === 'dark' ? blue[500] : blue[200]};
247247
}
248248
249-
&[aria-selected=true].Mui-focused,
250-
&[aria-selected=true].Mui-focusVisible {
249+
&[aria-selected="true"].Mui-focused,
250+
&[aria-selected="true"].Mui-focusVisible {
251251
background-color: ${theme.palette.mode === 'dark' ? blue[900] : blue[100]};
252252
color: ${theme.palette.mode === 'dark' ? blue[100] : blue[900]};
253253
}

0 commit comments

Comments
 (0)