Skip to content

Commit a47381c

Browse files
alessandrotillialessandrotilli
authored
Merge pull request #448 from melfore/447-mui-7
Migrate to mui 7
2 parents acd79f9 + 3bee0f4 commit a47381c

File tree

29 files changed

+244
-1074
lines changed

29 files changed

+244
-1074
lines changed

‎package-lock.json‎

Lines changed: 56 additions & 675 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"@emotion/styled": "^11.14.0",
2525
"@fontsource/material-icons": "^5.2.5",
2626
"@fontsource/roboto": "^5.2.5",
27-
"@mui/icons-material": "^6.3.1",
28-
"@mui/material": "^6.3.1",
29-
"@mui/system": "^6.3.1",
27+
"@mui/icons-material": "^7.0.2",
28+
"@mui/material": "^7.0.2",
29+
"@mui/system": "^7.0.2",
3030
"@semantic-release/changelog": "^6.0.3",
3131
"@semantic-release/commit-analyzer": "^13.0.1",
3232
"@semantic-release/git": "^10.0.1",
@@ -85,10 +85,10 @@
8585
"peerDependencies": {
8686
"@emotion/react": ">= 11.8.2 < 12",
8787
"@emotion/styled": ">= 11.8.1 < 12",
88-
"@mui/icons-material": ">= 6",
89-
"@mui/material": ">= 6",
90-
"@mui/system": ">= 6",
91-
"@mui/x-date-pickers": ">= 7",
88+
"@mui/icons-material": "7.x",
89+
"@mui/material": "7.x",
90+
"@mui/system": "7.x",
91+
"@mui/x-date-pickers": "8.x",
9292
"luxon": ">= 3.4.4 < 4",
9393
"react": ">= 18 < 19",
9494
"react-dom": ">= 18 < 19",

‎src/components/AppBar/__snapshots__/index.stories.tsx.snap‎

Lines changed: 0 additions & 26 deletions
Large diffs are not rendered by default.

‎src/components/Avatar/__snapshots__/index.stories.tsx.snap‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`Display/Avatar CustomIcon smoke-test 1`] = `
4-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
5-
data-cy="avatar"
4+
<div data-cy="avatar"
5+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
66
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
77
>
88
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mui-classname"
99
focusable="false"
1010
aria-hidden="true"
1111
viewbox="0 0 24 24"
12-
data-testid="StyleIcon"
1312
data-cy="avatar-icon"
1413
style="height: 24px; width: 24px;"
1514
>
@@ -20,8 +19,8 @@ exports[`Display/Avatar CustomIcon smoke-test 1`] = `
2019
`;
2120

2221
exports[`Display/Avatar Image smoke-test 1`] = `
23-
<div class="MuiAvatar-root MuiAvatar-circular css-mui-classname"
24-
data-cy="avatar"
22+
<div data-cy="avatar"
23+
class="MuiAvatar-root MuiAvatar-circular css-mui-classname"
2524
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
2625
>
2726
<img alt="avatar"
@@ -33,14 +32,13 @@ exports[`Display/Avatar Image smoke-test 1`] = `
3332
3433
exports[`Display/Avatar Loading smoke-test 1`] = `
3534
<span class="MuiSkeleton-root MuiSkeleton-circular MuiSkeleton-pulse MuiSkeleton-withChildren MuiSkeleton-fitContent MuiSkeleton-heightAuto css-mui-classname">
36-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
37-
data-cy="avatar-loading"
35+
<div data-cy="avatar-loading"
36+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
3837
>
3938
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium MuiAvatar-fallback css-mui-classname"
4039
focusable="false"
4140
aria-hidden="true"
4241
viewbox="0 0 24 24"
43-
data-testid="PersonIcon"
4442
>
4543
<path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z">
4644
</path>
@@ -51,14 +49,13 @@ exports[`Display/Avatar Loading smoke-test 1`] = `
5149
5250
exports[`Display/Avatar LoadingVariant smoke-test 1`] = `
5351
<span class="MuiSkeleton-root MuiSkeleton-rectangular MuiSkeleton-pulse MuiSkeleton-withChildren MuiSkeleton-fitContent MuiSkeleton-heightAuto css-mui-classname">
54-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
55-
data-cy="avatar-loading"
52+
<div data-cy="avatar-loading"
53+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
5654
>
5755
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium MuiAvatar-fallback css-mui-classname"
5856
focusable="false"
5957
aria-hidden="true"
6058
viewbox="0 0 24 24"
61-
data-testid="PersonIcon"
6259
>
6360
<path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z">
6461
</path>
@@ -68,15 +65,14 @@ exports[`Display/Avatar LoadingVariant smoke-test 1`] = `
6865
`;
6966
7067
exports[`Display/Avatar Primary smoke-test 1`] = `
71-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
72-
data-cy="avatar"
68+
<div data-cy="avatar"
69+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
7370
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
7471
>
7572
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mui-classname"
7673
focusable="false"
7774
aria-hidden="true"
7875
viewbox="0 0 24 24"
79-
data-testid="AddIcon"
8076
data-cy="avatar-icon"
8177
>
8278
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z">
@@ -86,15 +82,14 @@ exports[`Display/Avatar Primary smoke-test 1`] = `
8682
`;
8783
8884
exports[`Display/Avatar Styled smoke-test 1`] = `
89-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
90-
data-cy="avatar"
85+
<div data-cy="avatar"
86+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
9187
style="background-color: red; color: white;"
9288
>
9389
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mui-classname"
9490
focusable="false"
9591
aria-hidden="true"
9692
viewbox="0 0 24 24"
97-
data-testid="AddIcon"
9893
data-cy="avatar-icon"
9994
>
10095
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z">
@@ -104,8 +99,8 @@ exports[`Display/Avatar Styled smoke-test 1`] = `
10499
`;
105100
106101
exports[`Display/Avatar Text smoke-test 1`] = `
107-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
108-
data-cy="avatar"
102+
<div data-cy="avatar"
103+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
109104
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
110105
>
111106
<p class="MuiTypography-root MuiTypography-body1 css-mui-classname"
@@ -117,15 +112,14 @@ exports[`Display/Avatar Text smoke-test 1`] = `
117112
`;
118113
119114
exports[`Display/Avatar VariantRounded smoke-test 1`] = `
120-
<div class="MuiAvatar-root MuiAvatar-rounded MuiAvatar-colorDefault css-mui-classname"
121-
data-cy="avatar"
115+
<div data-cy="avatar"
116+
class="MuiAvatar-root MuiAvatar-rounded MuiAvatar-colorDefault css-mui-classname"
122117
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
123118
>
124119
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mui-classname"
125120
focusable="false"
126121
aria-hidden="true"
127122
viewbox="0 0 24 24"
128-
data-testid="AddIcon"
129123
data-cy="avatar-icon"
130124
>
131125
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z">
@@ -135,15 +129,14 @@ exports[`Display/Avatar VariantRounded smoke-test 1`] = `
135129
`;
136130
137131
exports[`Display/Avatar VariantSquare smoke-test 1`] = `
138-
<div class="MuiAvatar-root MuiAvatar-square MuiAvatar-colorDefault css-mui-classname"
139-
data-cy="avatar"
132+
<div data-cy="avatar"
133+
class="MuiAvatar-root MuiAvatar-square MuiAvatar-colorDefault css-mui-classname"
140134
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
141135
>
142136
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mui-classname"
143137
focusable="false"
144138
aria-hidden="true"
145139
viewbox="0 0 24 24"
146-
data-testid="AddIcon"
147140
data-cy="avatar-icon"
148141
>
149142
<path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6z">

‎src/components/BreadCrumbs/__snapshots__/index.stories.tsx.snap‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ exports[`Navigation/BreadCrumbs WithIcons smoke-test 1`] = `
333333
focusable="false"
334334
aria-hidden="true"
335335
viewbox="0 0 24 24"
336-
data-testid="ScheduleIcon"
337336
data-cy="breadcrumbs-link-0-icon"
338337
style="margin-right: 8px;"
339338
>
@@ -367,7 +366,6 @@ exports[`Navigation/BreadCrumbs WithIcons smoke-test 1`] = `
367366
focusable="false"
368367
aria-hidden="true"
369368
viewbox="0 0 24 24"
370-
data-testid="AccessibilityIcon"
371369
data-cy="breadcrumbs-link-1-icon"
372370
style="margin-right: 8px; height: 20px; width: 20px;"
373371
>
@@ -395,7 +393,6 @@ exports[`Navigation/BreadCrumbs WithIcons smoke-test 1`] = `
395393
focusable="false"
396394
aria-hidden="true"
397395
viewbox="0 0 24 24"
398-
data-testid="ScheduleIcon"
399396
data-cy="breadcrumbs-link-2-icon"
400397
style="margin-right: 8px;"
401398
>

‎src/components/Button/__snapshots__/index.stories.tsx.snap‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ exports[`Inputs/Button Icon smoke-test 1`] = `
4242
focusable="false"
4343
aria-hidden="true"
4444
viewbox="0 0 24 24"
45-
data-testid="SendIcon"
4645
data-cy="button-icon"
4746
>
4847
<path d="M2.01 21 23 12 2.01 3 2 10l15 2-15 2z">
@@ -64,7 +63,6 @@ exports[`Inputs/Button IconCustom smoke-test 1`] = `
6463
focusable="false"
6564
aria-hidden="true"
6665
viewbox="0 0 24 24"
67-
data-testid="StyleIcon"
6866
data-cy="button-icon"
6967
style="height: 24px; width: 24px;"
7068
>
@@ -88,7 +86,6 @@ exports[`Inputs/Button IconRight smoke-test 1`] = `
8886
focusable="false"
8987
aria-hidden="true"
9088
viewbox="0 0 24 24"
91-
data-testid="SendIcon"
9289
data-cy="button-icon"
9390
>
9491
<path d="M2.01 21 23 12 2.01 3 2 10l15 2-15 2z">
@@ -111,7 +108,6 @@ exports[`Inputs/Button IconRotate smoke-test 1`] = `
111108
focusable="false"
112109
aria-hidden="true"
113110
viewbox="0 0 24 24"
114-
data-testid="RefreshIcon"
115111
data-cy="button-icon"
116112
>
117113
<path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4z">

‎src/components/Card/__snapshots__/index.stories.tsx.snap‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ exports[`Surfaces/Card Actions smoke-test 1`] = `
4040
focusable="false"
4141
aria-hidden="true"
4242
viewbox="0 0 24 24"
43-
data-testid="OpenInNewIcon"
4443
data-cy="button-icon"
4544
>
4645
<path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z">
@@ -92,7 +91,6 @@ exports[`Surfaces/Card Collapsible play-test 1`] = `
9291
focusable="false"
9392
aria-hidden="true"
9493
viewbox="0 0 24 24"
95-
data-testid="KeyboardArrowUpIcon"
9694
data-cy="card-collapse-icon"
9795
>
9896
<path d="M7.41 15.41 12 10.83l4.59 4.58L18 14l-6-6-6 6z">
@@ -157,7 +155,6 @@ exports[`Surfaces/Card CollapsibleActions smoke-test 1`] = `
157155
focusable="false"
158156
aria-hidden="true"
159157
viewbox="0 0 24 24"
160-
data-testid="OpenInNewIcon"
161158
data-cy="button-icon"
162159
>
163160
<path d="M19 19H5V5h7V3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2v-7h-2zM14 3v2h3.59l-9.83 9.83 1.41 1.41L19 6.41V10h2V3z">
@@ -177,7 +174,6 @@ exports[`Surfaces/Card CollapsibleActions smoke-test 1`] = `
177174
focusable="false"
178175
aria-hidden="true"
179176
viewbox="0 0 24 24"
180-
data-testid="KeyboardArrowDownIcon"
181177
data-cy="card-collapse-icon"
182178
>
183179
<path d="M7.41 8.59 12 13.17l4.59-4.58L18 10l-6 6-6-6z">
@@ -209,15 +205,14 @@ exports[`Surfaces/Card Icon smoke-test 1`] = `
209205
>
210206
<div class="MuiCardHeader-root css-mui-classname">
211207
<div class="MuiCardHeader-avatar css-mui-classname">
212-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
213-
data-cy="card-avatar"
208+
<div data-cy="card-avatar"
209+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
214210
style="background-color: rgb(25, 118, 210); color: rgb(255, 255, 255);"
215211
>
216212
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-mui-classname"
217213
focusable="false"
218214
aria-hidden="true"
219215
viewbox="0 0 24 24"
220-
data-testid="AppsIcon"
221216
data-cy="card-avatar-icon"
222217
>
223218
<path d="M4 8h4V4H4zm6 12h4v-4h-4zm-6 0h4v-4H4zm0-6h4v-4H4zm6 0h4v-4h-4zm6-10v4h4V4zm-6 4h4V4h-4zm6 6h4v-4h-4zm0 6h4v-4h-4z">
@@ -259,14 +254,13 @@ exports[`Surfaces/Card Loading smoke-test 1`] = `
259254
<div class="MuiCardHeader-root css-mui-classname">
260255
<div class="MuiCardHeader-avatar css-mui-classname">
261256
<span class="MuiSkeleton-root MuiSkeleton-circular MuiSkeleton-pulse MuiSkeleton-withChildren MuiSkeleton-fitContent MuiSkeleton-heightAuto css-mui-classname">
262-
<div class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
263-
data-cy="card-avatar-loading"
257+
<div data-cy="card-avatar-loading"
258+
class="MuiAvatar-root MuiAvatar-circular MuiAvatar-colorDefault css-mui-classname"
264259
>
265260
<svg class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium MuiAvatar-fallback css-mui-classname"
266261
focusable="false"
267262
aria-hidden="true"
268263
viewbox="0 0 24 24"
269-
data-testid="PersonIcon"
270264
>
271265
<path d="M12 12c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 2c-2.67 0-8 1.34-8 4v2h16v-2c0-2.66-5.33-4-8-4z">
272266
</path>

‎src/components/Checkbox/__snapshots__/index.stories.tsx.snap‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ exports[`Inputs/Checkbox Disabled smoke-test 1`] = `
2121
focusable="false"
2222
aria-hidden="true"
2323
viewbox="0 0 24 24"
24-
data-testid="CheckBoxIcon"
2524
>
2625
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
2726
</path>
@@ -48,7 +47,6 @@ exports[`Inputs/Checkbox Intermediate smoke-test 1`] = `
4847
focusable="false"
4948
aria-hidden="true"
5049
viewbox="0 0 24 24"
51-
data-testid="IndeterminateCheckBoxIcon"
5250
>
5351
<path d="M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm-2 10H7v-2h10v2z">
5452
</path>
@@ -74,7 +72,6 @@ exports[`Inputs/Checkbox Label smoke-test 1`] = `
7472
focusable="false"
7573
aria-hidden="true"
7674
viewbox="0 0 24 24"
77-
data-testid="CheckBoxIcon"
7875
>
7976
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
8077
</path>
@@ -103,7 +100,6 @@ exports[`Inputs/Checkbox LabelEnd smoke-test 1`] = `
103100
focusable="false"
104101
aria-hidden="true"
105102
viewbox="0 0 24 24"
106-
data-testid="CheckBoxIcon"
107103
>
108104
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
109105
</path>
@@ -132,7 +128,6 @@ exports[`Inputs/Checkbox Localized smoke-test 1`] = `
132128
focusable="false"
133129
aria-hidden="true"
134130
viewbox="0 0 24 24"
135-
data-testid="CheckBoxIcon"
136131
>
137132
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
138133
</path>
@@ -162,7 +157,6 @@ exports[`Inputs/Checkbox Primary smoke-test 1`] = `
162157
focusable="false"
163158
aria-hidden="true"
164159
viewbox="0 0 24 24"
165-
data-testid="CheckBoxIcon"
166160
>
167161
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
168162
</path>
@@ -189,7 +183,6 @@ exports[`Inputs/Checkbox SizeSmall smoke-test 1`] = `
189183
focusable="false"
190184
aria-hidden="true"
191185
viewbox="0 0 24 24"
192-
data-testid="CheckBoxIcon"
193186
>
194187
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
195188
</path>
@@ -217,7 +210,6 @@ exports[`Inputs/Checkbox Styled smoke-test 1`] = `
217210
focusable="false"
218211
aria-hidden="true"
219212
viewbox="0 0 24 24"
220-
data-testid="CheckBoxIcon"
221213
>
222214
<path d="M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z">
223215
</path>
@@ -243,7 +235,6 @@ exports[`Inputs/Checkbox Unchecked smoke-test 1`] = `
243235
focusable="false"
244236
aria-hidden="true"
245237
viewbox="0 0 24 24"
246-
data-testid="CheckBoxOutlineBlankIcon"
247238
>
248239
<path d="M19 5v14H5V5h14m0-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z">
249240
</path>

0 commit comments

Comments
 (0)