@jsonforms/core 3.2.0-alpha.1 → 3.2.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/core",
-  "version": "3.2.0-alpha.1",
+  "version": "3.2.0-alpha.2",
   "description": "Core module of JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -99,5 +99,5 @@
     "typedoc": "~0.21.9",
     "typescript": "4.2.3"
   },
-  "gitHead": "deb2c7cd71f6065cca7777420b1018f17e73052a"
+  "gitHead": "f922f48cb7548cefd8f1acd939a9afbd14b36f9b"
 }

package/src/util/renderer.ts

@@ -78,6 +78,7 @@ import {
   arrayDefaultTranslations,
   ArrayTranslations,
 } from '../i18n/arrayTranslations';
+import { resolveSchema } from './resolvers';
 
 const isRequired = (
   schema: JsonSchema,
@@ -617,7 +618,11 @@ export const mapStateToMultiEnumControlProps = (
   ownProps: OwnPropsOfControl & OwnPropsOfEnum
 ): StatePropsOfControl & OwnPropsOfEnum => {
   const props: StatePropsOfControl = mapStateToControlProps(state, ownProps);
-  const items = props.schema.items as JsonSchema;
+  let items = props.schema.items as JsonSchema;
+  items =
+    items && items.$ref
+      ? resolveSchema(props.rootSchema, items.$ref, props.rootSchema)
+      : items;
   const options: EnumOption[] =
     ownProps.options ||
     (items?.oneOf &&

package/src/util/util.ts

@@ -77,7 +77,17 @@ export const deriveTypes = (jsonSchema: JsonSchema): string[] => {
   if (!isEmpty(jsonSchema.items)) {
     return ['array'];
   }
-
+  if (!isEmpty(jsonSchema.enum)) {
+    const types: Set<string> = new Set();
+    jsonSchema.enum.forEach((enumElement) => {
+      if (typeof enumElement === 'string') {
+        types.add('string');
+      } else {
+        deriveTypes(enumElement).forEach((type) => types.add(type));
+      }
+    });
+    return Array.from(types);
+  }
   if (!isEmpty(jsonSchema.allOf)) {
     const allOfType = find(
       jsonSchema.allOf,