Skip to content

Update MUI to v9.0.1 #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Update MUI to v9.0.1 #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43aadea
Initial plan
Copilot May 11, 2026
0bd905f
feat: update MUI to v9.0.1 with breaking change fixes
Copilot May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,716 changes: 125 additions & 1,591 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 16 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,12 @@
"dependencies": {
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@mui/material": "6.1.8",
"@mui/styled-engine-sc": "6.1.8",
"@mui/system": "6.1.8",
"@mui/material": "9.0.1",
"@mui/styled-engine-sc": "9.0.1",
"@mui/system": "9.0.1",
"axios": "1.12.0",
"dompurify": "3.2.6",
"lodash": "4.18.1",
"marked": "16.3.0",
"react": "18.3.1"
},
Expand All @@ -53,9 +54,9 @@
"@fullcalendar/daygrid": "6.1.17",
"@fullcalendar/react": "6.1.17",
"@fullcalendar/timegrid": "6.1.17",
"@mui/material": "6.1.8",
"@mui/styled-engine-sc": "6.1.8",
"@mui/system": "6.1.8",
"@mui/material": "9.0.1",
"@mui/styled-engine-sc": "9.0.1",
"@mui/system": "9.0.1",
"@storybook/addon-links": "9.0.15",
"@storybook/addon-webpack5-compiler-swc": "3.0.0",
"@storybook/react-webpack5": "9.0.15",
Expand Down Expand Up @@ -129,9 +130,9 @@
"@fullcalendar/daygrid": "^6.1.17",
"@fullcalendar/react": "^6.1.17",
"@fullcalendar/timegrid": "^6.1.17",
"@mui/material": "^6.1.8",
"@mui/styled-engine-sc": "^6.1.8",
"@mui/system": "^6.1.8",
"@mui/material": "^9.0.1",
"@mui/styled-engine-sc": "^9.0.1",
"@mui/system": "^9.0.1",
"@types/react": "^18.2.37",
"@types/react-dom": "^18.2.15",
"axios": "^1.9.0",
Expand Down Expand Up @@ -237,6 +238,12 @@
"optional": true
}
},
"overrides": {
"uniforms-mui": {
"@mui/material": "^9.0.1"
},
"react-is": "^18.3.1"
},
"scripts": {
"build": "webpack --config webpack.prod.config.js",
"setup-dev-env": "husky",
Expand Down
4 changes: 2 additions & 2 deletions src/components/media/controls/commonControls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ export function PlaybackRateButton(props: MediaControls) {
return (
<Tooltip
title="Playback rate"
PopperProps={{
container: document.fullscreenElement ?? document.body,
slotProps={{
popper: { container: document.fullscreenElement ?? document.body },
}}
>
<Button
Expand Down
2 changes: 1 addition & 1 deletion src/components/media/controls/mediaIconButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export function MediaIconButton(props: MediaIconButtonProps) {
return (
<Tooltip
title={controls[props.action].label}
PopperProps={{ container: document.fullscreenElement ?? document.body }}
slotProps={{ popper: { container: document.fullscreenElement ?? document.body } }}
>
<IconButton
onClick={props.onClick}
Expand Down
2 changes: 1 addition & 1 deletion src/components/messageCanvas/messageCanvas.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function MessageCanvasElement(
>
<Stack
direction="row"
alignItems="center"
sx={{ alignItems: 'center' }}
spacing={1}
className="rustic-header"
>
Expand Down
4 changes: 1 addition & 3 deletions src/components/pdfViewer/pdfViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,7 @@ function PDFViewer(props: PDFViewerProps) {
</Box>
<Stack
direction="row"
justifyContent="center"
alignItems="center"
gap={1}
sx={{ justifyContent: 'center', alignItems: 'center', gap: 1 }}
>
<ViewerControlButton
action="previousPage"
Expand Down
4 changes: 2 additions & 2 deletions src/components/visualization/vegaLiteViz/vegaLiteViz.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ function VegaLiteViz({
} else {
return (
<Stack direction="column" className="rustic-vega-lite-container">
<Box justifyContent="end" display="flex">
<Box sx={{ justifyContent: 'end', display: 'flex' }}>
<PopoverMenu menuItems={menuItems} ariaLabel="Download options" />
</Box>

Expand All @@ -364,7 +364,7 @@ function VegaLiteViz({
}
/>
)}
<Box textAlign="center" mt={1}>
<Box sx={{ textAlign: 'center', mt: 1 }}>
{typeof props.spec.title === 'string' && (
<Typography variant="subtitle2">{props.spec.title}</Typography>
)}
Expand Down
7 changes: 3 additions & 4 deletions src/components/weather/weather.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,13 +109,13 @@ export default function Weather(props: WeatherProps) {
},
]}
/>
<Stack alignItems="center">
<Stack sx={{ alignItems: 'center' }}>
<Typography variant="h4" component="span" data-cy="location">
{props.location}
</Typography>
<Stack
direction="row"
alignItems="center"
sx={{ alignItems: 'center' }}
spacing={1}
className="rustic-current-weather-description"
data-cy="current-weather-description"
Expand Down Expand Up @@ -146,10 +146,9 @@ export default function Weather(props: WeatherProps) {

{props.weatherProvider && (
<Stack
alignItems="center"
sx={{ alignItems: 'center', alignSelf: 'center' }}
direction="row"
spacing={1}
alignSelf="center"
className="rustic-weather-attribution"
>
<Icon name="cloud" />
Expand Down
68 changes: 34 additions & 34 deletions src/rusticTheme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,44 +391,44 @@ export function generateTheme(
color: modeColors.textDisabled,
border: `1px solid ${modeColors.actionDisabled}`,
},
},
containedPrimary: {
background: modeColors.primaryMain,
color: modeColors.primaryContrastText,
'&:hover': {
background: modeColors.primaryLight,
},
'&:active': {
'&.MuiButton-containedPrimary': {
background: modeColors.primaryMain,
outline: `2px solid ${modeColors.primaryLight}`,
},
},
containedSecondary: {
'&:hover': {
background: modeColors.secondaryLight,
},
'&:active': {
background: modeColors.secondaryMain,
outline: `2px solid ${modeColors.secondaryLight}`,
},
},
outlinedSecondary: {
color: modeColors.textPrimary,
'&:hover': {
border: `1px solid ${modeColors.secondaryDark}`,
background: modeColors.secondaryFocus,
color: modeColors.primaryContrastText,
'&:hover': {
background: modeColors.primaryLight,
},
'&:active': {
background: modeColors.primaryMain,
outline: `2px solid ${modeColors.primaryLight}`,
},
},
'&:active': {
outline: `2px solid ${modeColors.secondaryLight}`,
'&.MuiButton-containedSecondary': {
'&:hover': {
background: modeColors.secondaryLight,
},
'&:active': {
background: modeColors.secondaryMain,
outline: `2px solid ${modeColors.secondaryLight}`,
},
},
},
textSecondary: {
color: modeColors.textPrimary,
'&:hover': {
background: modeColors.secondaryFocus,
'&.MuiButton-outlinedSecondary': {
color: modeColors.textPrimary,
'&:hover': {
border: `1px solid ${modeColors.secondaryDark}`,
background: modeColors.secondaryFocus,
},
'&:active': {
outline: `2px solid ${modeColors.secondaryLight}`,
},
},
'&.Mui-disabled': {
border: 'none',
'&.MuiButton-textSecondary': {
color: modeColors.textPrimary,
'&:hover': {
background: modeColors.secondaryFocus,
},
'&.Mui-disabled': {
border: 'none',
},
},
},
},
Expand Down
Loading