Skip to content

Commit 08993f2

Browse files
committed
Merge branch 'master' of github.com:mui/material-ui into fix/types-theme-components2
2 parents ccebdd4 + 1367a94 commit 08993f2

File tree

39 files changed

+926
-992
lines changed

39 files changed

+926
-992
lines changed

.circleci/config.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274
<<: *default-job
275275
resource_class: 'medium+'
276276
docker:
277-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
277+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
278278
steps:
279279
- checkout
280280
- install_js:
@@ -302,7 +302,7 @@ jobs:
302302
test_e2e:
303303
<<: *default-job
304304
docker:
305-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
305+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
306306
steps:
307307
- checkout
308308
- install_js:
@@ -314,7 +314,7 @@ jobs:
314314
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
315315
<<: *default-job
316316
docker:
317-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
317+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
318318
steps:
319319
- checkout
320320
- install_js:
@@ -327,7 +327,7 @@ jobs:
327327
test_profile:
328328
<<: *default-job
329329
docker:
330-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
330+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
331331
steps:
332332
- checkout
333333
- install_js:
@@ -352,7 +352,7 @@ jobs:
352352
test_regressions:
353353
<<: *default-job
354354
docker:
355-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
355+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
356356
steps:
357357
- checkout
358358
- install_js:
@@ -427,7 +427,7 @@ jobs:
427427
test_bundling_next_webpack4:
428428
<<: *default-job
429429
docker:
430-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
430+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
431431
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
432432
steps:
433433
- checkout:
@@ -445,7 +445,7 @@ jobs:
445445
test_bundling_next_webpack5:
446446
<<: *default-job
447447
docker:
448-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
448+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
449449
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
450450
steps:
451451
- checkout:
@@ -463,7 +463,7 @@ jobs:
463463
test_bundling_create_react_app:
464464
<<: *default-job
465465
docker:
466-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
466+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
467467
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
468468
steps:
469469
- checkout:
@@ -481,7 +481,7 @@ jobs:
481481
test_bundling_snowpack:
482482
<<: *default-job
483483
docker:
484-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
484+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
485485
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
486486
steps:
487487
- checkout:
@@ -499,7 +499,7 @@ jobs:
499499
test_bundling_vite:
500500
<<: *default-job
501501
docker:
502-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
502+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
503503
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
504504
steps:
505505
- checkout:
@@ -517,7 +517,7 @@ jobs:
517517
test_bundling_esbuild:
518518
<<: *default-job
519519
docker:
520-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
520+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
521521
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
522522
steps:
523523
- checkout:
@@ -535,7 +535,7 @@ jobs:
535535
test_bundling_gatsby:
536536
<<: *default-job
537537
docker:
538-
- image: mcr.microsoft.com/playwright:v1.55.1-noble
538+
- image: mcr.microsoft.com/playwright:v1.56.0-noble
539539
environment:
540540
GATSBY_CPU_COUNT: '3'
541541
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# fetch all tags which are required for `pnpm release:changelog`
3535
fetch-depth: 0
3636
- name: Set up pnpm
37-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
37+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
3838
- name: Use Node.js
3939
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
4040
with:

.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@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
22+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
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@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
33+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8

.github/workflows/priority-support-validation-prompt.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Find Comment
19-
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
19+
uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4
2020
id: findComment
2121
with:
2222
issue-number: ${{ github.event.issue.number }}
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Create comment
2727
if: ${{ steps.findComment.outputs.comment-id == '' && contains(github.event.label.name, 'unknown') }}
28-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
28+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
2929
with:
3030
issue-number: ${{ github.event.issue.number }}
3131
body: |
@@ -39,7 +39,7 @@ jobs:
3939
4040
- name: Update comment
4141
if: ${{ steps.findComment.outputs.comment-id != '' && contains(github.event.label.name, 'priority') }}
42-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
42+
uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
4343
with:
4444
comment-id: ${{ steps.findComment.outputs.comment-id }}
4545
body: |

.github/workflows/publish-canaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515
- name: Set up pnpm
16-
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
16+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
1717
- name: Use Node.js
1818
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
1919
with:

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ jobs:
4040
publish_results: true
4141
# Upload the results to GitHub's code scanning dashboard.
4242
- name: Upload to code-scanning
43-
uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
43+
uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4444
with:
4545
sarif_file: results.sarif

apps/bare-next-app/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@
1818
"@mui/system": "workspace:^",
1919
"@mui/utils": "workspace:^",
2020
"next": "latest",
21-
"react": "^19.1.1",
22-
"react-dom": "^19.1.1"
21+
"react": "^19.2.0",
22+
"react-dom": "^19.2.0"
2323
},
2424
"devDependencies": {
2525
"@pigment-css/nextjs-plugin": "0.0.30",
2626
"@types/node": "^20.19.19",
27-
"@types/react": "^19.1.13",
28-
"@types/react-dom": "^19.1.9",
29-
"eslint": "^9.36.0",
27+
"@types/react": "^19.2.2",
28+
"@types/react-dom": "^19.2.1",
29+
"eslint": "^9.37.0",
3030
"typescript": "^5.9.2"
3131
},
3232
"nx": {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
"@mui/system": "workspace:^",
1818
"@mui/utils": "workspace:^",
1919
"next": "latest",
20-
"react": "^19.1.1",
21-
"react-dom": "^19.1.1"
20+
"react": "^19.2.0",
21+
"react-dom": "^19.2.0"
2222
},
2323
"devDependencies": {
2424
"@pigment-css/nextjs-plugin": "0.0.30",
2525
"@types/node": "^20.19.19",
26-
"@types/react": "^19.1.13",
27-
"@types/react-dom": "^19.1.9",
28-
"eslint": "^9.36.0",
26+
"@types/react": "^19.2.2",
27+
"@types/react-dom": "^19.2.1",
28+
"eslint": "^9.37.0",
2929
"typescript": "^5.9.2"
3030
},
3131
"nx": {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"@mui/material-pigment-css": "workspace:^",
1616
"@mui/system": "workspace:^",
1717
"@mui/utils": "workspace:^",
18-
"@playwright/test": "^1.55.1",
18+
"@playwright/test": "^1.56.0",
1919
"clsx": "^2.1.1",
20-
"react": "^19.1.1",
21-
"react-dom": "^19.1.1",
20+
"react": "^19.2.0",
21+
"react-dom": "^19.2.0",
2222
"react-error-boundary": "^6.0.0",
2323
"react-router-dom": "^6.30.1",
2424
"webfontloader": "^1.6.28"
@@ -28,8 +28,8 @@
2828
"@babel/preset-typescript": "^7.27.1",
2929
"@pigment-css/vite-plugin": "0.0.30",
3030
"@testing-library/react": "^16.3.0",
31-
"@types/react": "^19.1.13",
32-
"@types/react-dom": "^19.1.9",
31+
"@types/react": "^19.2.2",
32+
"@types/react-dom": "^19.2.1",
3333
"@types/webfontloader": "^1.6.38",
3434
"@vitejs/plugin-react": "^5.0.4",
3535
"postcss": "^8.5.6",

docs/data/material/components/autocomplete/autocomplete.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,20 @@ However, you can use different structures by providing a `getOptionLabel` prop.
5353

5454
If your options are objects, you must provide the `isOptionEqualToValue` prop to ensure correct selection and highlighting. By default, it uses strict equality to compare options with the current value.
5555

56+
:::warning
57+
If your options have duplicate labels, you must extract a unique key with the `getOptionKey` prop.
58+
59+
```tsx
60+
const options = [
61+
{ label: 'The Godfather', id: 1 },
62+
{ label: 'The Godfather', id: 2 },
63+
];
64+
65+
return <Autocomplete options={options} getOptionKey={(option) => option.id} />;
66+
```
67+
68+
:::
69+
5670
### Playground
5771

5872
Each of the following examples demonstrates one feature of the Autocomplete component.

0 commit comments

Comments
 (0)