Skip to content

Commit 2cc3185

Browse files
leecalcoteleecalcote
authored
chore(deps): upgrade @mui/material 7 → 9; lift to peerDependencies; consume @sistent/mui-datatables@7 (#1460)
chore(deps): upgrade @mui/material 7 → 9; lift to peerDependencies; consume @sistent/mui-datatables@7
2 parents 01dbf06 + 85f0784 commit 2cc3185

14 files changed

Lines changed: 9793 additions & 14891 deletions

File tree

‎package-lock.json‎

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

‎package.json‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sistent/sistent",
3-
"version": "0.20.0",
3+
"version": "0.21.0",
44
"description": "Reusable React Components and SVG Icons library",
55
"repository": {
66
"type": "git",
@@ -47,7 +47,9 @@
4747
"@eslint/eslintrc": "^3.3.5",
4848
"@eslint/js": "^10.0.1",
4949
"@meshery/schemas": "^1.2.0",
50-
"@mui/icons-material": "^7.3.9",
50+
"@mui/icons-material": "^9.0.0",
51+
"@mui/material": "^9.0.0",
52+
"@mui/system": "^9.0.0",
5153
"@reduxjs/toolkit": "^2.11.2",
5254
"@testing-library/dom": "^10.4.1",
5355
"@testing-library/react": "^16.3.2",
@@ -85,14 +87,15 @@
8587
"xstate": "^5.30.0"
8688
},
8789
"peerDependencies": {
90+
"@mui/icons-material": "^9.0.0",
91+
"@mui/material": "^9.0.0",
92+
"@mui/system": "^9.0.0",
8893
"@xstate/react": "^5.0.3 || ^6.0.0",
8994
"react": "^17.0.0 || ^18.0.0 || ^19.0.0",
9095
"react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
9196
"xstate": "^5.25.0"
9297
},
9398
"overrides": {
94-
"@mui/icons-material": "^7.3.9",
95-
"@mui/material": "^7.3.9",
9699
"@meshery/schemas": {
97100
"react": "$react",
98101
"react-dom": "$react-dom"
@@ -113,9 +116,7 @@
113116
"@emotion/react": "^11.14.0",
114117
"@emotion/styled": "^11.14.1",
115118
"@layer5/meshery-design-embed": "^0.6.0",
116-
"@mui/material": "^7.3.9",
117-
"@mui/system": "^7.3.10",
118-
"@sistent/mui-datatables": "^6.2.0",
119+
"@sistent/mui-datatables": "^7.0.0",
119120
"@types/mui-datatables": "*",
120121
"billboard.js": "^3.18.0",
121122
"js-yaml": "^4.1.1",

‎src/custom/CatalogFilterSection/FilterSection.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ const FilterSection: React.FC<FilterSectionProps> = ({
6464
>
6565
<Typography
6666
sx={{
67-
fontSize: '1rem'
67+
fontSize: '1rem',
68+
fontWeight: 'bold',
69+
fontFamily: styleProps.fontFamily
6870
}}
69-
fontWeight="bold"
70-
fontFamily={styleProps.fontFamily}
7171
>
7272
{(sectionDisplayName || filterKey).toUpperCase()}
7373
</Typography>

‎src/custom/CustomTooltip/customTooltip.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ type CustomTooltipProps = {
1414
fontWeight?: number;
1515
variant?: 'standard' | 'small';
1616
bgColor?: string;
17-
componentsProps?: TooltipProps['componentsProps'];
17+
slotProps?: TooltipProps['slotProps'];
1818
} & Omit<TooltipProps, 'title' | 'onClick'>;
1919

2020
function CustomTooltip({
@@ -26,7 +26,7 @@ function CustomTooltip({
2626
fontWeight = 400,
2727
variant = 'standard',
2828
bgColor = '#141414',
29-
componentsProps = {},
29+
slotProps = {},
3030
...props
3131
}: CustomTooltipProps): JSX.Element {
3232
const theme = useTheme();
@@ -36,7 +36,7 @@ function CustomTooltip({
3636
enterDelay={150}
3737
enterNextDelay={400}
3838
leaveDelay={700}
39-
componentsProps={_.merge(
39+
slotProps={_.merge(
4040
{
4141
tooltip: {
4242
sx: {
@@ -74,7 +74,7 @@ function CustomTooltip({
7474
}
7575
}
7676
},
77-
componentsProps
77+
slotProps
7878
)}
7979
title={typeof title === 'string' ? <RenderMarkdownTooltip content={title} /> : title}
8080
placement={placement}

‎src/custom/DashboardWidgets/GettingStartedWidget/ActionButtonCard.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ const ActionButtonCard = ({
123123
>
124124
<IconTitleWrapper>
125125
{icon}
126-
<Typography variant="h6" fontWeight="700">
126+
<Typography variant="h6" sx={{ fontWeight: 700 }}>
127127
{title}
128128
</Typography>
129129
</IconTitleWrapper>
@@ -177,7 +177,7 @@ const ActionButtonCard = ({
177177
>
178178
<IconTitleWrapper>
179179
{icon}
180-
<Typography variant="h6" fontWeight="700" component="div" sx={{ mx: 1 }}>
180+
<Typography variant="h6" component="div" sx={{ mx: 1, fontWeight: 700 }}>
181181
{typeof title === 'string' ? title?.toUpperCase() : title}
182182
</Typography>
183183
</IconTitleWrapper>

‎src/custom/DashboardWidgets/PlainCard.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export const PlainCard = ({ title, icon, resources }: PlainCardProps): JSX.Eleme
6666
<CardContent>
6767
<StyledTitleBox>
6868
{icon}
69-
<Typography variant="h6" fontWeight="700">
69+
<Typography variant="h6" sx={{ fontWeight: 700 }}>
7070
{title}
7171
</Typography>
7272
</StyledTitleBox>

‎src/custom/DashboardWidgets/RecentDesignWidget.tsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ const DesignCard: React.FC<DesignCardProps> = ({
174174
<HeaderContainer>
175175
<TitleContainer>
176176
{icon}
177-
<Typography variant="h6" fontWeight="700">
177+
<Typography variant="h6" sx={{ fontWeight: 700 }}>
178178
{title}
179179
</Typography>
180180
</TitleContainer>
@@ -361,10 +361,9 @@ const BoxContainer: React.FC<BoxContainerProps> = ({ title, image, onClick }) =>
361361
<Typography
362362
variant="body1"
363363
align="center"
364-
fontWeight="500"
365364
component="div"
366365
style={{}}
367-
sx={{ mt: 1, mb: 1 }}
366+
sx={{ mt: 1, mb: 1, fontWeight: 500 }}
368367
>
369368
{title}
370369
</Typography>

‎src/custom/DashboardWidgets/WorkspaceActivityWidget.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const WorkspaceActivityCard: React.FC<WorkspaceActivityCardProps> = ({
117117
<HeaderBox>
118118
<TitleWrapper>
119119
<WorkspaceIcon {...iconsProps} />
120-
<Typography variant="h6" fontWeight="700">
120+
<Typography variant="h6" sx={{ fontWeight: 700 }}>
121121
WORKSPACE ACTIVITY
122122
</Typography>
123123
</TitleWrapper>

‎src/custom/HelperTextPopover/helperTextPopover.tsx‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,20 @@ function HelperTextPopover({
5656
vertical: 'bottom',
5757
horizontal: 'center'
5858
}}
59-
PaperProps={{
60-
sx: {
61-
background: bgColor,
62-
zIndex: 1501,
63-
opacity: '1',
64-
color: WHITE,
65-
maxWidth: '500px',
66-
fontSize: fontSize || (variant === 'standard' ? '1rem' : '0.75rem'),
67-
fontWeight: fontWeight,
68-
borderRadius: '0.5rem',
69-
padding: variant === 'standard' ? '0.9rem' : '0.5rem 0.75rem',
70-
boxShadow: 'rgba(0, 0, 0, 0.6) 0px 4px 10px, rgba(0, 0, 0, 0.5) 0px 2px 4px'
59+
slotProps={{
60+
paper: {
61+
sx: {
62+
background: bgColor,
63+
zIndex: 1501,
64+
opacity: '1',
65+
color: WHITE,
66+
maxWidth: '500px',
67+
fontSize: fontSize || (variant === 'standard' ? '1rem' : '0.75rem'),
68+
fontWeight: fontWeight,
69+
borderRadius: '0.5rem',
70+
padding: variant === 'standard' ? '0.9rem' : '0.5rem 0.75rem',
71+
boxShadow: 'rgba(0, 0, 0, 0.6) 0px 4px 10px, rgba(0, 0, 0, 0.5) 0px 2px 4px'
72+
}
7173
}
7274
}}
7375
{...props}

‎src/custom/ResourceDetailFormatters/Formatter.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ export const NumberState: React.FC<NumberStateProps> = ({ title, value, quantity
791791
<NumberStateContainer>
792792
{title && <NumberStateTitle variant="body1">{title}</NumberStateTitle>}
793793
<NumberStateValueContainer>
794-
<NumberStateValue variant="h2" fontWeight="1000" gutterBottom>
794+
<NumberStateValue variant="h2" gutterBottom sx={{ fontWeight: 1000 }}>
795795
<b>{value}</b>{' '}
796796
</NumberStateValue>
797797
<NumberStateQuantity variant="subtitle2" component="div">

0 commit comments

Comments
 (0)