Skip to content

Commit cf76be8

Browse files
committed
feat(mui): migrate to mui 5
1 parent fb41e0e commit cf76be8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+243
-148
lines changed

packages/mui-component-mapper/package.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,28 +25,26 @@
2525
"directory": "packages/mui-component-mapper"
2626
},
2727
"devDependencies": {
28-
"@material-ui/core": "^4.11.0",
29-
"@material-ui/icons": "^4.9.1",
30-
"@material-ui/styles": "^4.10.0"
28+
"@mui/icons-material": "^5.0.4",
29+
"@mui/material": "^5.0.4",
30+
"@mui/styles": "^5.0.1"
3131
},
3232
"peerDependencies": {
3333
"@data-driven-forms/react-form-renderer": ">=3.2.1",
3434
"@material-ui/core": "^4.11.0",
3535
"@material-ui/icons": "^4.9.1",
3636
"@material-ui/styles": "^4.9.14",
3737
"prop-types": ">=15.7.2",
38-
"react": "^16.13.1 || ^17.0.2",
39-
"react-dom": "^16.13.1 || ^17.0.2"
38+
"react": "^17.0.2",
39+
"react-dom": "^17.0.2"
4040
},
4141
"dependencies": {
4242
"@data-driven-forms/common": "*",
43-
"@date-io/date-fns": "^1.0.1",
44-
"@date-io/moment": "^1.0.1",
45-
"@material-ui/pickers": "^3.2.10",
43+
"@emotion/react": "^11.5.0",
44+
"@emotion/styled": "^11.3.0",
45+
"@mui/lab": "^5.0.0-alpha.51",
4646
"clsx": "^1.0.4",
47-
"date-fns": "^1.30.1",
4847
"lodash": "^4.17.21",
49-
"moment": "^2.23.0",
50-
"@material-ui/lab": "^4.0.0-alpha.53"
48+
"moment": "^2.23.0"
5149
}
5250
}

packages/mui-component-mapper/src/checkbox/checkbox.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { UseFieldApiComponentConfig } from '@data-driven-forms/react-form-renderer';
2-
import { CheckboxProps as MuiCheckboxProps, GridProps, FormControlProps, FormGroupProps, FormControlLabelProps, FormLabelProps, FormHelperTextProps } from '@material-ui/core';
2+
import { CheckboxProps as MuiCheckboxProps, GridProps, FormControlProps, FormGroupProps, FormControlLabelProps, FormLabelProps, FormHelperTextProps } from '@mui/material';
33

44
interface InternalCheckboxProps extends MuiCheckboxProps {
55
FormFieldGridProps?: GridProps;

packages/mui-component-mapper/src/checkbox/checkbox.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { Checkbox as MUICheckbox, FormControl, FormControlLabel, FormHelperText, FormGroup, FormLabel } from '@material-ui/core';
3+
import { Checkbox as MUICheckbox, FormControl, FormControlLabel, FormHelperText, FormGroup, FormLabel } from '@mui/material';
44
import { meta, input } from '@data-driven-forms/common/prop-types-templates';
55

66
import FormFieldGrid from '../form-field-grid/form-field-grid';

packages/mui-component-mapper/src/date-picker/date-picker.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { DatePickerProps as MuiDatePickerProps } from "@material-ui/pickers/DatePicker";
22
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
3-
import { GridProps } from "@material-ui/core";
3+
import { GridProps } from "@mui/material";
44
import { MuiPickersUtilsProviderProps } from "@material-ui/pickers/MuiPickersUtilsProvider";
55

66
interface InternalDatePickerProps extends MuiDatePickerProps {

packages/mui-component-mapper/src/date-picker/date-picker.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3-
import { MuiPickersUtilsProvider, DatePicker as MUIDatePicker } from '@material-ui/pickers';
4-
import MomentUtils from '@date-io/moment';
3+
4+
import MUIDatePicker from '@mui/lab/DatePicker';
5+
import AdapterDateFns from '@mui/lab/AdapterDateFns';
6+
import LocalizationProvider from '@mui/lab/LocalizationProvider';
57

68
import FormFieldGrid from '../form-field-grid/form-field-grid';
79
import { validationError } from '../validation-error/validation-error';
@@ -29,7 +31,7 @@ const DatePicker = (props) => {
2931

3032
return (
3133
<FormFieldGrid {...FormFieldGridProps}>
32-
<MuiPickersUtilsProvider locale={locale} utils={MomentUtils} {...MuiPickersUtilsProviderProps}>
34+
<LocalizationProvider locale={locale} adapter={AdapterDateFns} {...MuiPickersUtilsProviderProps}>
3335
<MUIDatePicker
3436
fullWidth
3537
margin="normal"
@@ -44,7 +46,7 @@ const DatePicker = (props) => {
4446
value={input.value || null}
4547
{...DatePickerProps}
4648
/>
47-
</MuiPickersUtilsProvider>
49+
</LocalizationProvider>
4850
</FormFieldGrid>
4951
);
5052
};

packages/mui-component-mapper/src/dual-list-select/dual-list-select.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
ToolbarProps,
1717
TextFieldProps,
1818
PaperProps,
19-
} from "@material-ui/core";
19+
} from "@mui/material";
2020

2121
export interface DualListOption extends AnyObject {
2222
value: any;

packages/mui-component-mapper/src/dual-list-select/dual-list-select.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ import {
1919
Typography,
2020
Paper,
2121
Button,
22-
} from '@material-ui/core';
22+
} from '@mui/material';
2323

24-
import SortIcon from '@material-ui/icons/ArrowUpward';
24+
import SortIcon from '@mui/icons-material/ArrowUpward';
2525

26-
import { makeStyles } from '@material-ui/core/styles';
26+
import makeStyles from '@mui/styles/makeStyles';
2727

2828
import DualListSelectCommon from '@data-driven-forms/common/dual-list-select';
2929

@@ -191,7 +191,15 @@ const ToolbarInternal = ({
191191
{...LeftFilterFieldProps}
192192
className={clsx(classes.filter, FilterFieldProps && FilterFieldProps.className, LeftFilterFieldProps && LeftFilterFieldProps.className)}
193193
/>
194-
<IconButton aria-label="sort options" edge="end" onClick={sortOptions} color="inherit" {...SortIconButtonProps} {...LeftSortIconButtonProps}>
194+
<IconButton
195+
aria-label="sort options"
196+
edge="end"
197+
onClick={sortOptions}
198+
color="inherit"
199+
{...SortIconButtonProps}
200+
{...LeftSortIconButtonProps}
201+
size="large"
202+
>
195203
<SortIcon
196204
{...SortIconProps}
197205
{...LeftSortIconProps}

packages/mui-component-mapper/src/field-array/field-array.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ReactNode } from "react";
22
import { FieldArrayField } from "@data-driven-forms/react-form-renderer";
3-
import { FormControlProps, GridProps, ButtonProps, FormHelperTextProps, TypographyProps } from "@material-ui/core";
3+
import { FormControlProps, GridProps, ButtonProps, FormHelperTextProps, TypographyProps } from "@mui/material";
44

55
export interface FieldArrayButtonLabels {
66
add?: ReactNode;

packages/mui-component-mapper/src/field-array/field-array.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import PropTypes from 'prop-types';
33
import { useFormApi, FieldArray } from '@data-driven-forms/react-form-renderer';
44
import isEqual from 'lodash/isEqual';
55

6-
import { Grid, Button, Typography, FormControl, FormHelperText, IconButton } from '@material-ui/core';
6+
import { Grid, Button, Typography, FormControl, FormHelperText, IconButton } from '@mui/material';
77

8-
import { makeStyles } from '@material-ui/core/styles';
9-
import RedoIcon from '@material-ui/icons/Redo';
10-
import UndoIcon from '@material-ui/icons/Undo';
8+
import makeStyles from '@mui/styles/makeStyles';
9+
import RedoIcon from '@mui/icons-material/Redo';
10+
import UndoIcon from '@mui/icons-material/Undo';
1111

1212
import { useFieldApi } from '@data-driven-forms/react-form-renderer';
1313

@@ -217,7 +217,15 @@ const DynamicArray = ({ ...props }) => {
217217
{label}
218218
</Typography>
219219
)}
220-
<IconButton color="primary" aria-label="undo" component="span" disabled={state.index === 0} onClick={undo} {...UndoButtonProps}>
220+
<IconButton
221+
color="primary"
222+
aria-label="undo"
223+
component="span"
224+
disabled={state.index === 0}
225+
onClick={undo}
226+
{...UndoButtonProps}
227+
size="large"
228+
>
221229
<UndoIcon />
222230
</IconButton>
223231
<IconButton
@@ -227,6 +235,7 @@ const DynamicArray = ({ ...props }) => {
227235
disabled={state.index === state.history.length}
228236
onClick={redo}
229237
{...RedoButtonProps}
238+
size="large"
230239
>
231240
<RedoIcon />
232241
</IconButton>

packages/mui-component-mapper/src/form-field-grid/form-field-grid.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AnyObject } from '@data-driven-forms/react-form-renderer';
2-
import { GridProps } from '@material-ui/core';
2+
import { GridProps } from '@mui/material';
33

44
declare const FormFieldGrid: React.ComponentType<GridProps>;
55

0 commit comments

Comments
 (0)