Skip to content

Commit c453961

Browse files
authored
Merge pull request #1353 from layer5io/copilot/fix-build-bug
Fix Meshery UI integration build break by using stable MUI Grid2 imports
2 parents 4fdde0e + e9e0414 commit c453961

File tree

7 files changed

+13
-7
lines changed

7 files changed

+13
-7
lines changed

src/base/Grid2/Grid2.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Grid2 as MuiGrid, Grid2Props as MuiGridProps } from '@mui/material';
1+
import MuiGrid, { Grid2Props as MuiGridProps } from '@mui/material/Grid2';
22
import React from 'react';
33

44
const Grid2 = React.forwardRef<HTMLDivElement, MuiGridProps>((props, ref) => {

src/custom/DashboardWidgets/GettingStartedWidget/GetStartedModal.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
2-
import { Grid2, SwipeableDrawer } from '@mui/material';
2+
import Grid2 from '@mui/material/Grid2';
3+
import { SwipeableDrawer } from '@mui/material';
34
import { useState } from 'react';
45
import {
56
Backdrop,

src/custom/InputSearchField/InputSearchField.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Autocomplete, Grid2 } from '@mui/material';
1+
import Grid2 from '@mui/material/Grid2';
2+
import { Autocomplete } from '@mui/material';
23
import React, { useCallback, useEffect, useState } from 'react';
34
import { Box, Chip, CircularProgress, TextField, Tooltip, Typography } from '../../base';
45

src/custom/ResourceDetailFormatters/styles.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { alpha, Grid2 } from '@mui/material';
1+
import Grid2 from '@mui/material/Grid2';
2+
import { alpha } from '@mui/material';
23
import { Box, Chip, IconButton, Typography } from '../../base';
34

45
import { charcoal, KEPPEL, styled } from '../../theme';

src/custom/TeamTable/TeamTable.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-explicit-any */
2-
import { Grid2, TableCell } from '@mui/material';
2+
import Grid2 from '@mui/material/Grid2';
3+
import { TableCell } from '@mui/material';
34
import { MUIDataTableColumn } from '@sistent/mui-datatables';
45
import { styled, useTheme } from '../../theme';
56
import { ErrorBoundary } from '../ErrorBoundary/ErrorBoundary.js';

src/custom/TransferModal/TransferList/style.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Grid2, styled } from '@mui/material';
1+
import Grid2 from '@mui/material/Grid2';
2+
import { styled } from '@mui/material';
23
import { Button, Chip, Paper, Typography } from '../../../base';
34

45
export const StyledChip = styled(Chip)(({ theme }) => ({

src/custom/Workspaces/WorkspaceCard.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Grid2, useTheme } from '@mui/material';
1+
import Grid2 from '@mui/material/Grid2';
2+
import { useTheme } from '@mui/material';
23
import { Backdrop, CircularProgress } from '../../base';
34

45
import { getRelativeTime } from '../../utils';

0 commit comments

Comments
 (0)