@jsonforms/material-renderers 3.2.0-alpha.0 → 3.2.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/jsonforms-react-material.cjs.js +5 -2
  2. package/lib/jsonforms-react-material.cjs.js.map +1 -1
  3. package/lib/jsonforms-react-material.esm.js +6 -3
  4. package/lib/jsonforms-react-material.esm.js.map +1 -1
  5. package/package.json +6 -6
  6. package/src/complex/MaterialEnumArrayRenderer.tsx +6 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jsonforms/material-renderers",
3
- "version": "3.2.0-alpha.0",
3
+ "version": "3.2.0-alpha.2",
4
4
  "description": "Material Renderer Set for JSON Forms",
5
5
  "repository": "https://github.com/eclipsesource/jsonforms",
6
6
  "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -85,8 +85,8 @@
85
85
  "peerDependencies": {
86
86
  "@emotion/react": "^11.4.1",
87
87
  "@emotion/styled": "^11.3.0",
88
- "@jsonforms/core": "3.1.1-alpha.1",
89
- "@jsonforms/react": "3.1.1-alpha.1",
88
+ "@jsonforms/core": "3.2.0-alpha.2",
89
+ "@jsonforms/react": "3.2.0-alpha.2",
90
90
  "@mui/icons-material": "^5.11.16",
91
91
  "@mui/material": "~5.13.0",
92
92
  "@mui/x-date-pickers": "^6.0.0",
@@ -95,8 +95,8 @@
95
95
  "devDependencies": {
96
96
  "@emotion/react": "^11.5.0",
97
97
  "@emotion/styled": "^11.3.0",
98
- "@jsonforms/core": "3.2.0-alpha.0",
99
- "@jsonforms/react": "3.2.0-alpha.0",
98
+ "@jsonforms/core": "3.2.0-alpha.2",
99
+ "@jsonforms/react": "3.2.0-alpha.2",
100
100
  "@mui/icons-material": "~5.11.16",
101
101
  "@mui/material": "~5.13.0",
102
102
  "@mui/x-date-pickers": "^6.5.0",
@@ -141,5 +141,5 @@
141
141
  "webpack-cli": "^3.2.1",
142
142
  "webpack-dev-server": "^3.9.0"
143
143
  },
144
- "gitHead": "9146b0fdf5913d2251fadd5435d2c7e813db6f71"
144
+ "gitHead": "f922f48cb7548cefd8f1acd939a9afbd14b36f9b"
145
145
  }
package/src/complex/MaterialEnumArrayRenderer.tsx CHANGED
@@ -8,6 +8,7 @@ import {
8
8
  Paths,
9
9
  RankedTester,
10
10
  rankWith,
11
+ resolveSchema,
11
12
  schemaMatches,
12
13
  schemaSubPathMatches,
13
14
  uiTypeIs,
@@ -99,8 +100,11 @@ export const materialEnumArrayRendererTester: RankedTester = rankWith(
99
100
  !Array.isArray(schema.items) &&
100
101
  schema.uniqueItems === true
101
102
  ),
102
- schemaSubPathMatches('items', (schema) => {
103
- return hasOneOfItems(schema) || hasEnumItems(schema);
103
+ schemaSubPathMatches('items', (schema, rootSchema) => {
104
+ const resolvedSchema = schema.$ref
105
+ ? resolveSchema(rootSchema, schema.$ref, rootSchema)
106
+ : schema;
107
+ return hasOneOfItems(resolvedSchema) || hasEnumItems(resolvedSchema);
104
108
  })
105
109
  )
106
110
  )