@jsonforms/core 3.0.0-beta.0 → 3.0.0-beta.3

package/lib/jsonforms-core.esm.js

@@ -356,6 +356,7 @@ const initState = {
     validator: undefined,
     ajv: undefined,
     validationMode: 'ValidateAndShow',
+    additionalErrors: []
 };
 const reuseAjvForSchema = (ajv, schema) => {
     if (schema.hasOwnProperty('id') || schema.hasOwnProperty('$id')) {
@@ -399,6 +400,18 @@ const hasValidationModeOption = (option) => {
     }
     return false;
 };
+const hasAdditionalErrorsOption = (option) => {
+    if (option) {
+        return option.additionalErrors !== undefined;
+    }
+    return false;
+};
+const getAdditionalErrors = (state, action) => {
+    if (action && hasAdditionalErrorsOption(action.options)) {
+        return action.options.additionalErrors;
+    }
+    return state.additionalErrors;
+};
 const coreReducer = (state = initState, action) => {
     switch (action.type) {
         case INIT: {
@@ -406,11 +419,13 @@ const coreReducer = (state = initState, action) => {
             const validationMode = getValidationMode(state, action);
             const v = validationMode === 'NoValidation' ? undefined : thisAjv.compile(action.schema);
             const e = validate(v, action.data);
+            const additionalErrors = getAdditionalErrors(state, action);
             return {
                 ...state,
                 data: action.data,
                 schema: action.schema,
                 uischema: action.uischema,
+                additionalErrors,
                 errors: e,
                 validator: v,
                 ajv: thisAjv,
@@ -434,13 +449,15 @@ const coreReducer = (state = initState, action) => {
             else if (state.data !== action.data) {
                 errors = validate(validator, action.data);
             }
+            const additionalErrors = getAdditionalErrors(state, action);
             const stateChanged = state.data !== action.data ||
                 state.schema !== action.schema ||
                 state.uischema !== action.uischema ||
                 state.ajv !== thisAjv ||
                 state.errors !== errors ||
                 state.validator !== validator ||
-                state.validationMode !== validationMode;
+                state.validationMode !== validationMode ||
+                state.additionalErrors !== additionalErrors;
             return stateChanged
                 ? {
                     ...state,
@@ -451,6 +468,7 @@ const coreReducer = (state = initState, action) => {
                     errors: isEqual(errors, state.errors) ? state.errors : errors,
                     validator: validator,
                     validationMode: validationMode,
+                    additionalErrors
                 }
                 : state;
         }
@@ -594,7 +612,11 @@ const isObjectSchema$1 = (schema) => {
     return schema?.type === 'object' || !!schema?.properties;
 };
 const filteredErrorKeywords = ['additionalProperties', 'allOf', 'anyOf', 'oneOf'];
-const getErrorsAt = (instancePath, schema, matchPath) => (state) => errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? [] : state.errors);
+const getErrorsAt = (instancePath, schema, matchPath) => (state) => {
+    const errors = state.errors ?? [];
+    const additionalErrors = state.additionalErrors ?? [];
+    return errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? additionalErrors : [...errors, ...additionalErrors]);
+};
 const errorAt = (instancePath, schema) => getErrorsAt(instancePath, schema, path => path === instancePath);
 const subErrorsAt = (instancePath, schema) => getErrorsAt(instancePath, schema, path => path.startsWith(instancePath));
 
@@ -631,27 +653,27 @@ const getI18nKey = (schema, uischema, path, key) => {
 const defaultTranslator = (_id, defaultMessage) => defaultMessage;
 const defaultErrorTranslator = (error, t, uischema) => {
     const i18nKey = getI18nKey(error.parentSchema, uischema, getControlPath(error), `error.${error.keyword}`);
-    const specializedKeywordMessage = t(i18nKey, undefined);
+    const specializedKeywordMessage = t(i18nKey, undefined, { error });
     if (specializedKeywordMessage !== undefined) {
         return specializedKeywordMessage;
     }
-    const genericKeywordMessage = t(`error.${error.keyword}`, undefined);
+    const genericKeywordMessage = t(`error.${error.keyword}`, undefined, { error });
     if (genericKeywordMessage !== undefined) {
         return genericKeywordMessage;
     }
-    const messageCustomization = t(error.message, undefined);
+    const messageCustomization = t(error.message, undefined, { error });
     if (messageCustomization !== undefined) {
         return messageCustomization;
     }
     if (error.keyword === 'required' && error.message?.startsWith('must have required property')) {
-        return t('is a required property', 'is a required property');
+        return t('is a required property', 'is a required property', { error });
     }
     return error.message;
 };
 const getCombinedErrorMessage = (errors, et, t, schema, uischema, path) => {
     if (errors.length > 0 && t) {
         const customErrorKey = getI18nKey(schema, uischema, path, 'error.custom');
-        const specializedErrorMessage = t(customErrorKey, undefined);
+        const specializedErrorMessage = t(customErrorKey, undefined, { schema, uischema, path, errors });
         if (specializedErrorMessage !== undefined) {
             return specializedErrorMessage;
         }
@@ -731,7 +753,7 @@ const rendererReducer = (state = [], action) => {
 
 const NOT_APPLICABLE = -1;
 const isControl = (uischema) => !isEmpty(uischema) && uischema.scope !== undefined;
-const schemaMatches = (predicate) => (uischema, schema) => {
+const schemaMatches = (predicate) => (uischema, schema, rootSchema) => {
     if (isEmpty(uischema) || !isControl(uischema)) {
         return false;
     }
@@ -744,27 +766,27 @@ const schemaMatches = (predicate) => (uischema, schema) => {
     }
     let currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath);
+        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
     }
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema);
+    return predicate(currentDataSchema, rootSchema);
 };
-const schemaSubPathMatches = (subPath, predicate) => (uischema, schema) => {
+const schemaSubPathMatches = (subPath, predicate) => (uischema, schema, rootSchema) => {
     if (isEmpty(uischema) || !isControl(uischema)) {
         return false;
     }
     const schemaPath = uischema.scope;
     let currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath);
+        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
     }
     currentDataSchema = get(currentDataSchema, subPath);
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema);
+    return predicate(currentDataSchema, rootSchema);
 };
 const schemaTypeIs = (expectedType) => schemaMatches(schema => !isEmpty(schema) && hasType(schema, expectedType));
 const formatIs = (expectedFormat) => schemaMatches(schema => !isEmpty(schema) &&
@@ -791,16 +813,16 @@ const scopeEndIs = (expected) => (uischema) => {
     const schemaPath = uischema.scope;
     return !isEmpty(schemaPath) && last(schemaPath.split('/')) === expected;
 };
-const and = (...testers) => (uischema, schema) => testers.reduce((acc, tester) => acc && tester(uischema, schema), true);
-const or = (...testers) => (uischema, schema) => testers.reduce((acc, tester) => acc || tester(uischema, schema), false);
-const rankWith = (rank, tester) => (uischema, schema) => {
-    if (tester(uischema, schema)) {
+const and = (...testers) => (uischema, schema, rootSchema) => testers.reduce((acc, tester) => acc && tester(uischema, schema, rootSchema), true);
+const or = (...testers) => (uischema, schema, rootSchema) => testers.reduce((acc, tester) => acc || tester(uischema, schema, rootSchema), false);
+const rankWith = (rank, tester) => (uischema, schema, rootSchema) => {
+    if (tester(uischema, schema, rootSchema)) {
         return rank;
     }
     return NOT_APPLICABLE;
 };
-const withIncreasedRank = (by, rankedTester) => (uischema, schema) => {
-    const rank = rankedTester(uischema, schema);
+const withIncreasedRank = (by, rankedTester) => (uischema, schema, rootSchema) => {
+    const rank = rankedTester(uischema, schema, rootSchema);
     if (rank === NOT_APPLICABLE) {
         return NOT_APPLICABLE;
     }
@@ -821,30 +843,39 @@ const isMultiLineControl = and(uiTypeIs('Control'), optionIs('multi', true));
 const isDateControl = and(uiTypeIs('Control'), or(formatIs('date'), optionIs('format', 'date')));
 const isTimeControl = and(uiTypeIs('Control'), or(formatIs('time'), optionIs('format', 'time')));
 const isDateTimeControl = and(uiTypeIs('Control'), or(formatIs('date-time'), optionIs('format', 'date-time')));
-const isObjectArray = and(schemaMatches(schema => hasType(schema, 'array') && !Array.isArray(schema.items)
-), schemaSubPathMatches('items', schema => hasType(schema, 'object')));
+const isObjectArray = and(schemaMatches((schema, rootSchema) => hasType(schema, 'array') && !Array.isArray(resolveSchema(schema, 'items', rootSchema))
+), schemaSubPathMatches('items', (schema, rootSchema) => {
+    const resolvedSchema = schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;
+    return hasType(resolvedSchema, 'object');
+}));
 const isObjectArrayControl = and(uiTypeIs('Control'), isObjectArray);
-const traverse = (any, pred) => {
+const traverse = (any, pred, rootSchema) => {
     if (isArray(any)) {
-        return reduce(any, (acc, el) => acc || traverse(el, pred), false);
+        return reduce(any, (acc, el) => acc || traverse(el, pred, rootSchema), false);
     }
     if (pred(any)) {
         return true;
     }
+    if (any.$ref) {
+        const toTraverse = resolveSchema(rootSchema, any.$ref, rootSchema);
+        if (toTraverse && !toTraverse.$ref) {
+            return traverse(toTraverse, pred, rootSchema);
+        }
+    }
     if (any.items) {
-        return traverse(any.items, pred);
+        return traverse(any.items, pred, rootSchema);
     }
     if (any.properties) {
-        return reduce(toPairs(any.properties), (acc, [_key, val]) => acc || traverse(val, pred), false);
+        return reduce(toPairs(any.properties), (acc, [_key, val]) => acc || traverse(val, pred, rootSchema), false);
     }
     return false;
 };
-const isObjectArrayWithNesting = (uischema, schema) => {
-    if (!uiTypeIs('Control')(uischema, schema)) {
+const isObjectArrayWithNesting = (uischema, schema, rootSchema) => {
+    if (!uiTypeIs('Control')(uischema, schema, rootSchema)) {
         return false;
     }
     const schemaPath = uischema.scope;
-    const resolvedSchema = resolveSchema(schema, schemaPath);
+    const resolvedSchema = resolveSchema(schema, schemaPath, rootSchema ?? schema);
     const wantedNestingByType = {
         object: 2,
         array: 1
@@ -854,6 +885,9 @@ const isObjectArrayWithNesting = (uischema, schema) => {
             if (val === schema) {
                 return false;
             }
+            if (val.$ref !== undefined) {
+                return false;
+            }
             if (typeof val.type !== 'string') {
                 return true;
             }
@@ -863,7 +897,7 @@ const isObjectArrayWithNesting = (uischema, schema) => {
             }
             wantedNestingByType[val.type] = typeCount - 1;
             return wantedNestingByType[val.type] === 0;
-        })) {
+        }, rootSchema)) {
             return true;
         }
         if (uischema.options && uischema.options.detail) {
@@ -879,9 +913,11 @@ const isObjectArrayWithNesting = (uischema, schema) => {
     return false;
 };
 const isArrayObjectControl = isObjectArrayControl;
-const isPrimitiveArrayControl = and(uiTypeIs('Control'), schemaMatches(schema => deriveTypes(schema).length !== 0 && !Array.isArray(schema.items)
-), schemaSubPathMatches('items', schema => {
-    const types = deriveTypes(schema);
+const isPrimitiveArrayControl = and(uiTypeIs('Control'), schemaMatches((schema, rootSchema) => deriveTypes(schema).length !== 0 &&
+    !Array.isArray(resolveSchema(schema, 'items', rootSchema))
+), schemaSubPathMatches('items', (schema, rootSchema) => {
+    const resolvedSchema = schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;
+    const types = deriveTypes(resolvedSchema);
     return (types.length === 1 &&
         includes(['integer', 'number', 'boolean', 'string'], types[0]));
 }));
@@ -900,7 +936,7 @@ const hasCategory = (categorization) => {
         .reduce((prev, curr) => prev && curr, true);
 };
 const categorizationHasCategory = (uischema) => hasCategory(uischema);
-const not = (tester) => (uischema, schema) => !tester(uischema, schema);
+const not = (tester) => (uischema, schema, rootSchema) => !tester(uischema, schema, rootSchema);
 
 var index$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -978,11 +1014,14 @@ const jsonFormsReducerConfig = {
     defaultData: defaultDataReducer,
     i18n: i18nReducer,
 };
-const findUISchema = (uischemas, schema, schemaPath, path, fallbackLayoutType = 'VerticalLayout', control, rootSchema) => {
+const findUISchema = (uischemas, schema, schemaPath, path, fallback = 'VerticalLayout', control, rootSchema) => {
     if (control && control.options && control.options.detail) {
         if (typeof control.options.detail === 'string') {
             if (control.options.detail.toUpperCase() === 'GENERATE') {
-                return Generate.uiSchema(schema, fallbackLayoutType);
+                if (typeof fallback === "function") {
+                    return fallback();
+                }
+                return Generate.uiSchema(schema, fallback);
             }
         }
         else if (typeof control.options.detail === 'object') {
@@ -994,7 +1033,10 @@ const findUISchema = (uischemas, schema, schemaPath, path, fallbackLayoutType =
     }
     const uiSchema = findMatchingUISchema(uischemas)(schema, schemaPath, path);
     if (uiSchema === undefined) {
-        return Generate.uiSchema(schema, fallbackLayoutType, '#', rootSchema);
+        if (typeof fallback === 'function') {
+            return fallback();
+        }
+        return Generate.uiSchema(schema, fallback, '#', rootSchema);
     }
     return uiSchema;
 };
@@ -1016,6 +1058,44 @@ const getRenderers = (state) => get(state, 'jsonforms.renderers');
 const getCells = (state) => get(state, 'jsonforms.cells');
 const getUISchemas = (state) => get(state, 'jsonforms.uischemas');
 
+const compose = (path1, path2) => {
+    let p1 = path1;
+    if (!isEmpty(path1) && !isEmpty(path2) && !path2.startsWith('[')) {
+        p1 = path1 + '.';
+    }
+    if (isEmpty(p1)) {
+        return path2;
+    }
+    else if (isEmpty(path2)) {
+        return p1;
+    }
+    else {
+        return `${p1}${path2}`;
+    }
+};
+const toDataPathSegments = (schemaPath) => {
+    const s = schemaPath
+        .replace(/(anyOf|allOf|oneOf)\/[\d]\//g, '')
+        .replace(/(then|else)\//g, '');
+    const segments = s.split('/');
+    const decodedSegments = segments.map(decode);
+    const startFromRoot = decodedSegments[0] === '#' || decodedSegments[0] === '';
+    const startIndex = startFromRoot ? 2 : 1;
+    return range(startIndex, decodedSegments.length, 2).map(idx => decodedSegments[idx]);
+};
+const toDataPath = (schemaPath) => {
+    return toDataPathSegments(schemaPath).join('.');
+};
+const composeWithUi = (scopableUi, path) => {
+    const segments = toDataPathSegments(scopableUi.scope);
+    if (isEmpty(segments) && path === undefined) {
+        return '';
+    }
+    return isEmpty(segments) ? path : compose(path, segments.join('.'));
+};
+const encode = (segment) => segment?.replace(/~/g, '~0').replace(/\//g, '~1');
+const decode = (pointerSegment) => pointerSegment?.replace(/~1/g, '/').replace(/~0/, '~');
+
 const isObjectSchema = (schema) => {
     return schema.properties !== undefined;
 };
@@ -1062,90 +1142,40 @@ const findAllRefs = (schema, result = {}, resolveTuples = false) => {
 };
 const invalidSegment = (pathSegment) => pathSegment === '#' || pathSegment === undefined || pathSegment === '';
 const resolveSchema = (schema, schemaPath, rootSchema) => {
+    const segments = schemaPath?.split('/').map(decode);
+    return resolveSchemaWithSegments(schema, segments, rootSchema);
+};
+const resolveSchemaWithSegments = (schema, pathSegments, rootSchema) => {
     if (isEmpty(schema)) {
         return undefined;
     }
-    const validPathSegments = schemaPath.split('/');
-    let resultSchema = schema;
-    for (let i = 0; i < validPathSegments.length; i++) {
-        let pathSegment = validPathSegments[i];
-        resultSchema =
-            resultSchema === undefined || resultSchema.$ref === undefined
-                ? resultSchema
-                : resolveSchema(schema, resultSchema.$ref);
-        if (invalidSegment(pathSegment)) {
-            continue;
-        }
-        let curSchema = get(resultSchema, pathSegment);
-        if (!curSchema) {
-            const schemas = [].concat(resultSchema?.oneOf ?? [], resultSchema?.allOf ?? [], resultSchema?.anyOf ?? []);
-            for (let item of schemas) {
-                curSchema = resolveSchema(item, validPathSegments.slice(i).join('/'));
-                if (curSchema) {
-                    break;
-                }
-            }
-            if (curSchema) {
-                resultSchema = curSchema;
-                break;
-            }
-        }
-        resultSchema = curSchema;
-    }
-    if (resultSchema !== undefined && resultSchema.$ref !== undefined) {
-        try {
-            return retrieveResolvableSchema(schema, resultSchema.$ref);
-        }
-        catch (e) {
-            return retrieveResolvableSchema(rootSchema, resultSchema.$ref);
-        }
-    }
-    return resultSchema;
-};
-function retrieveResolvableSchema(full, reference) {
-    const child = resolveSchema(full, reference);
-    const allRefs = findAllRefs(child);
-    const innerSelfReference = allRefs[reference];
-    if (innerSelfReference !== undefined) {
-        innerSelfReference.$ref = '#';
-    }
-    return child;
-}
-
-const compose = (path1, path2) => {
-    let p1 = path1;
-    if (!isEmpty(path1) && !isEmpty(path2) && !path2.startsWith('[')) {
-        p1 = path1 + '.';
+    if (schema.$ref) {
+        schema = resolveSchema(rootSchema, schema.$ref, rootSchema);
     }
-    if (isEmpty(p1)) {
-        return path2;
+    if (!pathSegments || pathSegments.length === 0) {
+        return schema;
     }
-    else if (isEmpty(path2)) {
-        return p1;
+    const [segment, ...remainingSegments] = pathSegments;
+    if (invalidSegment(segment)) {
+        return resolveSchemaWithSegments(schema, remainingSegments, rootSchema);
     }
-    else {
-        return `${p1}${path2}`;
+    const singleSegmentResolveSchema = get(schema, segment);
+    const resolvedSchema = resolveSchemaWithSegments(singleSegmentResolveSchema, remainingSegments, rootSchema);
+    if (resolvedSchema) {
+        return resolvedSchema;
     }
-};
-const toDataPathSegments = (schemaPath) => {
-    const s = schemaPath
-        .replace(/anyOf\/[\d]\//g, '')
-        .replace(/allOf\/[\d]\//g, '')
-        .replace(/oneOf\/[\d]\//g, '');
-    const segments = s.split('/');
-    const startFromRoot = segments[0] === '#' || segments[0] === '';
-    const startIndex = startFromRoot ? 2 : 1;
-    return range(startIndex, segments.length, 2).map(idx => segments[idx]);
-};
-const toDataPath = (schemaPath) => {
-    return toDataPathSegments(schemaPath).join('.');
-};
-const composeWithUi = (scopableUi, path) => {
-    const segments = toDataPathSegments(scopableUi.scope);
-    if (isEmpty(segments) && path === undefined) {
-        return '';
+    if (segment === 'properties' || segment === 'items') {
+        let alternativeResolveResult = undefined;
+        const subSchemas = [].concat(schema.oneOf ?? [], schema.allOf ?? [], schema.anyOf ?? [], schema.then ?? [], schema.else ?? []);
+        for (const subSchema of subSchemas) {
+            alternativeResolveResult = resolveSchemaWithSegments(subSchema, [segment, ...remainingSegments], rootSchema);
+            if (alternativeResolveResult) {
+                break;
+            }
+        }
+        return alternativeResolveResult;
     }
-    return isEmpty(segments) ? path : compose(path, segments.join('.'));
+    return undefined;
 };
 
 const isOrCondition = (condition) => condition.type === 'OR';
@@ -1315,7 +1345,7 @@ const deriveLabel = (controlElement, schemaElement) => {
     }
     if (typeof controlElement.scope === 'string') {
         const ref = controlElement.scope;
-        const label = ref.substr(ref.lastIndexOf('/') + 1);
+        const label = decode(ref.substr(ref.lastIndexOf('/') + 1));
         return startCase(label);
     }
     return '';
@@ -1345,30 +1375,6 @@ const labelDescription = (text, show) => ({
     show: show
 });
 
-const createLabel = (subSchema, subSchemaIndex, keyword) => {
-    if (subSchema.title) {
-        return subSchema.title;
-    }
-    else {
-        return keyword + '-' + subSchemaIndex;
-    }
-};
-const resolveSubSchemas = (schema, rootSchema, keyword) => {
-    const schemas = schema[keyword];
-    if (schemas.findIndex(e => e.$ref !== undefined) !== -1) {
-        return {
-            ...schema,
-            [keyword]: schema[keyword].map(e => e.$ref ? resolveSchema(rootSchema, e.$ref) : e)
-        };
-    }
-    return schema;
-};
-const createCombinatorRenderInfos = (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) => combinatorSubSchemas.map((subSchema, subSchemaIndex) => ({
-    schema: subSchema,
-    uischema: findUISchema(uischemas, subSchema, control.scope, path, undefined, control, rootSchema),
-    label: createLabel(subSchema, subSchemaIndex, keyword)
-}));
-
 const isRequired = (schema, schemaPath, rootSchema) => {
     const pathSegments = schemaPath.split('/');
     const lastSegment = pathSegments[pathSegments.length - 1];
@@ -1466,8 +1472,8 @@ const mapStateToControlProps = (state, ownProps) => {
     const schema = resolvedSchema ?? rootSchema;
     const t = getTranslator()(state);
     const te = getErrorTranslator()(state);
-    const i18nLabel = t(getI18nKey(schema, uischema, path, 'label'), label);
-    const i18nDescription = t(getI18nKey(schema, uischema, path, 'description'), description);
+    const i18nLabel = t(getI18nKey(schema, uischema, path, 'label'), label, { schema, uischema, path, errors });
+    const i18nDescription = t(getI18nKey(schema, uischema, path, 'description'), description, { schema, uischema, path, errors });
     const i18nErrorMessage = getCombinedErrorMessage(errors, te, t, schema, uischema, path);
     return {
         data,
@@ -1648,14 +1654,15 @@ const mapStateToLayoutProps = (state, ownProps) => {
         data,
         uischema: ownProps.uischema,
         schema: ownProps.schema,
-        direction: ownProps.direction ?? getDirection(uischema)
+        direction: ownProps.direction ?? getDirection(uischema),
+        config
     };
 };
 const mapStateToJsonFormsRendererProps = (state, ownProps) => {
     let uischema = ownProps.uischema;
     if (uischema === undefined) {
         if (ownProps.schema) {
-            uischema = findUISchema(state.jsonforms.uischemas, ownProps.schema, undefined, ownProps.path);
+            uischema = findUISchema(state.jsonforms.uischemas, ownProps.schema, undefined, ownProps.path, undefined, undefined, state.jsonforms.core.schema);
         }
         else {
             uischema = getUiSchema(state);
@@ -1675,18 +1682,8 @@ const controlDefaultProps = {
     errors: []
 };
 const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
-    const { uischema } = ownProps;
-    const path = composeWithUi(uischema, ownProps.path);
-    const rootSchema = getSchema(state);
-    const resolvedSchema = Resolve.schema(ownProps.schema || rootSchema, uischema.scope, rootSchema);
-    const visible = ownProps.visible === undefined || hasShowRule(uischema)
-        ? isVisible(uischema, getData(state), ownProps.path, getAjv(state))
-        : ownProps.visible;
-    const id = ownProps.id;
-    const data = Resolve.data(getData(state), path);
+    const { data, schema, ...props } = mapStateToControlProps(state, ownProps);
     const ajv = state.jsonforms.core.ajv;
-    const schema = resolvedSchema || rootSchema;
-    const _schema = resolveSubSchemas(schema, rootSchema, keyword);
     const structuralKeywords = [
         'required',
         'additionalProperties',
@@ -1700,9 +1697,9 @@ const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
             !errors.find(e => structuralKeywords.indexOf(e.keyword) !== -1));
     };
     let indexOfFittingSchema;
-    for (let i = 0; i < _schema[keyword].length; i++) {
+    for (let i = 0; i < schema[keyword]?.length; i++) {
         try {
-            const valFn = ajv.compile(_schema[keyword][i]);
+            const valFn = ajv.compile(schema[keyword][i]);
             valFn(data);
             if (dataIsValid(valFn.errors)) {
                 indexOfFittingSchema = i;
@@ -1715,14 +1712,10 @@ const mapStateToCombinatorRendererProps = (state, ownProps, keyword) => {
     }
     return {
         data,
-        path,
         schema,
-        rootSchema,
-        visible,
-        id,
+        ...props,
         indexOfFittingSchema,
-        uischemas: state.jsonforms.uischemas,
-        uischema
+        uischemas: getUISchemas(state)
     };
 };
 const mapStateToAllOfProps = (state, ownProps) => mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
@@ -1825,6 +1818,23 @@ const defaultMapDispatchToControlProps =
     };
 };
 
+const createLabel = (subSchema, subSchemaIndex, keyword) => {
+    if (subSchema.title) {
+        return subSchema.title;
+    }
+    else {
+        return keyword + '-' + subSchemaIndex;
+    }
+};
+const createCombinatorRenderInfos = (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) => combinatorSubSchemas.map((subSchema, subSchemaIndex) => {
+    const schema = subSchema.$ref ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema) : subSchema;
+    return {
+        schema,
+        uischema: findUISchema(uischemas, schema, control.scope, path, undefined, control, rootSchema),
+        label: createLabel(subSchema, subSchemaIndex, keyword)
+    };
+});
+
 const usedIds = new Set();
 const makeId = (idBase, iteration) => iteration <= 1 ? idBase : idBase + iteration.toString();
 const isUniqueId = (idBase, iteration) => {
@@ -1931,7 +1941,7 @@ const isCombinator = (jsonSchema) => {
 };
 const generateUISchema = (jsonSchema, schemaElements, currentRef, schemaName, layoutType, rootSchema) => {
     if (!isEmpty(jsonSchema) && jsonSchema.$ref !== undefined) {
-        return generateUISchema(resolveSchema(rootSchema, jsonSchema.$ref), schemaElements, currentRef, schemaName, layoutType, rootSchema);
+        return generateUISchema(resolveSchema(rootSchema, jsonSchema.$ref, rootSchema), schemaElements, currentRef, schemaName, layoutType, rootSchema);
     }
     if (isCombinator(jsonSchema)) {
         const controlObject = createControlElement(currentRef);
@@ -1957,9 +1967,9 @@ const generateUISchema = (jsonSchema, schemaElements, currentRef, schemaName, la
             const nextRef = currentRef + '/properties';
             Object.keys(jsonSchema.properties).map(propName => {
                 let value = jsonSchema.properties[propName];
-                const ref = `${nextRef}/${propName}`;
+                const ref = `${nextRef}/${encode(propName)}`;
                 if (value.$ref !== undefined) {
-                    value = resolveSchema(rootSchema, value.$ref);
+                    value = resolveSchema(rootSchema, value.$ref, rootSchema);
                 }
                 generateUISchema(value, layout.elements, ref, propName, layoutType, rootSchema);
             });
@@ -2160,5 +2170,5 @@ const Helpers = {
     convertToValidClassName
 };
 
-export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, and, categorizationHasCategory, cellReducer, clearAllIds, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveTypes, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getCells, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isPrimitiveArrayControl, isRangeControl, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, resolveSubSchemas, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
+export { ADD_CELL, ADD_DEFAULT_DATA, ADD_RENDERER, ADD_UI_SCHEMA, index as Actions, Draft4, Generate, Helpers, INIT, NOT_APPLICABLE, Paths, REMOVE_CELL, REMOVE_DEFAULT_DATA, REMOVE_RENDERER, REMOVE_UI_SCHEMA, Resolve, RuleEffect, Runtime, SET_AJV, SET_CONFIG, SET_LOCALE, SET_SCHEMA, SET_TRANSLATOR, SET_UISCHEMA, SET_VALIDATION_MODE, index$1 as Test, UPDATE_CORE, UPDATE_DATA, UPDATE_ERRORS, UPDATE_I18N, VALIDATE, and, categorizationHasCategory, cellReducer, clearAllIds, compose, compose as composePaths, composeWithUi, computeLabel, configReducer, controlDefaultProps, convertToValidClassName, coreReducer, createAjv, createCleanLabel, createCombinatorRenderInfos, createControlElement, createDefaultValue, createId, createLabelDescriptionFrom, decode, defaultDataReducer, defaultErrorTranslator, defaultJsonFormsI18nState, defaultMapDispatchToControlProps, defaultMapStateToEnumCellProps, defaultTranslator, deriveTypes, encode, enumToEnumOptionMapper, errorAt, errorsAt, evalEnablement, evalVisibility, extractAjv, extractData, extractDefaultData, extractSchema, extractUiSchema, fetchErrorTranslator, fetchLocale, fetchTranslator, findAllRefs, findMatchingUISchema, findUISchema, formatErrorMessage, formatIs, generateDefaultUISchema, generateJsonSchema, getAjv, getCells, getCombinedErrorMessage, getConfig, getControlPath, getData, getDefaultData, getErrorAt, getErrorTranslator, getFirstPrimitiveProp, getI18nKey, getI18nKeyPrefix, getI18nKeyPrefixBySchema, getLocale, getRenderers, getSchema, getSubErrorsAt, getTranslator, getUISchemas, getUiSchema, hasCategory, hasEnableRule, hasShowRule, hasType, i18nReducer, init, isAllOfControl, isAnyOfControl, isArrayObjectControl, isBooleanControl, isCategorization, isCategory, isControl, isDateControl, isDateTimeControl, isDescriptionHidden, isEnabled, isEnumControl, isGroup, isInherentlyEnabled, isIntegerControl, isLayout, isMultiLineControl, isNumberControl, isNumberFormatControl, isObjectArray, isObjectArrayControl, isObjectArrayWithNesting, isObjectControl, isOneOfControl, isOneOfEnumControl, isPrimitiveArrayControl, isRangeControl, isStringControl, isTimeControl, isVisible, iterateSchema, jsonFormsReducerConfig, layoutDefaultProps, mapDispatchToArrayControlProps, mapDispatchToCellProps, mapDispatchToControlProps, mapDispatchToMultiEnumProps, mapStateToAllOfProps, mapStateToAnyOfProps, mapStateToArrayControlProps, mapStateToArrayLayoutProps, mapStateToCellProps, mapStateToCombinatorRendererProps, mapStateToControlProps, mapStateToControlWithDetailProps, mapStateToDispatchCellProps, mapStateToEnumControlProps, mapStateToJsonFormsRendererProps, mapStateToLayoutProps, mapStateToMasterListItemProps, mapStateToMultiEnumControlProps, mapStateToOneOfEnumCellProps, mapStateToOneOfEnumControlProps, mapStateToOneOfProps, moveDown, moveUp, not, oneOfToEnumOptionMapper, optionIs, or, rankWith, registerCell, registerDefaultData, registerRenderer, registerUISchema, removeId, rendererReducer, resolveData, resolveSchema, schemaMatches, schemaSubPathMatches, schemaTypeIs, scopeEndIs, scopeEndsWith, setAjv, setConfig, setLocale, setReadonly, setSchema, setTranslator, setUISchema, setValidationMode, showAsRequired, subErrorsAt, toDataPath, toDataPathSegments, transformPathToI18nPrefix, uiTypeIs, uischemaRegistryReducer, unregisterCell, unregisterDefaultData, unregisterRenderer, unregisterUISchema, unsetReadonly, update, updateCore, updateErrors, updateI18n, validate, withIncreasedRank };
 //# sourceMappingURL=jsonforms-core.esm.js.map