Skip to content

Commit f9367be

Browse files
committed
Merge branch 'master' into fix-autocomplete
2 parents 45e9b82 + d0ab052 commit f9367be

File tree

646 files changed

+10295
-11992
lines changed

Some content is hidden

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

646 files changed

+10295
-11992
lines changed

.circleci/config.yml

Lines changed: 117 additions & 169 deletions
Large diffs are not rendered by default.

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/.git
2-
/.yarn
32
/coverage
43
/docs/export
54
/docs/pages/playground/
@@ -17,7 +16,6 @@
1716
/packages/mui-icons-material/material-icons/
1817
/packages/mui-icons-material/src/*.js
1918
/packages/mui-icons-material/templateSvgIcon.js
20-
/packages/mui-utils/macros/__fixtures__/
2119
# Ignore fixtures
2220
/packages-internal/scripts/typescript-to-proptypes/test/*/*
2321
/test/bundling/fixtures/**/*.fixture.js

.eslintrc.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
// @ts-check
2+
3+
/**
4+
* @typedef {import('eslint').Linter.Config} Config
5+
*/
6+
17
const path = require('path');
28

39
const OneLevelImportMessage = [
@@ -39,7 +45,7 @@ const NO_RESTRICTED_IMPORTS_PATTERNS_DEEPLY_NESTED = [
3945
},
4046
];
4147

42-
module.exports = {
48+
module.exports = /** @type {Config} */ ({
4349
root: true, // So parent files don't get applied
4450
env: {
4551
es6: true,
@@ -228,6 +234,10 @@ module.exports = {
228234
"The 'use client' pragma can't be used with export * in the same module. This is not supported by Next.js.",
229235
selector: 'ExpressionStatement[expression.value="use client"] ~ ExportAllDeclaration',
230236
},
237+
{
238+
message: 'Do not call `Error(...)` without `new`. Use `new Error(...)` instead.',
239+
selector: "CallExpression[callee.name='Error']",
240+
},
231241
],
232242

233243
// We re-export default in many places, remove when https://github.com/airbnb/javascript/issues/2500 gets resolved
@@ -240,6 +250,8 @@ module.exports = {
240250
'react/jsx-no-useless-fragment': ['error', { allowExpressions: true }],
241251
'lines-around-directive': 'off',
242252
...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'error' } : {}),
253+
// Prevent the use of `e` as a shorthand for `event`, `error`, etc.
254+
'id-denylist': ['error', 'e'],
243255
},
244256
overrides: [
245257
{
@@ -524,4 +536,4 @@ module.exports = {
524536
},
525537
},
526538
],
527-
};
539+
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
21+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2222
with:
2323
fetch-depth: 0
2424
- name: Cherry pick and create the new PR

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ jobs:
2424
os: [macos-latest, windows-latest, ubuntu-latest]
2525
steps:
2626
- run: echo "${{ github.actor }}"
27-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
27+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2828
with:
2929
# fetch all tags which are required for `pnpm release:changelog`
3030
fetch-depth: 0
3131
- name: Set up pnpm
3232
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
3333
- name: Use Node.js 20.x
34-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
34+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
3535
with:
3636
node-version: 20
3737
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

.github/workflows/codeql.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
security-events: write
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
19+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
22+
uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
33+
uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10

.github/workflows/publish-canaries.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
publish:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
12+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1313
with:
1414
fetch-depth: 0
1515
- name: Set up pnpm
1616
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
1717
- name: Use Node.js 20.x
18-
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
18+
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
1919
with:
2020
node-version: 20
2121
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout code
25-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
25+
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2626
with:
2727
persist-credentials: false
2828

@@ -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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
46+
uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
4747
with:
4848
sarif_file: results.sarif

.github/workflows/support-stackoverflow.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ jobs:
2424
issue-comment: |
2525
👋 Thanks for using this project!
2626
27-
We use GitHub issues exclusively as a bug and feature requests tracker, however,
28-
this issue appears to be a support request.
27+
We use GitHub issues exclusively as a bug and feature requests tracker, however, this issue appears to be a support request.
2928
3029
For support with Material UI please check out https://mui.com/material-ui/getting-started/support/. Thanks!
3130

.github/workflows/vale-action.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,14 @@ jobs:
1212
contents: read
1313
pull-requests: write
1414
steps:
15-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
15+
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
1616
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
1717
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
1818
with:
19+
# Errors should be more visible
1920
fail_on_error: true
21+
# The other reports don't work, not really https://github.com/reviewdog/reviewdog#reporters
2022
reporter: github-pr-check
23+
# Required, set by GitHub actions automatically:
24+
# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#about-the-github_token-secret
2125
token: ${{secrets.GITHUB_TOKEN}}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ docs/public/static/blog/feed/*
4242
.github/styles/
4343
.nx/cache
4444
.nx/workspace-data
45+
screenshots
46+
packed

CHANGELOG.md

Lines changed: 199 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,204 @@
11
# [Versions](https://mui.com/versions/)
22

3-
## 6.0.2
3+
## v6.1.2
4+
5+
<!-- generated comparing v6.1.1..master -->
6+
7+
_Oct 2, 2024_
8+
9+
A big thanks to the 13 contributors who made this release possible.
10+
11+
12+
13+
- [Autocomplete] Fix listbox opens and closes on click when used with `limitTags` (#42494) @appleSimple
14+
- [Button] Ignore `dark` and `contrastText` if not provided in the theme (#43861) @siriwatknp
15+
- [Button] Fix regression for color `inherit` (#43862) @siriwatknp
16+
- [LinearProgress] Fix background color (#43949) @sai6855
17+
- Support CSS variables with shadow DOM (#43948) @siriwatknp
18+
- [Rating] Use Rating `name` as prefix of input element ids (#43829) @yash49
19+
- [Drawer] Fix issue with main window being used instead of iframe's window (#43818) @albarv340
20+
- [ThemeProvider] Support setting default mode (#43951) @siriwatknp
21+
22+
### Docs
23+
24+
- Update theme toggle demo (#43956) @Janpot
25+
- Add note about minimum required webpack version (#43864) @Janpot
26+
- Format Pigment CSS docs (#43812) @oliviertassinari
27+
- Fix visual bug on dashboard template (#43836) @oliviertassinari
28+
- Fix pigment-css.md syntax error (#43837) @kdichev
29+
- Fix Sign-in template form experience (#43838) @oliviertassinari
30+
- Remove "To be continued" section from v0 –> v1 migration guide (#43832) @samuelsycamore
31+
- Fix 301 to chromium (#43809) @oliviertassinari
32+
- [joy-ui] Add missing ComponentLinkHeader components (#43865) @samuelsycamore
33+
- [Modal] Remove unnecessary type assertion (#43825) @ZeeshanTamboli
34+
- [Table] Stabilize random series in virtualized table demo (#43744) @Janpot
35+
- [system] Add migration guide link to `@mui/styles` pages (#43833) @samuelsycamore
36+
37+
### Core
38+
39+
- [code-infra] Fix flaky dashboard screenshot - take 2 (#43937) @Janpot
40+
- [code-infra] Replace all instances of `e` with `event` and add eslint rule (#43866) @samuelsycamore
41+
- [code-infra] Fix and update bundling fixtures (#43709) @Janpot
42+
- [code-infra] Update transitive dependencies with vulnerabilties (#43895) @Janpot
43+
- [code-infra] Optimize regression tests (#43889) @Janpot
44+
- [code-infra] Remove custom playwright installation steps (#43881) @Janpot
45+
- [code-infra] Fix flaky dashboard screenshot (#43890) @Janpot
46+
- [code-infra] Add new instanceof proptypes for toolpad (#43814) @Janpot
47+
- Fix eslint-plugin-react-compiler issues in usePagination tests (#43946) @wilhelmlofsten
48+
- Uniformity in version range @oliviertassinari
49+
- Replace `toBeAriaHidden` matcher with `toBeInaccessible` in tests (#43870) @ZeeshanTamboli
50+
- [docs-infra] Strengthen CSP (#43711) @oliviertassinari
51+
- [docs-infra] Open Codesandbox demo with fontsize=12 (#43860) @siriwatknp
52+
- [icons] Reduce Material Icon page size (#43911) @oliviertassinari
53+
- [test] Point Istanbul to correct URL (#43935) @sai6855
54+
- [test] Sync React.version parse logic with codebase (#43820) @oliviertassinari
55+
- Improve getReactElementRef() utils (#43022) @sai6855
56+
- [Drawer] Refactor getScrollbarSize usages (#43828) @BrianWoolfolk
57+
- [Modal] Replace `show` parameter name with `hide` in modal manager (#43868) @ZeeshanTamboli
58+
- [Modal] Remove unnecessary `manager` prop handling (#43867) @ZeeshanTamboli
59+
60+
All contributors of this release in alphabetical order: @albarv340, @appleSimple, @BrianWoolfolk, @DanailH, @Janpot, @kdichev, @oliviertassinari, @sai6855, @samuelsycamore, @siriwatknp, @wilhelmlofsten, @yash49, @ZeeshanTamboli
61+
62+
## v6.1.1
63+
64+
<!-- generated comparing v6.1.0..master -->
65+
66+
_Sep 19, 2024_
67+
68+
A big thanks to the 18 contributors who made this release possible.
69+
70+
71+
72+
- [Grid] Bring back `GridProps` and `GridTypeMap` (#43717) @DiegoAndai
73+
- [Paper] Fix wrong background-image on Paper when elevation is 0 (#43723) @ZeeshanTamboli
74+
- [Skeleton] Fix wave animation for styled-components (#43740) @siriwatknp
75+
- [Modal] Fix event handlers overriding behavior (#43757) @sai6855
76+
77+
78+
79+
- Pass the stylesheet directly to `GlobalStyles` (#43739) @siriwatknp
80+
81+
82+
83+
- Fix "useId" & "useSyncExternalStore" imports to not be statically analyzable (#43360) @yash49
84+
85+
### Docs
86+
87+
- [material-ui][Breadcrumbs] Document CondensedWithMenu option for Breadcrumbs (#42973) @Sergio16T
88+
- [material-ui][CircularProgress] Add Circular size demo (#43734) @sai6855
89+
- [material-ui][slider] Fix slider in color customization playground twitches when sliding (#43671) @Nashyn
90+
- [material-ui][slider] Polish Music player demo (#43748) @oliviertassinari
91+
- [material-ui] Document Typography color prop breaking change (#43735) @aarongarciah
92+
- [material-ui] Add docs for complementary Table components (#43756) @Juneezee
93+
- [material-ui] Improve minimizing bundle docs (#43781) @ZeeshanTamboli
94+
- [pigment-css] Call out Pigment being in alpha (#43725) @aarongarciah
95+
- [pigment-css] Fix typo globalCSS -> globalCss (#43754) @hiro0218
96+
- [test] Improve demos for better regression screenshots (#43742) @aarongarciah
97+
- Fix minor typo (#42899) @xconverge
98+
- Revert icon search virtualization (#43569) @Janpot
99+
- Fix MUI Treasury Layout broken links (#43752) @oliviertassinari
100+
- Fix 301 link to design asset @oliviertassinari
101+
- Update release schedule table after v6 stable (#43726) @sahil-ag
102+
- Fix bundle size link regression @oliviertassinari
103+
104+
### Core
105+
106+
- [code-infra] Allow overriding all `options` of `useFakeTimers` function (#43729) @LukasTy
107+
- [core] Fix 301 link to Next.js and git diff @oliviertassinari
108+
- [core] Fix package.json repository rule @oliviertassinari
109+
- [core] Remove redundant window @oliviertassinari
110+
- [core] Fix some issues reported by eslint-plugin-react-compiler (#43117) @binsmyth
111+
- [core] Replace more `indexOf` with `includes` (#43694) @Juneezee
112+
- [core] Remove /.yarn (#43712) @oliviertassinari
113+
- [docs-infra] Enable synthetic default imports in TypeScript config (#43747) @morozow
114+
- [docs-infra] Fix Vale config for TypeScript references (#43751) @oliviertassinari
115+
- [docs-infra] Fix toolbar arrow order (#43627) @oliviertassinari
116+
- [docs-infra] Fix missing dependencies in multi-tab demos (#43713) @cherniavskii
117+
- [docs-infra] Fix API search link regression (#43662) @oliviertassinari
118+
- [test] Update font-awesome CSS file in regression tests fixture (#43745) @Janpot
119+
- [test] Remove position:relative from regression container (#43743) @aarongarciah
120+
- [test] Remove top-level inline-block from the regression tests (#43656) @Janpot
121+
- [website] Match pricing page with linked page h1 @oliviertassinari
122+
123+
All contributors of this release in alphabetical order: @aarongarciah, @binsmyth, @cherniavskii, @DiegoAndai, @Janpot, @Juneezee, @LukasTy, @mnajdova, @morozow, @Nashyn, @oliviertassinari, @sahil-ag, @sai6855, @Sergio16T, @siriwatknp, @xconverge, @yash49, @ZeeshanTamboli
124+
125+
## v6.1.0
126+
127+
<!-- generated comparing v6.0.2..master -->
128+
129+
_Sep 10, 2024_
130+
131+
A big thanks to the 21 contributors who made this release possible. Here are the highlights ✨:
132+
133+
- **Minor version changes**: To solve longstanding ESM compatibility issues we added [package exports](https://nodejs.org/api/packages.html#exports) to `@mui/icons-material` (#43624). This change is backwards compatible with previously recommended setups. Bundlers that don't support the `exports` field won't be affected. If you discover any issues, please reach out by creating a GitHub issue.
134+
- This release also includes several fixes and documentation improvements to support the Material UI v6 upgrade.
135+
136+
137+
138+
- Add exports field to package.json (#43624) @Janpot
139+
140+
141+
142+
- [Autocomplete] Add custom props support via `slotProps` (#43613) @Michael-Hutchinson
143+
- [Dialog] Fix broken scrolling in full screen mode (#43626) @LuseBiswas
144+
- [Grid] Revert wrap deprecation (#42363) (#43459) @DiegoAndai
145+
- Improve color map filter on styles (#43579) @DiegoAndai
146+
- Return styles directly if the selector is `&` when using `applyStyles` (#43633) @siriwatknp
147+
- [types] Make slots partial in `CreateSlotsAndSlotProp`type (#42077) @lhilgert9
148+
- [Radio] Fix disabled state styling regression (#43592) @mnajdova
149+
- Fix wrong import to type (#43584) @mnajdova
150+
- Simplify version prerelease export (#43699) @DiegoAndai
151+
152+
153+
154+
- Use a custom sheet to set prepend for `GlobalStyles` (#43632) @siriwatknp
155+
- Simplify version prerelease export (#43699) @DiegoAndai
156+
157+
### Docs
158+
159+
- [material-ui][Autocomplete] Refactor asynchronous loading demo (#43630) @sai6855
160+
- [material-ui][Autocomplete] Fix GitHubLabel demo input background color (#43599) @sai6855
161+
- [material-ui] Update Next.js font optimization guide (#43196) @siriwatknp
162+
- [material-ui] Fix getting started with CSS variables in theme example (#43658) @Designer023
163+
- [material-ui][system] Edit "How to use components selector API" section to add about direct import (#43377) @IAluI
164+
- [material-ui] Update @mui/material-nextjs import examples to v14 (#43698) @ohmsl
165+
- Fix typo in Divider doc (#43691) @lokendra-reco
166+
- Add Anima section to documentation (#43673) @GoOrit-Anima
167+
- Add Integrations section to design resources page (#43612) @zanivan
168+
- Fix versions URL @oliviertassinari
169+
- Keep showing next under the subdomain @oliviertassinari
170+
- Add Next.js font optimization section to Pigment CSS migration (#43631) @siriwatknp
171+
- Update the Material UI readme post-v6 (#43504) @samuelsycamore
172+
- Bring back v5 release changelogs (#43460) @oliviertassinari
173+
- Fix use of absolute URLs (#43567) @oliviertassinari
174+
- Remove explicit `date-fns` dependency (#40823) @renovate[bot]
175+
- [pigment-css] Add guide for Pigment CSS quickstart (#43395) @alelthomas
176+
- [system] Fix link to createCssVarsProvider (#43661) @oliviertassinari
177+
- Add scrollbar to color picker demo (#43672) @sai6855
178+
179+
### Core
180+
181+
- [blog] Uniformalize version between projects @oliviertassinari
182+
- [blog] Fix page layout shift @oliviertassinari
183+
- [code-infra] Build size snapshots from installed packages (#43452) @Janpot
184+
- [code-infra] Recreate lockfile (#43623) @Janpot
185+
- [code-infra] Make the API docs builder more configurable (#43574) @michaldudak
186+
- [code-infra] Update runners from node 18 to 20 for GHA (#43593) @JCQuintas
187+
- [code-infra] Update runners from node 18 to 20 (#43591) @JCQuintas
188+
- [docs-infra] Fix axe issue scroll-to-top without landmark (#43663) @oliviertassinari
189+
- [docs-infra] Reduce Algolia index size, no need for lvl6 @oliviertassinari
190+
- [docs-infra] Use embed as the default for opening CodeSandbox (#43618) @siriwatknp
191+
- [docs-infra] Fix broken anchor button when header has a link (#43598) @cherniavskii
192+
- [docs-infra] Open Sign-in and Dashboard template with CodeSandbox/StackBlitz (#43604) @siriwatknp
193+
- [examples] Fix CDN live preview demo (#43641) @oliviertassinari
194+
- Add Pigment CSS screenshot test (#43280) @mnajdova
195+
- [website] Polish gold sponsors @oliviertassinari
196+
- [website] Add CopyCopter as gold sponsor (#43595) @zanivan
197+
- [website] Add disabled button styles to branding theme (#43577) @zanivan
198+
199+
All contributors of this release in alphabetical order: @alelthomas, @cherniavskii, @Designer023, @DiegoAndai, @GoOrit-Anima, @IAluI, @Janpot, @JCQuintas, @lhilgert9, @lokendra-reco, @LuseBiswas, @Michael-Hutchinson, @michaldudak, @mnajdova, @ohmsl, @oliviertassinari, @renovate[bot], @sai6855, @samuelsycamore, @siriwatknp, @zanivan
200+
201+
## v6.0.2
4202

5203
<!-- generated comparing v6.0.1..master -->
6204

0 commit comments

Comments
 (0)