@jsonforms/core 3.1.0-alpha.2 → 3.1.0-alpha.3

package/lib/jsonforms-core.cjs.js

@@ -659,7 +659,8 @@ var errorsAt = function (instancePath, schema, matchPath) {
     return function (errors) {
         var combinatorPaths = filter__default["default"](errors, function (error) { return error.keyword === 'oneOf' || error.keyword === 'anyOf'; }).map(function (error) { return getControlPath(error); });
         return filter__default["default"](errors, function (error) {
-            if (filteredErrorKeywords.indexOf(error.keyword) !== -1) {
+            if (filteredErrorKeywords.indexOf(error.keyword) !== -1 &&
+                !isOneOfEnumSchema(error.parentSchema)) {
                 return false;
             }
             var controlPath = getControlPath(error);
@@ -667,6 +668,7 @@ var errorsAt = function (instancePath, schema, matchPath) {
             var parentSchema = error.parentSchema;
             if (result &&
                 !isObjectSchema$1(parentSchema) &&
+                !isOneOfEnumSchema(parentSchema) &&
                 combinatorPaths.findIndex(function (p) { return instancePath.startsWith(p); }) !== -1) {
                 result = result && isEqual__default["default"](parentSchema, schema);
             }
@@ -1038,10 +1040,7 @@ var isAllOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
 var isAnyOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return schema.hasOwnProperty('anyOf'); }));
 var isOneOfControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return schema.hasOwnProperty('oneOf'); }));
 var isEnumControl = and(uiTypeIs('Control'), or(schemaMatches(function (schema) { return schema.hasOwnProperty('enum'); }), schemaMatches(function (schema) { return schema.hasOwnProperty('const'); })));
-var isOneOfEnumControl = and(uiTypeIs('Control'), schemaMatches(function (schema) {
-    return schema.hasOwnProperty('oneOf') &&
-        schema.oneOf.every(function (s) { return s.const !== undefined; });
-}));
+var isOneOfEnumControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return isOneOfEnumSchema(schema); }));
 var isIntegerControl = and(uiTypeIs('Control'), schemaTypeIs('integer'));
 var isNumberControl = and(uiTypeIs('Control'), schemaTypeIs('number'));
 var isStringControl = and(uiTypeIs('Control'), schemaTypeIs('string'));
@@ -1103,7 +1102,7 @@ var isObjectArrayWithNesting = function (uischema, schema, context) {
             if (val.anyOf || val.allOf) {
                 return true;
             }
-            if (val.oneOf && !isOneOfEnumControl(uischema, val, context)) {
+            if (val.oneOf && !isOneOfEnumSchema(val)) {
                 return true;
             }
             if (hasType(val, 'object')) {
@@ -2164,6 +2163,11 @@ var getFirstPrimitiveProp = function (schema) {
     }
     return undefined;
 };
+var isOneOfEnumSchema = function (schema) {
+    return (schema === null || schema === void 0 ? void 0 : schema.hasOwnProperty('oneOf')) &&
+        (schema === null || schema === void 0 ? void 0 : schema.oneOf) &&
+        schema.oneOf.every(function (s) { return s.const !== undefined; });
+};
 
 var setReadonlyPropertyValue = function (value) {
     return function (child) {
@@ -2609,6 +2613,7 @@ exports.isObjectArrayWithNesting = isObjectArrayWithNesting;
 exports.isObjectControl = isObjectControl;
 exports.isOneOfControl = isOneOfControl;
 exports.isOneOfEnumControl = isOneOfEnumControl;
+exports.isOneOfEnumSchema = isOneOfEnumSchema;
 exports.isPrimitiveArrayControl = isPrimitiveArrayControl;
 exports.isRangeControl = isRangeControl;
 exports.isScopable = isScopable;