Skip to content

Commit eb8a2c2

Browse files
committed
fix: date component issues resolved
1 parent 31d8ffe commit eb8a2c2

File tree

6 files changed

+18
-16
lines changed

6 files changed

+18
-16
lines changed

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.3",
93+
"version": "4.0.4",
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.3",
18+
"@react-jsonschema-form-components/material-picker": "4.0.4",
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.3",
3+
"version": "4.0.4",
44
"author": "Vipin Tanna",
55
"main": "dist/index.js",
66
"scripts": {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default ({
1515
htmlid,
1616
type,
1717
uiSchema = {},
18+
schema,
1819
onChange,
1920
...rest
2021
}) => {
@@ -33,16 +34,17 @@ export default ({
3334
<PickerComp
3435
mask={placeholder}
3536
label={label}
36-
toolbarTitle={label}
37+
toolbarTitle={schema.title}
3738
value={typeof value === 'undefined' ? null : value}
3839
inputFormat={format}
3940
open={open}
4041
onClose={() => setOpen(false)}
42+
cancelText={false}
43+
readOnly={false}
4144
renderInput={(params) => (
4245
<TextField
4346
{...params}
4447
style={{ width: '100%'}}
45-
onClick={() => setOpen(true)}
4648
InputProps={{
4749
endAdornment: (
4850
<InputAdornment position='end'>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ import TimePicker from '@mui/lab/TimePicker';
66

77
export const renderPickerComp = (type) => {
88
switch (type) {
9-
case 'material-desktop-date':
9+
case 'material-mobile-date':
1010
return {
11-
PickerComp: DesktopDatePicker,
11+
PickerComp: MobileDatePicker,
1212
maskInput: [/\d/, /\d/, '-', /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/],
1313
format: 'DD-MM-YYYY',
1414
placeholder: '__-__-____',
1515
};
1616
case 'material-date':
1717
return {
18-
PickerComp: MobileDatePicker,
18+
PickerComp: DesktopDatePicker,
1919
maskInput: [/\d/, /\d/, '-', /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/],
2020
format: 'DD-MM-YYYY',
2121
placeholder: '__-__-____',
@@ -63,7 +63,7 @@ export const renderPickerComp = (type) => {
6363
};
6464
default:
6565
return {
66-
PickerComp: MobileDatePicker,
66+
PickerComp: DesktopDatePicker,
6767
maskInput: [/\d/, /\d/, '-', /\d/, /\d/, '-', /\d/, /\d/, /\d/, /\d/],
6868
format: 'DD-MM-YYYY',
6969
placeholder: '__-__-____',

0 commit comments

Comments
 (0)