Skip to content

Commit ff7ec1f

Browse files
authored
Merge pull request #434 from jackstenglein/master
Upgrade MUI to v7 closes #436
2 parents e666506 + cd35aa6 commit ff7ec1f

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
"@eslint/compat": "^1.2.6",
6060
"@eslint/eslintrc": "^3.2.0",
6161
"@eslint/js": "^9.20.0",
62-
"@mui/icons-material": ">=6.4.5",
63-
"@mui/material": ">=6.4.5",
62+
"@mui/icons-material": ">=7.0.0",
63+
"@mui/material": ">=7.0.0",
6464
"@mui/x-date-pickers": ">=7.27.0",
6565
"@testing-library/dom": "^10.4.0",
6666
"@testing-library/jest-dom": "^6.6.3",
@@ -103,8 +103,8 @@
103103
"vite-tsconfig-paths": "^5.1.4"
104104
},
105105
"peerDependencies": {
106-
"@mui/icons-material": ">=6.0.0",
107-
"@mui/material": ">=6.0.0",
106+
"@mui/icons-material": ">=7.0.0",
107+
"@mui/material": ">=7.0.0",
108108
"@mui/x-date-pickers": ">=7.0.0",
109109
"date-fns": ">=4.0.0",
110110
"react": ">=18.0.0",

src/lib/views/Editor.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
DialogActions,
55
DialogContent,
66
DialogTitle,
7-
Grid2,
7+
Grid,
88
useMediaQuery,
99
useTheme,
1010
} from "@mui/material";
@@ -218,16 +218,16 @@ const Editor = () => {
218218
{selectedEvent ? translations.form.editTitle : translations.form.addTitle}
219219
</DialogTitle>
220220
<DialogContent style={{ overflowX: "hidden" }}>
221-
<Grid2 container spacing={2}>
221+
<Grid container spacing={2}>
222222
{Object.keys(state).map((key) => {
223223
const item = state[key];
224224
return (
225-
<Grid2 key={key} size={{ sm: item.config?.sm, xs: 12 }}>
225+
<Grid key={key} size={{ sm: item.config?.sm, xs: 12 }}>
226226
{renderInputs(key)}
227-
</Grid2>
227+
</Grid>
228228
);
229229
})}
230-
</Grid2>
230+
</Grid>
231231
</DialogContent>
232232
<DialogActions>
233233
<Button color="inherit" fullWidth onClick={() => handleClose()}>

0 commit comments

Comments
 (0)