Update MUI to v6

trinodb · Oct 9, 2024 · bf4d738 · bf4d738
1 parent 3882fb6
commit bf4d738
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 97 deletions.
diff --git a/core/trino-web-ui/src/main/resources/webapp-preview/package-lock.json b/core/trino-web-ui/src/main/resources/webapp-preview/package-lock.json
diff --git a/core/trino-web-ui/src/main/resources/webapp-preview/package.json b/core/trino-web-ui/src/main/resources/webapp-preview/package.json
@@ -19,8 +19,8 @@
     "@emotion/react": "^11.13.0",
     "@emotion/styled": "^11.13.0",
     "@fontsource/roboto": "^5.0.13",
-    "@mui/icons-material": "^5.16.6",
-    "@mui/material": "^5.16.7",
+    "@mui/icons-material": "^6.1.2",
+    "@mui/material": "^6.1.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.25.1",

diff --git a/core/trino-web-ui/src/main/resources/webapp-preview/src/App.tsx b/core/trino-web-ui/src/main/resources/webapp-preview/src/App.tsx
@@ -17,8 +17,7 @@ import {
     Button,
     Container,
     CssBaseline,
-    // TODO: update when MUI is updated to version 6
-    Unstable_Grid2 as Grid,
+    Grid2 as Grid,
     Link,
     ThemeProvider,
     Typography,
@@ -77,10 +76,10 @@ const NotFound = () => {
     return (
         <Container maxWidth="md">
             <Grid container spacing={2}>
-                <Grid xs={12} md={2}>
+                <Grid size={12} spacing={{ md: 2}}>
                     <Box component="img" sx={{ height: 140 }} alt="logo" src={trinoLogo} />
                 </Grid>
-                <Grid xs={12} md={10}>
+                <Grid size={12} spacing={{ md : 10}}>
                     <Typography variant="h3">404</Typography>
                     <Typography paragraph>The page you’re looking for doesn’t exist.</Typography>
                     <Button variant="contained" component={Link} href="/">