@jsonforms/core 3.0.0-beta.1 → 3.0.0-beta.2

package/docs/interfaces/statepropsofscopedrenderer.html

@@ -125,7 +125,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#cells">cells</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:311</li>
+							<li>Defined in packages/core/src/util/renderer.ts:313</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -141,7 +141,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#config">config</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:271</li>
+							<li>Defined in packages/core/src/util/renderer.ts:273</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -157,7 +157,7 @@
 					<aside class="tsd-sources">
 						<p>Overrides <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#data">data</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:329</li>
+							<li>Defined in packages/core/src/util/renderer.ts:331</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -173,7 +173,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#enabled">enabled</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:291</li>
+							<li>Defined in packages/core/src/util/renderer.ts:293</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -188,7 +188,7 @@
 					<div class="tsd-signature tsd-kind-icon">errors<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:324</li>
+							<li>Defined in packages/core/src/util/renderer.ts:326</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -203,7 +203,7 @@
 					<div class="tsd-signature tsd-kind-icon">id<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:339</li>
+							<li>Defined in packages/core/src/util/renderer.ts:341</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -219,7 +219,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#path">path</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:300</li>
+							<li>Defined in packages/core/src/util/renderer.ts:302</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -235,7 +235,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#renderers">renderers</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:305</li>
+							<li>Defined in packages/core/src/util/renderer.ts:307</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -250,7 +250,7 @@
 					<div class="tsd-signature tsd-kind-icon">root<wbr>Schema<span class="tsd-signature-symbol">:</span> <a href="../globals.html#jsonschema" class="tsd-signature-type">JsonSchema</a></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:334</li>
+							<li>Defined in packages/core/src/util/renderer.ts:336</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -266,7 +266,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#schema">schema</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:281</li>
+							<li>Defined in packages/core/src/util/renderer.ts:283</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">
@@ -282,7 +282,7 @@
 					<aside class="tsd-sources">
 						<p>Overrides <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#uischema">uischema</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:319</li>
+							<li>Defined in packages/core/src/util/renderer.ts:321</li>
 						</ul>
 					</aside>
 				</section>
@@ -293,7 +293,7 @@
 					<aside class="tsd-sources">
 						<p>Inherited from <a href="statepropsofrenderer.html">StatePropsOfRenderer</a>.<a href="statepropsofrenderer.html#visible">visible</a></p>
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:295</li>
+							<li>Defined in packages/core/src/util/renderer.ts:297</li>
 						</ul>
 					</aside>
 					<div class="tsd-comment tsd-typography">

package/docs/interfaces/withclassname.html

@@ -93,7 +93,7 @@
 					<div class="tsd-signature tsd-kind-icon">class<wbr>Name<span class="tsd-signature-symbol">:</span> <span class="tsd-signature-type">string</span></div>
 					<aside class="tsd-sources">
 						<ul>
-							<li>Defined in packages/core/src/util/renderer.ts:170</li>
+							<li>Defined in packages/core/src/util/renderer.ts:172</li>
 						</ul>
 					</aside>
 				</section>

package/lib/jsonforms-core.cjs.js

@@ -386,6 +386,16 @@ function __rest(s, e) {
                 t[p[i]] = s[p[i]];
         }
     return t;
+}
+
+function __spreadArray(to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 }
 
 var cellReducer = function (state, _a) {
@@ -765,7 +775,7 @@ var NOT_APPLICABLE = -1;
 var isControl = function (uischema) {
     return !isEmpty__default["default"](uischema) && uischema.scope !== undefined;
 };
-var schemaMatches = function (predicate) { return function (uischema, schema) {
+var schemaMatches = function (predicate) { return function (uischema, schema, rootSchema) {
     if (isEmpty__default["default"](uischema) || !isControl(uischema)) {
         return false;
     }
@@ -778,27 +788,27 @@ var schemaMatches = function (predicate) { return function (uischema, schema) {
     }
     var 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);
 }; };
-var schemaSubPathMatches = function (subPath, predicate) { return function (uischema, schema) {
+var schemaSubPathMatches = function (subPath, predicate) { return function (uischema, schema, rootSchema) {
     if (isEmpty__default["default"](uischema) || !isControl(uischema)) {
         return false;
     }
     var schemaPath = uischema.scope;
     var currentDataSchema = schema;
     if (hasType(schema, 'object')) {
-        currentDataSchema = resolveSchema(schema, schemaPath);
+        currentDataSchema = resolveSchema(schema, schemaPath, rootSchema);
     }
     currentDataSchema = get__default["default"](currentDataSchema, subPath);
     if (currentDataSchema === undefined) {
         return false;
     }
-    return predicate(currentDataSchema);
+    return predicate(currentDataSchema, rootSchema);
 }; };
 var schemaTypeIs = function (expectedType) {
     return schemaMatches(function (schema) { return !isEmpty__default["default"](schema) && hasType(schema, expectedType); });
@@ -836,23 +846,23 @@ var and = function () {
     for (var _i = 0; _i < arguments.length; _i++) {
         testers[_i] = arguments[_i];
     }
-    return function (uischema, schema) { return testers.reduce(function (acc, tester) { return acc && tester(uischema, schema); }, true); };
+    return function (uischema, schema, rootSchema) { return testers.reduce(function (acc, tester) { return acc && tester(uischema, schema, rootSchema); }, true); };
 };
 var or = function () {
     var testers = [];
     for (var _i = 0; _i < arguments.length; _i++) {
         testers[_i] = arguments[_i];
     }
-    return function (uischema, schema) { return testers.reduce(function (acc, tester) { return acc || tester(uischema, schema); }, false); };
+    return function (uischema, schema, rootSchema) { return testers.reduce(function (acc, tester) { return acc || tester(uischema, schema, rootSchema); }, false); };
 };
-var rankWith = function (rank, tester) { return function (uischema, schema) {
-    if (tester(uischema, schema)) {
+var rankWith = function (rank, tester) { return function (uischema, schema, rootSchema) {
+    if (tester(uischema, schema, rootSchema)) {
         return rank;
     }
     return NOT_APPLICABLE;
 }; };
-var withIncreasedRank = function (by, rankedTester) { return function (uischema, schema) {
-    var rank = rankedTester(uischema, schema);
+var withIncreasedRank = function (by, rankedTester) { return function (uischema, schema, rootSchema) {
+    var rank = rankedTester(uischema, schema, rootSchema);
     if (rank === NOT_APPLICABLE) {
         return NOT_APPLICABLE;
     }
@@ -875,33 +885,42 @@ var isMultiLineControl = and(uiTypeIs('Control'), optionIs('multi', true));
 var isDateControl = and(uiTypeIs('Control'), or(formatIs('date'), optionIs('format', 'date')));
 var isTimeControl = and(uiTypeIs('Control'), or(formatIs('time'), optionIs('format', 'time')));
 var isDateTimeControl = and(uiTypeIs('Control'), or(formatIs('date-time'), optionIs('format', 'date-time')));
-var isObjectArray = and(schemaMatches(function (schema) { return hasType(schema, 'array') && !Array.isArray(schema.items); }
-), schemaSubPathMatches('items', function (schema) { return hasType(schema, 'object'); }));
+var isObjectArray = and(schemaMatches(function (schema, rootSchema) { return hasType(schema, 'array') && !Array.isArray(resolveSchema(schema, 'items', rootSchema)); }
+), schemaSubPathMatches('items', function (schema, rootSchema) {
+    var resolvedSchema = schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;
+    return hasType(resolvedSchema, 'object');
+}));
 var isObjectArrayControl = and(uiTypeIs('Control'), isObjectArray);
-var traverse = function (any, pred) {
+var traverse = function (any, pred, rootSchema) {
     if (isArray__default["default"](any)) {
-        return reduce__default["default"](any, function (acc, el) { return acc || traverse(el, pred); }, false);
+        return reduce__default["default"](any, function (acc, el) { return acc || traverse(el, pred, rootSchema); }, false);
     }
     if (pred(any)) {
         return true;
     }
+    if (any.$ref) {
+        var 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__default["default"](toPairs__default["default"](any.properties), function (acc, _a) {
             _a[0]; var val = _a[1];
-            return acc || traverse(val, pred);
+            return acc || traverse(val, pred, rootSchema);
         }, false);
     }
     return false;
 };
-var isObjectArrayWithNesting = function (uischema, schema) {
-    if (!uiTypeIs('Control')(uischema, schema)) {
+var isObjectArrayWithNesting = function (uischema, schema, rootSchema) {
+    if (!uiTypeIs('Control')(uischema, schema, rootSchema)) {
         return false;
     }
     var schemaPath = uischema.scope;
-    var resolvedSchema = resolveSchema(schema, schemaPath);
+    var resolvedSchema = resolveSchema(schema, schemaPath, rootSchema !== null && rootSchema !== void 0 ? rootSchema : schema);
     var wantedNestingByType = {
         object: 2,
         array: 1
@@ -911,6 +930,9 @@ var isObjectArrayWithNesting = function (uischema, schema) {
             if (val === schema) {
                 return false;
             }
+            if (val.$ref !== undefined) {
+                return false;
+            }
             if (typeof val.type !== 'string') {
                 return true;
             }
@@ -920,7 +942,7 @@ var isObjectArrayWithNesting = function (uischema, schema) {
             }
             wantedNestingByType[val.type] = typeCount - 1;
             return wantedNestingByType[val.type] === 0;
-        })) {
+        }, rootSchema)) {
             return true;
         }
         if (uischema.options && uischema.options.detail) {
@@ -936,9 +958,13 @@ var isObjectArrayWithNesting = function (uischema, schema) {
     return false;
 };
 var isArrayObjectControl = isObjectArrayControl;
-var isPrimitiveArrayControl = and(uiTypeIs('Control'), schemaMatches(function (schema) { return deriveTypes(schema).length !== 0 && !Array.isArray(schema.items); }
-), schemaSubPathMatches('items', function (schema) {
-    var types = deriveTypes(schema);
+var isPrimitiveArrayControl = and(uiTypeIs('Control'), schemaMatches(function (schema, rootSchema) {
+    return deriveTypes(schema).length !== 0 &&
+        !Array.isArray(resolveSchema(schema, 'items', rootSchema));
+}
+), schemaSubPathMatches('items', function (schema, rootSchema) {
+    var resolvedSchema = schema.$ref ? resolveSchema(rootSchema, schema.$ref, rootSchema) : schema;
+    var types = deriveTypes(resolvedSchema);
     return (types.length === 1 &&
         includes__default["default"](['integer', 'number', 'boolean', 'string'], types[0]));
 }));
@@ -965,7 +991,7 @@ var hasCategory = function (categorization) {
 var categorizationHasCategory = function (uischema) {
     return hasCategory(uischema);
 };
-var not = function (tester) { return function (uischema, schema) { return !tester(uischema, schema); }; };
+var not = function (tester) { return function (uischema, schema, rootSchema) { return !tester(uischema, schema, rootSchema); }; };
 
 var index$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -1046,12 +1072,15 @@ var jsonFormsReducerConfig = {
     defaultData: defaultDataReducer,
     i18n: i18nReducer,
 };
-var findUISchema = function (uischemas, schema, schemaPath, path, fallbackLayoutType, control, rootSchema) {
-    if (fallbackLayoutType === void 0) { fallbackLayoutType = 'VerticalLayout'; }
+var findUISchema = function (uischemas, schema, schemaPath, path, fallback, control, rootSchema) {
+    if (fallback === void 0) { fallback = 'VerticalLayout'; }
     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') {
@@ -1063,7 +1092,10 @@ var findUISchema = function (uischemas, schema, schemaPath, path, fallbackLayout
     }
     var 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;
 };
@@ -1095,6 +1127,44 @@ var getRenderers = function (state) { return get__default["default"](state, 'jso
 var getCells = function (state) { return get__default["default"](state, 'jsonforms.cells'); };
 var getUISchemas = function (state) { return get__default["default"](state, 'jsonforms.uischemas'); };
 
+var compose = function (path1, path2) {
+    var p1 = path1;
+    if (!isEmpty__default["default"](path1) && !isEmpty__default["default"](path2) && !path2.startsWith('[')) {
+        p1 = path1 + '.';
+    }
+    if (isEmpty__default["default"](p1)) {
+        return path2;
+    }
+    else if (isEmpty__default["default"](path2)) {
+        return p1;
+    }
+    else {
+        return "" + p1 + path2;
+    }
+};
+var toDataPathSegments = function (schemaPath) {
+    var s = schemaPath
+        .replace(/(anyOf|allOf|oneOf)\/[\d]\//g, '')
+        .replace(/(then|else)\//g, '');
+    var segments = s.split('/');
+    var decodedSegments = segments.map(decode);
+    var startFromRoot = decodedSegments[0] === '#' || decodedSegments[0] === '';
+    var startIndex = startFromRoot ? 2 : 1;
+    return range__default["default"](startIndex, decodedSegments.length, 2).map(function (idx) { return decodedSegments[idx]; });
+};
+var toDataPath = function (schemaPath) {
+    return toDataPathSegments(schemaPath).join('.');
+};
+var composeWithUi = function (scopableUi, path) {
+    var segments = toDataPathSegments(scopableUi.scope);
+    if (isEmpty__default["default"](segments) && path === undefined) {
+        return '';
+    }
+    return isEmpty__default["default"](segments) ? path : compose(path, segments.join('.'));
+};
+var encode = function (segment) { return segment === null || segment === void 0 ? void 0 : segment.replace(/~/g, '~0').replace(/\//g, '~1'); };
+var decode = function (pointerSegment) { return pointerSegment === null || pointerSegment === void 0 ? void 0 : pointerSegment.replace(/~1/g, '/').replace(/~0/, '~'); };
+
 var isObjectSchema = function (schema) {
     return schema.properties !== undefined;
 };
@@ -1147,92 +1217,42 @@ var invalidSegment = function (pathSegment) {
     return pathSegment === '#' || pathSegment === undefined || pathSegment === '';
 };
 var resolveSchema = function (schema, schemaPath, rootSchema) {
-    var _a, _b, _c;
+    var segments = schemaPath === null || schemaPath === void 0 ? void 0 : schemaPath.split('/').map(decode);
+    return resolveSchemaWithSegments(schema, segments, rootSchema);
+};
+var resolveSchemaWithSegments = function (schema, pathSegments, rootSchema) {
+    var _a, _b, _c, _d, _e;
     if (isEmpty__default["default"](schema)) {
         return undefined;
     }
-    var validPathSegments = schemaPath.split('/');
-    var resultSchema = schema;
-    for (var i = 0; i < validPathSegments.length; i++) {
-        var pathSegment = validPathSegments[i];
-        resultSchema =
-            resultSchema === undefined || resultSchema.$ref === undefined
-                ? resultSchema
-                : resolveSchema(schema, resultSchema.$ref);
-        if (invalidSegment(pathSegment)) {
-            continue;
-        }
-        var curSchema = get__default["default"](resultSchema, pathSegment);
-        if (!curSchema) {
-            var schemas = [].concat((_a = resultSchema === null || resultSchema === void 0 ? void 0 : resultSchema.oneOf) !== null && _a !== void 0 ? _a : [], (_b = resultSchema === null || resultSchema === void 0 ? void 0 : resultSchema.allOf) !== null && _b !== void 0 ? _b : [], (_c = resultSchema === null || resultSchema === void 0 ? void 0 : resultSchema.anyOf) !== null && _c !== void 0 ? _c : []);
-            for (var _i = 0, schemas_1 = schemas; _i < schemas_1.length; _i++) {
-                var item = schemas_1[_i];
-                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) {
-    var child = resolveSchema(full, reference);
-    var allRefs = findAllRefs(child);
-    var innerSelfReference = allRefs[reference];
-    if (innerSelfReference !== undefined) {
-        innerSelfReference.$ref = '#';
+    if (schema.$ref) {
+        schema = resolveSchema(rootSchema, schema.$ref, rootSchema);
     }
-    return child;
-}
-
-var compose = function (path1, path2) {
-    var p1 = path1;
-    if (!isEmpty__default["default"](path1) && !isEmpty__default["default"](path2) && !path2.startsWith('[')) {
-        p1 = path1 + '.';
+    if (!pathSegments || pathSegments.length === 0) {
+        return schema;
     }
-    if (isEmpty__default["default"](p1)) {
-        return path2;
+    var segment = pathSegments[0], remainingSegments = pathSegments.slice(1);
+    if (invalidSegment(segment)) {
+        return resolveSchemaWithSegments(schema, remainingSegments, rootSchema);
     }
-    else if (isEmpty__default["default"](path2)) {
-        return p1;
+    var singleSegmentResolveSchema = get__default["default"](schema, segment);
+    var resolvedSchema = resolveSchemaWithSegments(singleSegmentResolveSchema, remainingSegments, rootSchema);
+    if (resolvedSchema) {
+        return resolvedSchema;
     }
-    else {
-        return "" + p1 + path2;
-    }
-};
-var toDataPathSegments = function (schemaPath) {
-    var s = schemaPath
-        .replace(/anyOf\/[\d]\//g, '')
-        .replace(/allOf\/[\d]\//g, '')
-        .replace(/oneOf\/[\d]\//g, '');
-    var segments = s.split('/');
-    var startFromRoot = segments[0] === '#' || segments[0] === '';
-    var startIndex = startFromRoot ? 2 : 1;
-    return range__default["default"](startIndex, segments.length, 2).map(function (idx) { return segments[idx]; });
-};
-var toDataPath = function (schemaPath) {
-    return toDataPathSegments(schemaPath).join('.');
-};
-var composeWithUi = function (scopableUi, path) {
-    var segments = toDataPathSegments(scopableUi.scope);
-    if (isEmpty__default["default"](segments) && path === undefined) {
-        return '';
+    if (segment === 'properties' || segment === 'items') {
+        var alternativeResolveResult = undefined;
+        var subSchemas = [].concat((_a = schema.oneOf) !== null && _a !== void 0 ? _a : [], (_b = schema.allOf) !== null && _b !== void 0 ? _b : [], (_c = schema.anyOf) !== null && _c !== void 0 ? _c : [], (_d = schema.then) !== null && _d !== void 0 ? _d : [], (_e = schema.else) !== null && _e !== void 0 ? _e : []);
+        for (var _i = 0, subSchemas_1 = subSchemas; _i < subSchemas_1.length; _i++) {
+            var subSchema = subSchemas_1[_i];
+            alternativeResolveResult = resolveSchemaWithSegments(subSchema, __spreadArray([segment], remainingSegments), rootSchema);
+            if (alternativeResolveResult) {
+                break;
+            }
+        }
+        return alternativeResolveResult;
     }
-    return isEmpty__default["default"](segments) ? path : compose(path, segments.join('.'));
+    return undefined;
 };
 
 var isOrCondition = function (condition) {
@@ -1417,7 +1437,7 @@ var deriveLabel = function (controlElement, schemaElement) {
     }
     if (typeof controlElement.scope === 'string') {
         var ref = controlElement.scope;
-        var label = ref.substr(ref.lastIndexOf('/') + 1);
+        var label = decode(ref.substr(ref.lastIndexOf('/') + 1));
         return startCase__default["default"](label);
     }
     return '';
@@ -1447,32 +1467,6 @@ var labelDescription = function (text, show) { return ({
     show: show
 }); };
 
-var createLabel = function (subSchema, subSchemaIndex, keyword) {
-    if (subSchema.title) {
-        return subSchema.title;
-    }
-    else {
-        return keyword + '-' + subSchemaIndex;
-    }
-};
-var resolveSubSchemas = function (schema, rootSchema, keyword) {
-    var _a;
-    var schemas = schema[keyword];
-    if (schemas.findIndex(function (e) { return e.$ref !== undefined; }) !== -1) {
-        return __assign(__assign({}, schema), (_a = {}, _a[keyword] = schema[keyword].map(function (e) {
-            return e.$ref ? resolveSchema(rootSchema, e.$ref) : e;
-        }), _a));
-    }
-    return schema;
-};
-var createCombinatorRenderInfos = function (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) {
-    return combinatorSubSchemas.map(function (subSchema, subSchemaIndex) { return ({
-        schema: subSchema,
-        uischema: findUISchema(uischemas, subSchema, control.scope, path, undefined, control, rootSchema),
-        label: createLabel(subSchema, subSchemaIndex, keyword)
-    }); });
-};
-
 var isRequired = function (schema, schemaPath, rootSchema) {
     var pathSegments = schemaPath.split('/');
     var lastSegment = pathSegments[pathSegments.length - 1];
@@ -1735,7 +1729,7 @@ var mapStateToLayoutProps = function (state, ownProps) {
     var enabled = isInherentlyEnabled(state, ownProps, uischema, undefined,
     rootData, config);
     return __assign(__assign({}, layoutDefaultProps), { renderers: ownProps.renderers || getRenderers(state), cells: ownProps.cells || getCells(state), visible: visible,
-        enabled: enabled, path: ownProps.path, data: data, uischema: ownProps.uischema, schema: ownProps.schema, direction: (_a = ownProps.direction) !== null && _a !== void 0 ? _a : getDirection(uischema) });
+        enabled: enabled, path: ownProps.path, data: data, uischema: ownProps.uischema, schema: ownProps.schema, direction: (_a = ownProps.direction) !== null && _a !== void 0 ? _a : getDirection(uischema), config: config });
 };
 var mapStateToJsonFormsRendererProps = function (state, ownProps) {
     var uischema = ownProps.uischema;
@@ -1758,18 +1752,9 @@ var mapStateToJsonFormsRendererProps = function (state, ownProps) {
 };
 var controlDefaultProps = __assign(__assign({}, layoutDefaultProps), { errors: [] });
 var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
-    var uischema = ownProps.uischema;
-    var path = composeWithUi(uischema, ownProps.path);
-    var rootSchema = getSchema(state);
-    var resolvedSchema = Resolve.schema(ownProps.schema || rootSchema, uischema.scope, rootSchema);
-    var visible = ownProps.visible === undefined || hasShowRule(uischema)
-        ? isVisible(uischema, getData(state), ownProps.path, getAjv(state))
-        : ownProps.visible;
-    var id = ownProps.id;
-    var data = Resolve.data(getData(state), path);
+    var _a;
+    var _b = mapStateToControlProps(state, ownProps), data = _b.data, schema = _b.schema, props = __rest(_b, ["data", "schema"]);
     var ajv = state.jsonforms.core.ajv;
-    var schema = resolvedSchema || rootSchema;
-    var _schema = resolveSubSchemas(schema, rootSchema, keyword);
     var structuralKeywords = [
         'required',
         'additionalProperties',
@@ -1783,9 +1768,9 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
             !errors.find(function (e) { return structuralKeywords.indexOf(e.keyword) !== -1; }));
     };
     var indexOfFittingSchema;
-    for (var i = 0; i < _schema[keyword].length; i++) {
+    for (var i = 0; i < ((_a = schema[keyword]) === null || _a === void 0 ? void 0 : _a.length); i++) {
         try {
-            var valFn = ajv.compile(_schema[keyword][i]);
+            var valFn = ajv.compile(schema[keyword][i]);
             valFn(data);
             if (dataIsValid(valFn.errors)) {
                 indexOfFittingSchema = i;
@@ -1796,17 +1781,8 @@ var mapStateToCombinatorRendererProps = function (state, ownProps, keyword) {
             console.debug("Combinator subschema is not self contained, can't hand it over to AJV");
         }
     }
-    return {
-        data: data,
-        path: path,
-        schema: schema,
-        rootSchema: rootSchema,
-        visible: visible,
-        id: id,
-        indexOfFittingSchema: indexOfFittingSchema,
-        uischemas: state.jsonforms.uischemas,
-        uischema: uischema
-    };
+    return __assign(__assign({ data: data,
+        schema: schema }, props), { indexOfFittingSchema: indexOfFittingSchema, uischemas: getUISchemas(state) });
 };
 var mapStateToAllOfProps = function (state, ownProps) {
     return mapStateToCombinatorRendererProps(state, ownProps, 'allOf');
@@ -1899,6 +1875,25 @@ function (dispatch, ownProps) {
     };
 };
 
+var createLabel = function (subSchema, subSchemaIndex, keyword) {
+    if (subSchema.title) {
+        return subSchema.title;
+    }
+    else {
+        return keyword + '-' + subSchemaIndex;
+    }
+};
+var createCombinatorRenderInfos = function (combinatorSubSchemas, rootSchema, keyword, control, path, uischemas) {
+    return combinatorSubSchemas.map(function (subSchema, subSchemaIndex) {
+        var schema = subSchema.$ref ? Resolve.schema(rootSchema, subSchema.$ref, rootSchema) : subSchema;
+        return {
+            schema: schema,
+            uischema: findUISchema(uischemas, schema, control.scope, path, undefined, control, rootSchema),
+            label: createLabel(subSchema, subSchemaIndex, keyword)
+        };
+    });
+};
+
 var usedIds = new Set();
 var makeId = function (idBase, iteration) {
     return iteration <= 1 ? idBase : idBase + iteration.toString();
@@ -2002,7 +1997,7 @@ var isCombinator = function (jsonSchema) {
 };
 var generateUISchema = function (jsonSchema, schemaElements, currentRef, schemaName, layoutType, rootSchema) {
     if (!isEmpty__default["default"](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)) {
         var controlObject = createControlElement(currentRef);
@@ -2028,9 +2023,9 @@ var generateUISchema = function (jsonSchema, schemaElements, currentRef, schemaN
             var nextRef_1 = currentRef + '/properties';
             Object.keys(jsonSchema.properties).map(function (propName) {
                 var value = jsonSchema.properties[propName];
-                var ref = nextRef_1 + "/" + propName;
+                var ref = nextRef_1 + "/" + encode(propName);
                 if (value.$ref !== undefined) {
-                    value = resolveSchema(rootSchema, value.$ref);
+                    value = resolveSchema(rootSchema, value.$ref, rootSchema);
                 }
                 generateUISchema(value, layout_1.elements, ref, propName, layoutType, rootSchema);
             });
@@ -2288,6 +2283,7 @@ exports.createControlElement = createControlElement;
 exports.createDefaultValue = createDefaultValue;
 exports.createId = createId;
 exports.createLabelDescriptionFrom = createLabelDescriptionFrom;
+exports.decode = decode;
 exports.defaultDataReducer = defaultDataReducer;
 exports.defaultErrorTranslator = defaultErrorTranslator;
 exports.defaultJsonFormsI18nState = defaultJsonFormsI18nState;
@@ -2295,6 +2291,7 @@ exports.defaultMapDispatchToControlProps = defaultMapDispatchToControlProps;
 exports.defaultMapStateToEnumCellProps = defaultMapStateToEnumCellProps;
 exports.defaultTranslator = defaultTranslator;
 exports.deriveTypes = deriveTypes;
+exports.encode = encode;
 exports.enumToEnumOptionMapper = enumToEnumOptionMapper;
 exports.errorAt = errorAt;
 exports.errorsAt = errorsAt;
@@ -2410,7 +2407,6 @@ exports.removeId = removeId;
 exports.rendererReducer = rendererReducer;
 exports.resolveData = resolveData;
 exports.resolveSchema = resolveSchema;
-exports.resolveSubSchemas = resolveSubSchemas;
 exports.schemaMatches = schemaMatches;
 exports.schemaSubPathMatches = schemaSubPathMatches;
 exports.schemaTypeIs = schemaTypeIs;