@jsonforms/material-renderers 3.2.0-alpha.1 → 3.2.0-alpha.3

package/lib/complex/CombinatorProperties.d.ts

@@ -4,6 +4,7 @@ interface CombinatorPropertiesProps {
     schema: JsonSchema;
     combinatorKeyword: 'oneOf' | 'anyOf';
     path: string;
+    rootSchema: JsonSchema;
 }
 export declare class CombinatorProperties extends React.Component<CombinatorPropertiesProps, {}> {
     render(): React.JSX.Element;

package/lib/jsonforms-react-material.cjs.js

@@ -128,9 +128,9 @@ var CombinatorProperties =  (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     CombinatorProperties.prototype.render = function () {
-        var _a = this.props, schema = _a.schema, combinatorKeyword = _a.combinatorKeyword, path = _a.path;
+        var _a = this.props, schema = _a.schema, combinatorKeyword = _a.combinatorKeyword, path = _a.path, rootSchema = _a.rootSchema;
         var otherProps = omit__default["default"](schema, combinatorKeyword);
-        var foundUISchema = core.Generate.uiSchema(otherProps, 'VerticalLayout');
+        var foundUISchema = core.Generate.uiSchema(otherProps, 'VerticalLayout', undefined, rootSchema);
         var isLayoutWithElements = false;
         if (foundUISchema !== null && core.isLayout(foundUISchema)) {
             isLayoutWithElements = foundUISchema.elements.length > 0;
@@ -163,7 +163,7 @@ var MaterialAnyOfRenderer = function (_a) {
     var handleTabChange = React.useCallback(function (_event, newIndex) {
         if (isEmpty__default["default"](data) ||
             typeof data ===
-                typeof core.createDefaultValue(anyOfRenderInfos[newIndex].schema)) {
+                typeof core.createDefaultValue(anyOfRenderInfos[newIndex].schema, rootSchema)) {
             setSelectedAnyOf(newIndex);
         }
         else {
@@ -172,7 +172,7 @@ var MaterialAnyOfRenderer = function (_a) {
         }
     }, [setConfirmDialogOpen, setSelectedAnyOf, data]);
     var openNewTab = function (newIndex) {
-        handleChange(path, core.createDefaultValue(anyOfRenderInfos[newIndex].schema));
+        handleChange(path, core.createDefaultValue(anyOfRenderInfos[newIndex].schema, rootSchema));
         setSelectedAnyOf(newIndex);
     };
     var confirm = React.useCallback(function () {
@@ -182,7 +182,7 @@ var MaterialAnyOfRenderer = function (_a) {
     var anyOf = 'anyOf';
     var anyOfRenderInfos = core.createCombinatorRenderInfos(schema.anyOf, rootSchema, anyOf, uischema, path, uischemas);
     return (React__default["default"].createElement(material.Hidden, { xsUp: !visible },
-        React__default["default"].createElement(CombinatorProperties, { schema: schema, combinatorKeyword: anyOf, path: path }),
+        React__default["default"].createElement(CombinatorProperties, { schema: schema, combinatorKeyword: anyOf, path: path, rootSchema: rootSchema }),
         React__default["default"].createElement(material.Tabs, { value: selectedAnyOf, onChange: handleTabChange }, anyOfRenderInfos.map(function (anyOfRenderInfo) { return (React__default["default"].createElement(material.Tab, { key: anyOfRenderInfo.label, label: anyOfRenderInfo.label })); })),
         anyOfRenderInfos.map(function (anyOfRenderInfo, anyOfIndex) {
             return selectedAnyOf === anyOfIndex && (React__default["default"].createElement(react.JsonFormsDispatch, { key: anyOfIndex, schema: anyOfRenderInfo.schema, uischema: anyOfRenderInfo.uischema, path: path, renderers: renderers, cells: cells }));
@@ -218,7 +218,7 @@ var fixedCellSmall = {
     paddingRight: 0,
 };
 var TableToolbar = React__default["default"].memo(function TableToolbar(_a) {
-    var numColumns = _a.numColumns, errors = _a.errors, label = _a.label, path = _a.path, addItem = _a.addItem, schema = _a.schema, enabled = _a.enabled, translations = _a.translations;
+    var numColumns = _a.numColumns, errors = _a.errors, label = _a.label, path = _a.path, addItem = _a.addItem, schema = _a.schema, enabled = _a.enabled, translations = _a.translations, rootSchema = _a.rootSchema;
     return (React__default["default"].createElement(material.TableRow, null,
         React__default["default"].createElement(NoBorderTableCell, { colSpan: numColumns },
             React__default["default"].createElement(material.Grid, { container: true, justifyContent: 'flex-start', alignItems: 'center', spacing: 2 },
@@ -228,7 +228,7 @@ var TableToolbar = React__default["default"].memo(function TableToolbar(_a) {
                     React__default["default"].createElement(ValidationIcon, { id: 'tooltip-validation', errorMessages: errors })))))),
         enabled ? (React__default["default"].createElement(NoBorderTableCell, { align: 'right', style: fixedCellSmall },
             React__default["default"].createElement(material.Tooltip, { id: 'tooltip-add', title: translations.addTooltip, placement: 'bottom' },
-                React__default["default"].createElement(material.IconButton, { "aria-label": translations.addAriaLabel, onClick: addItem(path, core.createDefaultValue(schema)), size: 'large' },
+                React__default["default"].createElement(material.IconButton, { "aria-label": translations.addAriaLabel, onClick: addItem(path, core.createDefaultValue(schema, rootSchema)), size: 'large' },
                     React__default["default"].createElement(AddIcon__default["default"], null))))) : null));
 });
 
@@ -447,7 +447,7 @@ var MuiAutocomplete = function (props) {
             }, inputValue: inputValue, onInputChange: function (_event, newInputValue) {
                 setInputValue(newInputValue);
             }, autoHighlight: true, autoSelect: true, autoComplete: true, fullWidth: true, options: options, getOptionLabel: getOptionLabel || (function (option) { return option === null || option === void 0 ? void 0 : option.label; }), freeSolo: false, renderInput: function (params) {
-                return (React__default["default"].createElement(material.TextField, __assign({ label: label, type: 'text', inputProps: params.inputProps, inputRef: params.InputProps.ref, autoFocus: appliedUiSchemaOptions.focus, disabled: !enabled }, params, { id: id + '-input', required: required && !appliedUiSchemaOptions.hideRequiredAsterisk, error: !isValid, fullWidth: !appliedUiSchemaOptions.trim, InputLabelProps: data ? { shrink: true } : undefined, onFocus: onFocus, onBlur: onBlur, focused: focused })));
+                return (React__default["default"].createElement(material.TextField, __assign({ label: label, type: 'text', inputProps: params.inputProps, inputRef: params.InputProps.ref, autoFocus: appliedUiSchemaOptions.focus, disabled: !enabled }, params, { id: id, required: required && !appliedUiSchemaOptions.hideRequiredAsterisk, error: !isValid, fullWidth: !appliedUiSchemaOptions.trim, InputLabelProps: data ? { shrink: true } : undefined, onFocus: onFocus, onBlur: onBlur, focused: focused })));
             }, renderOption: renderOption, filterOptions: filterOptions }),
         React__default["default"].createElement(material.FormHelperText, { error: !isValid && !showDescription }, firstFormHelperText),
         React__default["default"].createElement(material.FormHelperText, { error: !isValid }, secondFormHelperText)));
@@ -696,8 +696,11 @@ var materialEnumArrayRendererTester = core.rankWith(5, core.and(core.uiTypeIs('C
     return core.hasType(schema, 'array') &&
         !Array.isArray(schema.items) &&
         schema.uniqueItems === true;
-}), core.schemaSubPathMatches('items', function (schema) {
-    return hasOneOfItems(schema) || hasEnumItems(schema);
+}), core.schemaSubPathMatches('items', function (schema, rootSchema) {
+    var resolvedSchema = schema.$ref
+        ? core.resolveSchema(rootSchema, schema.$ref, rootSchema)
+        : schema;
+    return hasOneOfItems(resolvedSchema) || hasEnumItems(resolvedSchema);
 }))));
 var MaterialEnumArrayRenderer$1 = react.withJsonFormsMultiEnumProps(MaterialEnumArrayRenderer);
 
@@ -706,8 +709,8 @@ var MaterialObjectRenderer = function (_a) {
     var detailUiSchema = React.useMemo(function () {
         return core.findUISchema(uischemas, schema, uischema.scope, path, function () {
             return isEmpty__default["default"](path)
-                ? core.Generate.uiSchema(schema, 'VerticalLayout')
-                : __assign(__assign({}, core.Generate.uiSchema(schema, 'Group')), { label: label });
+                ? core.Generate.uiSchema(schema, 'VerticalLayout', undefined, rootSchema)
+                : __assign(__assign({}, core.Generate.uiSchema(schema, 'Group', undefined, rootSchema)), { label: label });
         }, uischema, rootSchema);
     }, [uischemas, schema, uischema.scope, path, label, uischema, rootSchema]);
     return (React__default["default"].createElement(material.Hidden, { xsUp: !visible },
@@ -727,7 +730,7 @@ var MaterialOneOfRenderer = function (_a) {
     }, [setConfirmDialogOpen]);
     var oneOfRenderInfos = core.createCombinatorRenderInfos(schema.oneOf, rootSchema, 'oneOf', uischema, path, uischemas);
     var openNewTab = function (newIndex) {
-        handleChange(path, core.createDefaultValue(oneOfRenderInfos[newIndex].schema));
+        handleChange(path, core.createDefaultValue(oneOfRenderInfos[newIndex].schema, rootSchema));
         setSelectedIndex(newIndex);
     };
     var confirm = React.useCallback(function () {
@@ -744,7 +747,7 @@ var MaterialOneOfRenderer = function (_a) {
         }
     }, [setConfirmDialogOpen, setSelectedIndex, data]);
     return (React__default["default"].createElement(material.Hidden, { xsUp: !visible },
-        React__default["default"].createElement(CombinatorProperties, { schema: schema, combinatorKeyword: 'oneOf', path: path }),
+        React__default["default"].createElement(CombinatorProperties, { schema: schema, combinatorKeyword: 'oneOf', path: path, rootSchema: rootSchema }),
         React__default["default"].createElement(material.Tabs, { value: selectedIndex, onChange: handleTabChange }, oneOfRenderInfos.map(function (oneOfRenderInfo) { return (React__default["default"].createElement(material.Tab, { key: oneOfRenderInfo.label, label: oneOfRenderInfo.label })); })),
         oneOfRenderInfos.map(function (oneOfRenderInfo, oneOfIndex) {
             return selectedIndex === oneOfIndex && (React__default["default"].createElement(react.JsonFormsDispatch, { key: oneOfIndex, schema: oneOfRenderInfo.schema, uischema: oneOfRenderInfo.uischema, path: path, renderers: renderers, cells: cells }));
@@ -805,7 +808,7 @@ var MaterialListWithDetailRenderer = function (_a) {
         }
     }; }, [removeItems, setSelectedIndex]);
     var handleListItemClick = React.useCallback(function (index) { return function () { return setSelectedIndex(index); }; }, [setSelectedIndex]);
-    var handleCreateDefaultValue = React.useCallback(function () { return core.createDefaultValue(schema); }, [core.createDefaultValue]);
+    var handleCreateDefaultValue = React.useCallback(function () { return core.createDefaultValue(schema, rootSchema); }, [core.createDefaultValue]);
     var foundUISchema = React.useMemo(function () {
         return core.findUISchema(uischemas, schema, uischema.scope, path, undefined, uischema, rootSchema);
     }, [uischemas, schema, uischema.scope, path, uischema, rootSchema]);
@@ -1130,11 +1133,10 @@ var MaterialRadioGroup = function (props) {
     var isValid = errors.length === 0;
     var appliedUiSchemaOptions = merge__default["default"]({}, config, props.uischema.options);
     var showDescription = !core.isDescriptionHidden(visible, description, focused, appliedUiSchemaOptions.showUnfocusedDescription);
-    var onChange = function (_ev, value) { return handleChange(path, value); };
     return (React__default["default"].createElement(material.Hidden, { xsUp: !visible },
         React__default["default"].createElement(material.FormControl, { component: 'fieldset', fullWidth: !appliedUiSchemaOptions.trim, onFocus: onFocus, onBlur: onBlur },
             React__default["default"].createElement(material.FormLabel, { htmlFor: id, error: !isValid, component: 'legend', required: core.showAsRequired(required, appliedUiSchemaOptions.hideRequiredAsterisk) }, label),
-            React__default["default"].createElement(material.RadioGroup, { value: (_a = props.data) !== null && _a !== void 0 ? _a : '', onChange: onChange, row: true }, options.map(function (option) { return (React__default["default"].createElement(material.FormControlLabel, { value: option.value, key: option.label, control: React__default["default"].createElement(material.Radio, { checked: data === option.value }), label: option.label, disabled: !enabled })); })),
+            React__default["default"].createElement(material.RadioGroup, { value: (_a = props.data) !== null && _a !== void 0 ? _a : '', row: true }, options.map(function (option) { return (React__default["default"].createElement(material.FormControlLabel, { value: option.value, key: option.label, control: React__default["default"].createElement(material.Radio, { checked: data === option.value, onChange: function () { return handleChange(path, option.value); } }), label: option.label, disabled: !enabled })); })),
             React__default["default"].createElement(material.FormHelperText, { error: !isValid }, !isValid ? errors : showDescription ? description : null))));
 };
 
@@ -1431,7 +1433,7 @@ var MaterialCategorizationLayout = withAjvProps(react.withTranslateProps(react.w
 
 var MaterialArrayLayoutComponent = function (props) {
     var _a = React.useState(false), expanded = _a[0], setExpanded = _a[1];
-    var innerCreateDefaultValue = React.useCallback(function () { return core.createDefaultValue(props.schema); }, [props.schema]);
+    var innerCreateDefaultValue = React.useCallback(function () { return core.createDefaultValue(props.schema, props.rootSchema); }, [props.schema]);
     var handleChange = React.useCallback(function (panel) { return function (_event, expandedPanel) {
         setExpanded(expandedPanel ? panel : false);
     }; }, []);