Skip to content

Commit 31d8ffe

Browse files
committed
fix: issues resolved
1 parent ddeed0f commit 31d8ffe

File tree

8 files changed

+79
-87
lines changed

8 files changed

+79
-87
lines changed

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"test"
3535
],
3636
"dependencies": {
37-
"@date-io/moment": "1.3.9",
37+
"@date-io/moment": "2.11.0",
3838
"@emotion/react": "11.4.1",
3939
"@emotion/styled": "11.3.0",
4040
"@mui/icons-material": "5.0.0",

scripts/generator/components.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
"utils": ["@react-jsonschema-form-utils/enum-utils"]
9191
},
9292
"@react-jsonschema-form-components/material-picker": {
93-
"version": "4.0.2",
93+
"version": "4.0.3",
9494
"type": "string",
9595
"hasDist": true,
9696
"isEnum": false,

scripts/generator/package-lock.json

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

scripts/generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@react-jsonschema-form-components/material-auto-complete": "3.0.0",
1616
"@react-jsonschema-form-components/material-checkbox": "3.0.0",
1717
"@react-jsonschema-form-components/material-input": "3.0.0",
18-
"@react-jsonschema-form-components/material-picker": "4.0.1",
18+
"@react-jsonschema-form-components/material-picker": "4.0.3",
1919
"@react-jsonschema-form-components/material-radio-group": "3.0.0",
2020
"@react-jsonschema-form-components/material-select": "3.0.0",
2121
"@react-jsonschema-form-components/react-select": "4.0.0",

src/fields/components/Picker/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@react-jsonschema-form-components/material-picker",
3-
"version": "4.0.2",
3+
"version": "4.0.3",
44
"author": "Vipin Tanna",
55
"main": "dist/index.js",
66
"scripts": {

src/fields/components/Picker/src/index.tsx

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// Library
22
import React from 'react';
33
import TextField from '@mui/material/TextField';
4+
import IconButton from '@mui/material/IconButton';
5+
import InputAdornment from '@mui/material/InputAdornment';
6+
import EventIcon from '@mui/icons-material/Event';
47
import pickerProps, { renderPickerComp } from './picker.props';
58

69
export default ({
@@ -15,6 +18,7 @@ export default ({
1518
onChange,
1619
...rest
1720
}) => {
21+
const [open, setOpen] = React.useState(false)
1822
const pickerType = uiSchema['ui:props']?.variant || uiSchema['ui:widget'] || type;
1923
const { PickerComp, placeholder, format } = renderPickerComp(pickerType);
2024
return (
@@ -29,9 +33,30 @@ export default ({
2933
<PickerComp
3034
mask={placeholder}
3135
label={label}
32-
value={(value === undefined) ? null : value}
33-
maxDate={'2200-01-01'}
34-
renderInput={(params) => <TextField {...params} value={(value === undefined) ? null : value} />}
36+
toolbarTitle={label}
37+
value={typeof value === 'undefined' ? null : value}
38+
inputFormat={format}
39+
open={open}
40+
onClose={() => setOpen(false)}
41+
renderInput={(params) => (
42+
<TextField
43+
{...params}
44+
style={{ width: '100%'}}
45+
onClick={() => setOpen(true)}
46+
InputProps={{
47+
endAdornment: (
48+
<InputAdornment position='end'>
49+
<IconButton
50+
aria-label='date'
51+
onClick={() => setOpen(true)}
52+
>
53+
<EventIcon />
54+
</IconButton>
55+
</InputAdornment>
56+
)
57+
}}
58+
/>
59+
)}
3560
{...pickerProps({ onChange })}
3661
{...options}
3762
/>

src/fields/components/Picker/src/picker.props.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
// Library
22
import MobileDatePicker from '@mui/lab/MobileDatePicker';
3+
import DesktopDatePicker from '@mui/lab/DesktopDatePicker';
34
import MobileDateTimePicker from '@mui/lab/MobileDateTimePicker';
45
import TimePicker from '@mui/lab/TimePicker';
56

67
export const renderPickerComp = (type) => {
78
switch (type) {
9+
case 'material-desktop-date':
10+
return {
11+
PickerComp: DesktopDatePicker,
12+
maskInput: [/\d/, /\d/, '-', /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/],
13+
format: 'DD-MM-YYYY',
14+
placeholder: '__-__-____',
15+
};
816
case 'material-date':
917
return {
1018
PickerComp: MobileDatePicker,

0 commit comments

Comments
 (0)