Skip to content

Commit 78947f4

Browse files
chore: Upgrade to mui 7 (#878)
1 parent b71e66b commit 78947f4

File tree

12 files changed

+61
-73
lines changed

12 files changed

+61
-73
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
"@discretize/typeface-menomonia": "^0.1.3",
5656
"@emotion/react": "^11.14.0",
5757
"@emotion/styled": "^11.14.0",
58-
"@mui/icons-material": "^6.4.10",
59-
"@mui/material": "^6.4.10",
58+
"@mui/icons-material": "^7.0.1",
59+
"@mui/material": "^7.0.1",
6060
"@reduxjs/toolkit": "^2.6.1",
6161
"axios": "^1.8.4",
6262
"comlink": "^4.4.2",

pnpm-lock.yaml

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

src/components/GearOptimizer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import ExpandLessIcon from '@mui/icons-material/ExpandLess';
2-
import { Box, Grid2 as Grid, Typography } from '@mui/material';
2+
import { Box, Grid, Typography } from '@mui/material';
33
import { useTranslation } from 'react-i18next';
44
import { useSelector } from 'react-redux';
55
import { getProfession } from '../state/slices/controlsSlice';

src/components/baseComponents/Section.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
AccordionDetails,
66
AccordionSummary,
77
Divider,
8-
Grid2 as Grid,
8+
Grid,
99
Typography,
1010
} from '@mui/material';
1111
import React from 'react';

src/components/sections/affixes/CustomAffix.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Accordion,
44
AccordionDetails,
55
AccordionSummary,
6-
Grid2 as Grid,
6+
Grid,
77
TextField,
88
Typography,
99
} from '@mui/material';

src/components/sections/buffs/Buffs.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Boon, CommonEffect, Condition, Item, Skill, Trait } from '@discretize/gw2-ui-new';
22
import { firstUppercase } from '@discretize/react-discretize-components';
3-
import { Box, FormControl, FormGroup, FormLabel, Grid2 as Grid, Typography } from '@mui/material';
3+
import { Box, FormControl, FormGroup, FormLabel, Grid, Typography } from '@mui/material';
44
import { useTranslation } from 'react-i18next';
55
import { useDispatch, useSelector } from 'react-redux';
66
import { makeStyles } from 'tss-react/mui';

src/components/sections/extramodifiers/ExtraModifiers.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
Accordion,
44
AccordionDetails,
55
AccordionSummary,
6-
Grid2 as Grid,
6+
Grid,
77
TextField,
88
Typography,
99
} from '@mui/material';

src/components/sections/forcedslots/ForcedSlots.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid2 as Grid } from '@mui/material';
1+
import { Grid } from '@mui/material';
22
import { useTranslation } from 'react-i18next';
33
import { useDispatch, useSelector } from 'react-redux';
44
import { changeForcedSlot, getForcedSlots } from '../../../state/slices/forcedSlots';

src/components/sections/infusions/Infusions.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
import { Attribute, Item } from '@discretize/gw2-ui-new';
22
import { HelperIcon } from '@discretize/react-discretize-components';
33
import AddIcon from '@mui/icons-material/Add';
4-
import {
5-
Button,
6-
FormControl,
7-
Grid2 as Grid,
8-
Input,
9-
InputLabel,
10-
MenuItem,
11-
Select,
12-
} from '@mui/material';
4+
import { Button, FormControl, Grid, Input, InputLabel, MenuItem, Select } from '@mui/material';
135
import React from 'react';
146
import { Trans, useTranslation } from 'react-i18next';
157
import { useDispatch, useSelector } from 'react-redux';

src/components/sections/priorities/Priorities.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
FormControl,
55
FormControlLabel,
66
FormLabel,
7-
Grid2 as Grid,
7+
Grid,
88
Input,
99
InputLabel,
1010
Radio,

0 commit comments

Comments
 (0)