Skip to content

Commit 8482cc9

Browse files
committed
fix(mui): migrate date pickers to x-date-pickers
1 parent 1688c86 commit 8482cc9

File tree

10 files changed

+20
-22
lines changed

10 files changed

+20
-22
lines changed

packages/common/babel.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ const createSuirCJSTransform = (env = 'commonjs') => [
7272
const createMuiTransform = (env) => [
7373
'transform-imports',
7474
{
75-
'@mui/lab': {
76-
transform: (importName) => (env ? `@mui/lab/${env}/${importName}` : `@mui/lab/${importName}`),
75+
'@mui/x-date-pickers': {
76+
transform: (importName) => (env ? `@mui/x-date-pickers/${env}/${importName}` : `@mui/x-date-pickers/${importName}`),
7777
preventFullImport: false,
7878
skipDefaultConversion: false
7979
},

packages/mui-component-mapper/demo/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import Grid from '@mui/material/Grid';
66
import { componentMapper, FormTemplate } from '../src';
77
import { createTheme } from '@mui/material/styles';
88
import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
9-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
9+
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
1010
import Typography from '@mui/material/Typography';
1111
import demoSchema from '../../../shared/demoschema';
1212
import fieldArraySchema from './demo-schemas/field-array-schema';
13-
import AdapterDateFns from '@mui/lab/AdapterDateFns';
13+
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
1414

1515
import Button from '@mui/material/Button';
1616
import wizardSchema from './demo-schemas/wizard-schema';

packages/mui-component-mapper/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@data-driven-forms/common": "*",
4343
"@emotion/react": "^11.5.0",
4444
"@emotion/styled": "^11.3.0",
45-
"@mui/lab": "^5.0.0-alpha.53",
45+
"@mui/x-date-pickers": "^5.0.0-beta.0",
4646
"clsx": "^1.0.4",
4747
"date-fns": "^2.16.1",
4848
"lodash": "^4.17.21"
Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
import { DatePickerProps as MuiDatePickerProps } from "@mui/lab/DatePicker";
1+
import { DatePickerProps as MuiDatePickerProps } from "@mui/x-date-pickers/DatePicker";
22
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
33
import { GridProps } from "@mui/material";
4-
interface InternalDatePickerProps extends MuiDatePickerProps {
4+
type InternalDatePickerProps<TInputDate, TDate> = MuiDatePickerProps<TInputDate, TDate> & {
55
FormFieldGridProps: GridProps;
6-
DatePickerProps: MuiDatePickerProps;
76
}
87

9-
export type DatePickerProps = InternalDatePickerProps & UseFieldApiComponentConfig;
10-
11-
declare const DatePicker: React.ComponentType<DatePickerProps>;
8+
export type DatePickerProps<TInputDate, TDate> = InternalDatePickerProps<TInputDate, TDate> & UseFieldApiComponentConfig;
9+
declare const DatePicker: React.ComponentType<DatePickerProps<any, any>>;
1210

1311
export default DatePicker;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
33

4-
import { DatePicker as MUIDatePicker } from '@mui/lab';
4+
import { DatePicker as MUIDatePicker } from '@mui/x-date-pickers';
55

66
import FormFieldGrid from '../form-field-grid/form-field-grid';
77
import { validationError } from '../validation-error/validation-error';

packages/mui-component-mapper/src/tests/form-fields.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import { FormRenderer, componentTypes, validatorTypes } from '@data-driven-forms/react-form-renderer';
3-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
4-
import AdapterDateFns from '@mui/lab/AdapterDateFns';
3+
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
4+
import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
55
import { act, render, screen } from '@testing-library/react';
66
import userEvent from '@testing-library/user-event';
77

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { UseFieldApiComponentConfig } from "@data-driven-forms/react-form-renderer";
2-
import { TimePickerProps as MuiTimePickerProps } from '@mui/lab';
2+
import { TimePickerProps as MuiTimePickerProps } from '@mui/x-date-pickers';
33
import { ReactNode } from "react";
44
import { GridProps } from "@mui/material";
5-
interface InternalTimePickerProps extends MuiTimePickerProps {
5+
interface InternalTimePickerProps extends MuiTimePickerProps<unknown, unknown> {
66
isReadOnly?: boolean;
77
isDisabled?: boolean;
88
isRequired?: boolean;

packages/mui-component-mapper/src/time-picker/time-picker.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 { TimePicker as MUITimePicker } from '@mui/lab';
3+
import { TimePicker as MUITimePicker } from '@mui/x-date-pickers';
44

55
import FormFieldGrid from '../form-field-grid/form-field-grid';
66
import { validationError } from '../validation-error/validation-error';

packages/react-renderer-demo/src/examples/components/conditions/is-function.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import DatePicker from '@data-driven-forms/mui-component-mapper/date-picker';
66
import PlainText from '@data-driven-forms/mui-component-mapper/plain-text';
77
import FormTemplate from '@data-driven-forms/mui-component-mapper/form-template';
88

9-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
10-
import AdapterDateFns from '@mui/lab/AdapterDateFns';
9+
import LocalizationProvider from '@mui/x-date-pickers/LocalizationProvider';
10+
import AdapterDateFns from '@mui/x-date-pickers/AdapterDateFns';
1111

1212
const calculateAge = (birthday) => {
1313
let ageDifMs = Date.now() - birthday;

packages/react-renderer-demo/src/stackblitz-templates/mui-templates.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import { render } from 'react-dom';
1414
import FormRenderer from '@data-driven-forms/react-form-renderer/form-renderer';
1515
import FormTemplate from '@data-driven-forms/mui-component-mapper/form-template';
1616
import componentMapper from '@data-driven-forms/mui-component-mapper/component-mapper';
17-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
18-
import AdapterDateFns from '@mui/lab/AdapterDateFns';
17+
import LocalizationProvider from '@mui/x-date-pickers/LocalizationProvider';
18+
import AdapterDateFns from '@mui/x-date-pickers/AdapterDateFns';
1919
2020
import schema from './schema'
2121
@@ -73,7 +73,7 @@ export const dependencies = {
7373
'@data-driven-forms/mui-component-mapper': 'latest',
7474
'@data-driven-forms/common': 'latest',
7575
'@mui/icons-material': 'latest',
76-
'@mui/lab': 'latest',
76+
'@mui/x-date-pickers': 'latest',
7777
'@mui/material': 'latest',
7878
'@mui/styles': 'latest',
7979
'prop-types': 'latest',

0 commit comments

Comments
 (0)