Skip to content

Commit 14b489b

Browse files
authored
Merge pull request #396 from vip-git/auto-complete
feat: integration with auto complete component from Material UI
2 parents 3c7c3c1 + ef35a93 commit 14b489b

File tree

15 files changed

+387
-2
lines changed

15 files changed

+387
-2
lines changed

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,16 @@
3535
],
3636
"dependencies": {
3737
"@date-io/moment": "1.3.9",
38-
"@material-ui/core": "4.11.4",
38+
"@material-ui/core": "4.12.3",
3939
"@material-ui/icons": "4.11.2",
40-
"@material-ui/lab": "4.0.0-alpha.58",
40+
"@material-ui/lab": "4.0.0-alpha.60",
4141
"@material-ui/pickers": "3.3.10",
4242
"@react-jsonschema-form-components/material-radio-group": "2.0.1",
4343
"@react-jsonschema-form-utils/enum-utils": "2.0.1",
4444
"@react-jsonschema-form-utils/parse-values": "2.0.1",
4545
"@react-jsonschema-form-interceptors/translate-range-date": "2.0.0",
4646
"@react-jsonschema-form-interceptors/translate-ratings": "2.0.0",
47+
"@react-jsonschema-form-interceptors/translate-currency": "2.0.0",
4748
"ajv": "6.12.6",
4849
"body-parser": "1.19.0",
4950
"brace": "0.11.1",

scripts/generator/components.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@
6363
"@react-jsonschema-form-utils/parse-values"
6464
]
6565
},
66+
"@react-jsonschema-form-components/material-auto-complete": {
67+
"version": "2.0.0",
68+
"type": "string",
69+
"isEnum": true,
70+
"name": "material-auto-complete",
71+
"utils": [
72+
"@react-jsonschema-form-utils/enum-utils",
73+
"@react-jsonschema-form-utils/parse-values"
74+
]
75+
},
6676
"@react-jsonschema-form-components/material-checkbox": {
6777
"version": "2.0.4",
6878
"type": "string",

scripts/generator/package-lock.json

Lines changed: 19 additions & 0 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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"dependencies": {
1313
"@react-jsonschema-form-components/creatable-react-select": "2.0.2",
1414
"@react-jsonschema-form-components/empty-div": "2.0.1",
15+
"@react-jsonschema-form-components/material-auto-complete": "1.0.0",
1516
"@react-jsonschema-form-components/material-checkbox": "2.0.4",
1617
"@react-jsonschema-form-components/material-input": "2.0.1",
1718
"@react-jsonschema-form-components/material-picker": "2.0.1",

src/demo/examples/simple/schema.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
"title": "Example React select",
3030
"enum": ["Yes", "No"]
3131
},
32+
"auto-complete": {
33+
"type": "string",
34+
"title": "Example Auto Complete",
35+
"enum": ["Yes", "No"]
36+
},
3237
"password": {
3338
"type": "string",
3439
"title": "Password",
@@ -131,6 +136,14 @@
131136
]
132137
}
133138
},
139+
"autoComplete": {
140+
"type": "array",
141+
"title": "Example Multi-Select Auto Complete",
142+
"items": {
143+
"type": "string",
144+
"enum": ["test", "teete", "etetet"]
145+
}
146+
},
134147
"creatableSelectTest": {
135148
"type": "array",
136149
"title": "Example creatable select",

src/demo/examples/simple/ui-schema.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@
2424
"ui:autofocus": true,
2525
"ui:emptyValue": ""
2626
},
27+
"auto-complete": {
28+
"ui:widget": "material-auto-complete",
29+
"ui:props": {
30+
"disableClearable": false
31+
}
32+
},
2733
"react-select": {
2834
"ui:widget": "material-select",
2935
"ui:isClearable": true,
@@ -109,6 +115,12 @@
109115
"className": "money"
110116
}
111117
},
118+
"autoComplete": {
119+
"ui:widget": "material-auto-complete",
120+
"ui:props": {
121+
"disableClearable": false
122+
}
123+
},
112124
"xhrSelectTest": {
113125
"ui:widget": "material-multiselect"
114126
},

src/demo/examples/simple/xhr-schema.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"lastName:last_name": "${string.lastName}",
2727
"select": "${string.select}",
2828
"react-select:react_select": "${string.react-select}",
29+
"auto-complete:auto_complete": "${string.auto-complete}",
2930
"upload": "${string.upload}",
3031
"bio": "${string.bio}",
3132
"date": "${string.date}",
@@ -81,6 +82,7 @@
8182
"lastName": "${string.last_name}",
8283
"select": "${string.select}",
8384
"react-select": "${string.react_select}",
85+
"auto-complete": "${string.auto_complete}",
8486
"upload": "${string.upload}",
8587
"bio": "${string.bio}",
8688
"date": "${string.date}",

src/fields/ConfiguredField.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export const RawConfiguredField = ({
8181
value={data}
8282
type={type}
8383
error={!isEmpty(hasError) || undefined}
84+
title={title}
8485
{...componentProps}
8586
/>
8687
{helpText && !isCustomComponent && (
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
__tests__
2+
src
3+
node_modules
4+
tsconfig.json
5+
package-lock.json
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "@react-jsonschema-form-components/material-auto-complete",
3+
"version": "2.0.0",
4+
"main": "dist/index.js",
5+
"scripts": {
6+
"build": "rm -rf dist && tsc",
7+
"prepublishOnly": "npm run build"
8+
},
9+
"dependencies": {
10+
"@react-jsonschema-form-utils/enum-utils": "2.0.1",
11+
"@react-jsonschema-form-utils/parse-values": "2.0.1"
12+
},
13+
"author": "Vipin Tanna"
14+
}

0 commit comments

Comments
 (0)