Skip to content

Commit 0d0ccbc

Browse files
committed
feat(decorator-mui): move to @mui/x-date-pickers
1 parent e62d271 commit 0d0ccbc

File tree

8 files changed

+14
-12
lines changed

8 files changed

+14
-12
lines changed

packages/decorator-mui/jest.config.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module.exports = async () => {
22
return {
33
rootDir: __dirname,
4+
testPathIgnorePatterns: ['lib/**/*.js'],
45
coverageReporters: [
56
'json',
67
'text',

packages/decorator-mui/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
"@forml/context": "^1.6.0",
3939
"@forml/core": "^1.6.0",
4040
"@forml/hooks": "^1.6.0",
41-
"@testing-library/react": "^12.1.5",
4241
"@testing-library/jest-dom": "^5.16.5",
42+
"@testing-library/react": "^12.1.5",
4343
"babel-jest": "^29.2.2",
4444
"jest": "^29.2.2",
4545
"moment": "^2.29.4"
@@ -52,6 +52,7 @@
5252
"@mui/lab": "^5.0.0-alpha.71",
5353
"@mui/material": "^5.4.4",
5454
"@mui/styles": "^5.4.4",
55+
"@mui/x-date-pickers": "^5.0.0-alpha.1",
5556
"react": "^17.0.0||^18.0.0"
5657
},
5758
"gitHead": "070e7bf9829f1b21c2d7100f935fdc624d43fdef",

packages/decorator-mui/src/__tests__/mui.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import '@testing-library/jest-dom/extend-expect';
22

3-
import MomentAdapter from '@mui/lab/AdapterMoment';
4-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
3+
import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
4+
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
55
import { render } from '@testing-library/react';
66
import { SchemaForm, util } from '@forml/core';
77
import React from 'react';
@@ -58,7 +58,7 @@ describe('Material UI', function () {
5858
const model = util.defaultForSchema(schema);
5959
const { container } = render(
6060
<ThemeProvider theme={theme}>
61-
<LocalizationProvider dateAdapter={MomentAdapter}>
61+
<LocalizationProvider dateAdapter={AdapterMoment}>
6262
<SchemaForm
6363
schema={schema}
6464
form={form}

packages/decorator-mui/src/arrays/__tests__/__snapshots__/item.test.jsx.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`renders consistently 1`] = `
44
<div>
55
<li
6-
class="MuiListItem-root MuiListItem-padding MuiListItem-divider makeStyles-item-4 css-1kdod17-MuiListItem-root"
6+
class="MuiListItem-root MuiListItem-dense MuiListItem-padding MuiListItem-divider makeStyles-item-4 css-aq01c0-MuiListItem-root"
77
>
88
<div
99
class="makeStyles-topDragHandle-7"

packages/decorator-mui/src/input/__tests__/date.test.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Context from '@forml/context';
33
import React from 'react';
44
import { render } from '@testing-library/react';
55
import * as decorator from '../../';
6-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
7-
import MomentAdapter from '@mui/lab/AdapterMoment';
6+
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
7+
import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
88
import moment from 'moment';
99
import 'moment-timezone';
1010

@@ -37,7 +37,7 @@ describe('renders', function () {
3737
test(`${value}`, function () {
3838
form = { ...form, [field]: value };
3939
const { container } = render(
40-
<LocalizationProvider dateAdapter={MomentAdapter}>
40+
<LocalizationProvider dateAdapter={AdapterMoment}>
4141
<Context.Provider value={{ decorator }}>
4242
<DateComponent
4343
form={form}

packages/decorator-mui/src/input/__tests__/datetime.test.jsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Context from '@forml/context';
33
import React from 'react';
44
import { render } from '@testing-library/react';
55
import * as decorator from '../../';
6-
import LocalizationProvider from '@mui/lab/LocalizationProvider';
7-
import AdapterMoment from '@mui/lab/AdapterMoment';
6+
import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
7+
import { AdapterMoment } from '@mui/x-date-pickers/AdapterMoment';
88
import moment from 'moment';
99
import 'moment-timezone';
1010

packages/decorator-mui/src/input/date.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import DatePicker from '@mui/lab/DatePicker';
1+
import { DatePicker } from '@mui/x-date-pickers/DatePicker';
22
import Input from '@mui/material/Input';
33
import React from 'react';
44

packages/decorator-mui/src/input/datetime.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import DateTimePicker from '@mui/lab/DateTimePicker';
1+
import { DateTimePicker } from '@mui/x-date-pickers/DateTimePicker';
22
import Input from '@mui/material/Input';
33
import React from 'react';
44

0 commit comments

Comments
 (0)