Skip to content

Commit df3ecff

Browse files
authored
Merge branch 'master' into remove-ponyfillglobal
2 parents 90b6c35 + 1592768 commit df3ecff

File tree

45 files changed

+533
-353
lines changed

Some content is hidden

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

45 files changed

+533
-353
lines changed

.circleci/config.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ jobs:
379379
<<: *default-job
380380
resource_class: 'medium+'
381381
docker:
382-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
382+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
383383
steps:
384384
- checkout
385385
- install_js:
@@ -407,7 +407,7 @@ jobs:
407407
test_e2e:
408408
<<: *default-job
409409
docker:
410-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
410+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
411411
steps:
412412
- checkout
413413
- install_js:
@@ -419,7 +419,7 @@ jobs:
419419
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
420420
<<: *default-job
421421
docker:
422-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
422+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
423423
steps:
424424
- checkout
425425
- install_js:
@@ -432,7 +432,7 @@ jobs:
432432
test_profile:
433433
<<: *default-job
434434
docker:
435-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
435+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
436436
steps:
437437
- checkout
438438
- install_js:
@@ -457,7 +457,7 @@ jobs:
457457
test_regressions:
458458
<<: *default-job
459459
docker:
460-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
460+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
461461
steps:
462462
- checkout
463463
- install_js:
@@ -527,7 +527,7 @@ jobs:
527527
test_bundling_next_webpack4:
528528
<<: *default-job
529529
docker:
530-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
530+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
531531
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
532532
steps:
533533
- checkout:
@@ -545,7 +545,7 @@ jobs:
545545
test_bundling_next_webpack5:
546546
<<: *default-job
547547
docker:
548-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
548+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
549549
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
550550
steps:
551551
- checkout:
@@ -563,7 +563,7 @@ jobs:
563563
test_bundling_create_react_app:
564564
<<: *default-job
565565
docker:
566-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
566+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
567567
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
568568
steps:
569569
- checkout:
@@ -581,7 +581,7 @@ jobs:
581581
test_bundling_snowpack:
582582
<<: *default-job
583583
docker:
584-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
584+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
585585
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
586586
steps:
587587
- checkout:
@@ -599,7 +599,7 @@ jobs:
599599
test_bundling_vite:
600600
<<: *default-job
601601
docker:
602-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
602+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
603603
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
604604
steps:
605605
- checkout:
@@ -617,7 +617,7 @@ jobs:
617617
test_bundling_esbuild:
618618
<<: *default-job
619619
docker:
620-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
620+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
621621
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
622622
steps:
623623
- checkout:
@@ -635,7 +635,7 @@ jobs:
635635
test_bundling_gatsby:
636636
<<: *default-job
637637
docker:
638-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
638+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
639639
environment:
640640
GATSBY_CPU_COUNT: '3'
641641
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
@@ -736,7 +736,7 @@ jobs:
736736
test_benchmark:
737737
<<: *default-job
738738
docker:
739-
- image: mcr.microsoft.com/playwright:v1.50.1-noble
739+
- image: mcr.microsoft.com/playwright:v1.51.1-noble
740740
steps:
741741
- checkout
742742
- install_js:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"@mui/system": "workspace:^",
1818
"@mui/utils": "workspace:^",
1919
"clsx": "^2.1.1",
20-
"playwright": "^1.50.1",
20+
"playwright": "^1.51.1",
2121
"react": "^19.0.0",
2222
"react-dom": "^19.0.0",
2323
"react-error-boundary": "^5.0.0",

benchmark/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"server:system": "cd ../ && cross-env NODE_ENV=production BABEL_ENV=benchmark babel-node benchmark/server/scenarios/system.js --inspect=0.0.0.0:9229 --extensions \".tsx,.ts,.js\""
1212
},
1313
"dependencies": {
14-
"@babel/runtime": "^7.26.9",
14+
"@babel/runtime": "^7.26.10",
1515
"@chakra-ui/system": "^2.6.2",
1616
"@emotion/react": "^11.13.5",
1717
"@emotion/server": "^11.11.0",
@@ -25,7 +25,7 @@
2525
"express": "^4.21.2",
2626
"fs-extra": "^11.3.0",
2727
"jss": "^10.10.0",
28-
"playwright": "^1.50.1",
28+
"playwright": "^1.51.1",
2929
"prop-types": "^15.8.1",
3030
"react": "^19.0.0",
3131
"react-dom": "^19.0.0",

docs/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
"link-check": "tsx ./scripts/reportBrokenLinks.js"
2020
},
2121
"dependencies": {
22-
"@babel/core": "^7.26.9",
23-
"@babel/runtime": "^7.26.9",
24-
"@babel/runtime-corejs2": "^7.26.9",
22+
"@babel/core": "^7.26.10",
23+
"@babel/runtime": "^7.26.10",
24+
"@babel/runtime-corejs2": "^7.26.10",
2525
"@docsearch/react": "^3.9.0",
2626
"@emotion/cache": "^11.13.5",
2727
"@emotion/react": "^11.13.5",
@@ -137,7 +137,7 @@
137137
"cross-fetch": "^4.1.0",
138138
"gm": "^1.25.1",
139139
"marked": "^15.0.7",
140-
"playwright": "^1.50.1",
140+
"playwright": "^1.51.1",
141141
"prettier": "^3.5.3",
142142
"tailwindcss": "^3.4.17",
143143
"yargs": "^17.7.2"

docs/pages/material-ui/api/step-label.json

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@
1414
"slotProps": {
1515
"type": {
1616
"name": "shape",
17-
"description": "{ label?: func<br>&#124;&nbsp;object, stepIcon?: func<br>&#124;&nbsp;object }"
17+
"description": "{ label?: func<br>&#124;&nbsp;object, root?: func<br>&#124;&nbsp;object, stepIcon?: func<br>&#124;&nbsp;object }"
1818
},
1919
"default": "{}"
2020
},
2121
"slots": {
22-
"type": { "name": "shape", "description": "{ label?: elementType, stepIcon?: elementType }" },
22+
"type": {
23+
"name": "shape",
24+
"description": "{ label?: elementType, root?: elementType, stepIcon?: elementType }"
25+
},
2326
"default": "{}"
2427
},
2528
"StepIconComponent": {
@@ -46,6 +49,12 @@
4649
"import { StepLabel } from '@mui/material';"
4750
],
4851
"slots": [
52+
{
53+
"name": "root",
54+
"description": "The component that renders the root.",
55+
"default": "span",
56+
"class": "MuiStepLabel-root"
57+
},
4958
{
5059
"name": "label",
5160
"description": "The component that renders the label.",
@@ -107,12 +116,6 @@
107116
"description": "Styles applied to the container element which wraps label and `optional`.",
108117
"isGlobal": false
109118
},
110-
{
111-
"key": "root",
112-
"className": "MuiStepLabel-root",
113-
"description": "Styles applied to the root element.",
114-
"isGlobal": false
115-
},
116119
{
117120
"key": "vertical",
118121
"className": "MuiStepLabel-vertical",

docs/pages/material-ui/api/switch.json

Lines changed: 46 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,20 @@
4747
},
4848
"default": "'medium'"
4949
},
50+
"slotProps": {
51+
"type": {
52+
"name": "shape",
53+
"description": "{ input?: func<br>&#124;&nbsp;object, root?: func<br>&#124;&nbsp;object, switchBase?: func<br>&#124;&nbsp;object, thumb?: func<br>&#124;&nbsp;object, track?: func<br>&#124;&nbsp;object }"
54+
},
55+
"default": "{}"
56+
},
57+
"slots": {
58+
"type": {
59+
"name": "shape",
60+
"description": "{ input?: elementType, root?: elementType, switchBase?: elementType, thumb?: elementType, track?: elementType }"
61+
},
62+
"default": "{}"
63+
},
5064
"sx": {
5165
"type": {
5266
"name": "union",
@@ -61,6 +75,38 @@
6175
"import Switch from '@mui/material/Switch';",
6276
"import { Switch } from '@mui/material';"
6377
],
78+
"slots": [
79+
{
80+
"name": "root",
81+
"description": "The component that renders the root slot.",
82+
"default": "'span'",
83+
"class": "MuiSwitch-root"
84+
},
85+
{
86+
"name": "track",
87+
"description": "The component that renders the track slot.",
88+
"default": "'span'",
89+
"class": "MuiSwitch-track"
90+
},
91+
{
92+
"name": "thumb",
93+
"description": "The component that renders the thumb slot.",
94+
"default": "'span'",
95+
"class": "MuiSwitch-thumb"
96+
},
97+
{
98+
"name": "switchBase",
99+
"description": "The component that renders the switchBase slot.",
100+
"default": "SwitchBase",
101+
"class": "MuiSwitch-switchBase"
102+
},
103+
{
104+
"name": "input",
105+
"description": "The component that renders the switchBase's input slot.",
106+
"default": "SwitchBaseInput",
107+
"class": "MuiSwitch-input"
108+
}
109+
],
64110
"classes": [
65111
{
66112
"key": "checked",
@@ -98,18 +144,6 @@
98144
"description": "Styles applied to the root element if `edge=\"start\"`.",
99145
"isGlobal": false
100146
},
101-
{
102-
"key": "input",
103-
"className": "MuiSwitch-input",
104-
"description": "Styles applied to the internal SwitchBase component's input element.",
105-
"isGlobal": false
106-
},
107-
{
108-
"key": "root",
109-
"className": "MuiSwitch-root",
110-
"description": "Styles applied to the root element.",
111-
"isGlobal": false
112-
},
113147
{
114148
"key": "sizeMedium",
115149
"className": "MuiSwitch-sizeMedium",
@@ -121,24 +155,6 @@
121155
"className": "MuiSwitch-sizeSmall",
122156
"description": "Styles applied to the root element if `size=\"small\"`.",
123157
"isGlobal": false
124-
},
125-
{
126-
"key": "switchBase",
127-
"className": "MuiSwitch-switchBase",
128-
"description": "Styles applied to the internal `SwitchBase` component's `root` class.",
129-
"isGlobal": false
130-
},
131-
{
132-
"key": "thumb",
133-
"className": "MuiSwitch-thumb",
134-
"description": "Styles used to create the thumb passed to the internal `SwitchBase` component `icon` prop.",
135-
"isGlobal": false
136-
},
137-
{
138-
"key": "track",
139-
"className": "MuiSwitch-track",
140-
"description": "Styles applied to the track element.",
141-
"isGlobal": false
142158
}
143159
],
144160
"spread": true,

docs/translations/api-docs/step-label/step-label.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
"description": "Styles applied to {{nodeName}}.",
6161
"nodeName": "the container element which wraps label and <code>optional</code>"
6262
},
63-
"root": { "description": "Styles applied to the root element." },
6463
"vertical": {
6564
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
6665
"nodeName": "the root element",
@@ -69,6 +68,7 @@
6968
},
7069
"slotDescriptions": {
7170
"label": "The component that renders the label.",
71+
"root": "The component that renders the root.",
7272
"stepIcon": "The component to render in place of the <a href=\"https://mui.com/material-ui/api/step-icon/\"><code>StepIcon</code></a>."
7373
}
7474
}

docs/translations/api-docs/switch/switch.json

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
"size": {
3434
"description": "The size of the component. <code>small</code> is equivalent to the dense switch styling."
3535
},
36+
"slotProps": { "description": "The props used for each slot inside." },
37+
"slots": { "description": "The components used for each slot inside." },
3638
"sx": {
3739
"description": "The system prop that allows defining system overrides as well as additional CSS styles."
3840
},
@@ -69,11 +71,6 @@
6971
"nodeName": "the root element",
7072
"conditions": "<code>edge=\"start\"</code>"
7173
},
72-
"input": {
73-
"description": "Styles applied to {{nodeName}}.",
74-
"nodeName": "the internal SwitchBase component&#39;s input element"
75-
},
76-
"root": { "description": "Styles applied to the root element." },
7774
"sizeMedium": {
7875
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
7976
"nodeName": "the root element",
@@ -83,14 +80,13 @@
8380
"description": "Styles applied to {{nodeName}} if {{conditions}}.",
8481
"nodeName": "the root element",
8582
"conditions": "<code>size=\"small\"</code>"
86-
},
87-
"switchBase": {
88-
"description": "Styles applied to {{nodeName}}.",
89-
"nodeName": "the internal <code>SwitchBase</code> component&#39;s <code>root</code> class"
90-
},
91-
"thumb": {
92-
"description": "Styles used to create the thumb passed to the internal <code>SwitchBase</code> component <code>icon</code> prop."
93-
},
94-
"track": { "description": "Styles applied to {{nodeName}}.", "nodeName": "the track element" }
83+
}
84+
},
85+
"slotDescriptions": {
86+
"input": "The component that renders the switchBase&#39;s input slot.",
87+
"root": "The component that renders the root slot.",
88+
"switchBase": "The component that renders the switchBase slot.",
89+
"thumb": "The component that renders the thumb slot.",
90+
"track": "The component that renders the track slot."
9591
}
9692
}

0 commit comments

Comments
 (0)