@jsonforms/material-renderers 3.0.0-beta.1 → 3.0.0-beta.4

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

@@ -1,4 +1,4 @@
-import { createDefaultValue, Resolve, Paths, formatErrorMessage, errorsAt, rankWith, isObjectControl, findUISchema, isAllOfControl, resolveSubSchemas, findMatchingUISchema, createCombinatorRenderInfos, Generate, isAnyOfControl, isOneOfControl, getAjv, and, uiTypeIs, schemaMatches, hasType, schemaSubPathMatches, or, isObjectArrayControl, isPrimitiveArrayControl, isObjectArray, computeLabel, composePaths, isBooleanControl, optionIs, isDescriptionHidden, showAsRequired, isEnumControl, isDateControl, isTimeControl, isDateTimeControl, isRangeControl, isIntegerControl, isNumberControl, isStringControl, isOneOfEnumControl, withIncreasedRank, isVisible, update, moveUp, moveDown, getFirstPrimitiveProp, createId, removeId, isObjectArrayWithNesting, isNumberFormatControl, categorizationHasCategory } from '@jsonforms/core';
+import { createDefaultValue, Resolve, encode, Paths, formatErrorMessage, errorsAt, rankWith, isObjectControl, findUISchema, Generate, isAllOfControl, findMatchingUISchema, createCombinatorRenderInfos, isAnyOfControl, isOneOfControl, getAjv, and, uiTypeIs, schemaMatches, hasType, schemaSubPathMatches, or, isObjectArrayControl, isPrimitiveArrayControl, isObjectArray, computeLabel, composePaths, isBooleanControl, optionIs, isDescriptionHidden, showAsRequired, isEnumControl, isDateControl, isTimeControl, isDateTimeControl, isRangeControl, isIntegerControl, isNumberControl, isStringControl, isOneOfEnumControl, withIncreasedRank, isVisible, update, moveUp, moveDown, getFirstPrimitiveProp, createId, removeId, isObjectArrayWithNesting, isNumberFormatControl, categorizationHasCategory } from '@jsonforms/core';
 import React, { useMemo, Fragment, useState, useCallback, useEffect } from 'react';
 import { DispatchCell, useJsonForms, withJsonFormsArrayLayoutProps, withJsonFormsDetailProps, JsonFormsDispatch, withJsonFormsAllOfProps, withJsonFormsAnyOfProps, withJsonFormsOneOfProps, withJsonFormsMultiEnumProps, withJsonFormsLayoutProps, withJsonFormsMasterListItemProps, withJsonFormsControlProps, withJsonFormsEnumProps, Control, withJsonFormsOneOfEnumProps, withJsonFormsContext, withJsonFormsCellProps, withJsonFormsEnumCellProps, withJsonFormsOneOfEnumCellProps } from '@jsonforms/react';
 import isEmpty from 'lodash/isEmpty';
@@ -132,7 +132,7 @@ const controlWithoutLabel = (scope) => ({
 });
 const NonEmptyCellComponent = React.memo(({ path, propName, schema, rootSchema, errors, enabled, renderers, cells, isValid }) => {
     return (React.createElement(NoBorderTableCell, null,
-        schema.properties ? (React.createElement(DispatchCell, { schema: Resolve.schema(schema, `#/properties/${propName}`, rootSchema), uischema: controlWithoutLabel(`#/properties/${propName}`), path: path, enabled: enabled, renderers: renderers, cells: cells })) : (React.createElement(DispatchCell, { schema: schema, uischema: controlWithoutLabel('#'), path: path, enabled: enabled, renderers: renderers, cells: cells })),
+        schema.properties ? (React.createElement(DispatchCell, { schema: Resolve.schema(schema, `#/properties/${encode(propName)}`, rootSchema), uischema: controlWithoutLabel(`#/properties/${encode(propName)}`), path: path, enabled: enabled, renderers: renderers, cells: cells })) : (React.createElement(DispatchCell, { schema: schema, uischema: controlWithoutLabel('#'), path: path, enabled: enabled, renderers: renderers, cells: cells })),
         React.createElement(FormHelperText, { error: !isValid }, !isValid && errors)));
 });
 const NonEmptyCell = (ownProps) => {
@@ -168,7 +168,7 @@ const TableRows = ({ data, path, schema, openDeleteDialog, moveUp, moveDown, uis
     const appliedUiSchemaOptions = merge({}, config, uischema.options);
     return (React.createElement(React.Fragment, null, range(data).map((index) => {
         const childPath = Paths.compose(path, `${index}`);
-        return (React.createElement(NonEmptyRow, { key: childPath, childPath: childPath, rowIndex: index, schema: schema, openDeleteDialog: openDeleteDialog, moveUpCreator: moveUp, moveDownCreator: moveDown, enableUp: index !== 0, enableDown: index !== data - 1, showSortButtons: appliedUiSchemaOptions.showSortButtons, enabled: enabled, cells: cells, path: path }));
+        return (React.createElement(NonEmptyRow, { key: childPath, childPath: childPath, rowIndex: index, schema: schema, openDeleteDialog: openDeleteDialog, moveUpCreator: moveUp, moveDownCreator: moveDown, enableUp: index !== 0, enableDown: index !== data - 1, showSortButtons: appliedUiSchemaOptions.showSortButtons || appliedUiSchemaOptions.showArrayTableSortButtons, enabled: enabled, cells: cells, path: path }));
     })));
 };
 class MaterialTableControl extends React.Component {
@@ -229,13 +229,7 @@ const MaterialArrayControlRenderer = (props) => {
 var MaterialArrayControlRenderer$1 = withJsonFormsArrayLayoutProps(MaterialArrayControlRenderer);
 
 const MaterialObjectRenderer = ({ renderers, cells, uischemas, schema, label, path, visible, enabled, uischema, rootSchema }) => {
-    const detailUiSchema = useMemo(() => findUISchema(uischemas, schema, uischema.scope, path, 'Group', uischema, rootSchema), [uischemas, schema, uischema.scope, path, uischema, rootSchema]);
-    if (isEmpty(path)) {
-        detailUiSchema.type = 'VerticalLayout';
-    }
-    else {
-        detailUiSchema.label = label;
-    }
+    const detailUiSchema = useMemo(() => findUISchema(uischemas, schema, uischema.scope, path, () => isEmpty(path) ? Generate.uiSchema(schema, 'VerticalLayout') : { ...Generate.uiSchema(schema, 'Group'), label }, uischema, rootSchema), [uischemas, schema, uischema.scope, path, label, uischema, rootSchema]);
     return (React.createElement(Hidden, { xsUp: !visible },
         React.createElement(JsonFormsDispatch, { visible: visible, enabled: enabled, schema: schema, uischema: detailUiSchema, path: path, renderers: renderers, cells: cells })));
 };
@@ -243,13 +237,12 @@ const materialObjectControlTester = rankWith(2, isObjectControl);
 var MaterialObjectRenderer$1 = withJsonFormsDetailProps(MaterialObjectRenderer);
 
 const MaterialAllOfRenderer = ({ schema, rootSchema, visible, renderers, cells, path, uischemas, uischema }) => {
-    const _schema = resolveSubSchemas(schema, rootSchema, 'allOf');
-    const delegateUISchema = findMatchingUISchema(uischemas)(_schema, uischema.scope, path);
+    const delegateUISchema = findMatchingUISchema(uischemas)(schema, uischema.scope, path);
     if (delegateUISchema) {
         return (React.createElement(Hidden, { xsUp: !visible },
-            React.createElement(JsonFormsDispatch, { schema: _schema, uischema: delegateUISchema, path: path, renderers: renderers, cells: cells })));
+            React.createElement(JsonFormsDispatch, { schema: schema, uischema: delegateUISchema, path: path, renderers: renderers, cells: cells })));
     }
-    const allOfRenderInfos = createCombinatorRenderInfos(_schema.allOf, rootSchema, 'allOf', uischema, path, uischemas);
+    const allOfRenderInfos = createCombinatorRenderInfos(schema.allOf, rootSchema, 'allOf', uischema, path, uischemas);
     return (React.createElement(Hidden, { xsUp: !visible }, allOfRenderInfos.map((allOfRenderInfo, allOfIndex) => (React.createElement(JsonFormsDispatch, { key: allOfIndex, schema: allOfRenderInfo.schema, uischema: allOfRenderInfo.uischema, path: path, renderers: renderers, cells: cells })))));
 };
 const materialAllOfControlTester = rankWith(3, isAllOfControl);
@@ -276,10 +269,9 @@ const MaterialAnyOfRenderer = ({ schema, rootSchema, indexOfFittingSchema, visib
     const [selectedAnyOf, setSelectedAnyOf] = useState(indexOfFittingSchema || 0);
     const handleChange = useCallback((_ev, value) => setSelectedAnyOf(value), [setSelectedAnyOf]);
     const anyOf = 'anyOf';
-    const _schema = resolveSubSchemas(schema, rootSchema, anyOf);
-    const anyOfRenderInfos = createCombinatorRenderInfos(_schema.anyOf, rootSchema, anyOf, uischema, path, uischemas);
+    const anyOfRenderInfos = createCombinatorRenderInfos(schema.anyOf, rootSchema, anyOf, uischema, path, uischemas);
     return (React.createElement(Hidden, { xsUp: !visible },
-        React.createElement(CombinatorProperties, { schema: _schema, combinatorKeyword: 'anyOf', path: path }),
+        React.createElement(CombinatorProperties, { schema: schema, combinatorKeyword: anyOf, path: path }),
         React.createElement(Tabs, { value: selectedAnyOf, onChange: handleChange }, anyOfRenderInfos.map(anyOfRenderInfo => (React.createElement(Tab, { key: anyOfRenderInfo.label, label: anyOfRenderInfo.label })))),
         anyOfRenderInfos.map((anyOfRenderInfo, anyOfIndex) => selectedAnyOf === anyOfIndex && (React.createElement(JsonFormsDispatch, { key: anyOfIndex, schema: anyOfRenderInfo.schema, uischema: anyOfRenderInfo.uischema, path: path, renderers: renderers, cells: cells })))));
 };
@@ -294,10 +286,9 @@ const MaterialOneOfRenderer = ({ handleChange, schema, path, renderers, cells, r
     const cancel = useCallback(() => {
         setOpen(false);
     }, [setOpen]);
-    const _schema = resolveSubSchemas(schema, rootSchema, 'oneOf');
-    const oneOfRenderInfos = createCombinatorRenderInfos(_schema.oneOf, rootSchema, 'oneOf', uischema, path, uischemas);
+    const oneOfRenderInfos = createCombinatorRenderInfos(schema.oneOf, rootSchema, 'oneOf', uischema, path, uischemas);
     const openNewTab = (newIndex) => {
-        handleChange(path, createDefaultValue(schema.oneOf[newIndex]));
+        handleChange(path, createDefaultValue(oneOfRenderInfos[newIndex].schema));
         setSelectedIndex(newIndex);
     };
     const confirm = useCallback(() => {
@@ -314,7 +305,7 @@ const MaterialOneOfRenderer = ({ handleChange, schema, path, renderers, cells, r
         }
     }, [setOpen, setSelectedIndex, data]);
     return (React.createElement(Hidden, { xsUp: !visible },
-        React.createElement(CombinatorProperties, { schema: _schema, combinatorKeyword: 'oneOf', path: path }),
+        React.createElement(CombinatorProperties, { schema: schema, combinatorKeyword: 'oneOf', path: path }),
         React.createElement(Tabs, { value: selectedIndex, onChange: handleTabChange }, oneOfRenderInfos.map(oneOfRenderInfo => React.createElement(Tab, { key: oneOfRenderInfo.label, label: oneOfRenderInfo.label }))),
         oneOfRenderInfos.map((oneOfRenderInfo, oneOfIndex) => (selectedIndex === oneOfIndex && (React.createElement(JsonFormsDispatch, { key: oneOfIndex, schema: oneOfRenderInfo.schema, uischema: oneOfRenderInfo.uischema, path: path, renderers: renderers, cells: cells })))),
         React.createElement(Dialog, { open: open, onClose: handleClose, "aria-labelledby": 'alert-dialog-title', "aria-describedby": 'alert-dialog-description' },
@@ -492,7 +483,7 @@ const MaterialEnumArrayRenderer = ({ schema, visible, errors, path, options, dat
                     : undefined;
                 return (React.createElement(FormControlLabel, { id: option.value, key: option.value, control: React.createElement(MuiCheckbox, Object.assign({ key: 'checkbox-' + option.value, isValid: isEmpty(errors), path: optionPath, handleChange: (_childPath, newValue) => newValue
                             ? addItem(path, option.value)
-                            : removeItem(path, option.value), data: checkboxValue, errors: errors, schema: schema, visible: visible }, otherProps)), label: startCase(option.label) }));
+                            : removeItem(path, option.value), data: checkboxValue, errors: errors, schema: schema, visible: visible }, otherProps)), label: option.label }));
             })),
             React.createElement(FormHelperText, { error: true }, errors))));
 };
@@ -546,7 +537,7 @@ const ListWithDetailMasterItem = ({ index, childLabel, selected, handleSelect, r
 };
 var ListWithDetailMasterItem$1 = withJsonFormsMasterListItemProps(ListWithDetailMasterItem);
 
-const MaterialListWithDetailRenderer = ({ uischemas, schema, uischema, path, errors, visible, label, required, removeItems, addItem, data, renderers, cells, config }) => {
+const MaterialListWithDetailRenderer = ({ uischemas, schema, uischema, path, errors, visible, label, required, removeItems, addItem, data, renderers, cells, config, rootSchema }) => {
     const [selectedIndex, setSelectedIndex] = useState(undefined);
     const handleRemoveItem = useCallback((p, value) => () => {
         removeItems(p, [value])();
@@ -559,7 +550,7 @@ const MaterialListWithDetailRenderer = ({ uischemas, schema, uischema, path, err
     }, [removeItems, setSelectedIndex]);
     const handleListItemClick = useCallback((index) => () => setSelectedIndex(index), [setSelectedIndex]);
     const handleCreateDefaultValue = useCallback(() => createDefaultValue(schema), [createDefaultValue]);
-    const foundUISchema = useMemo(() => findUISchema(uischemas, schema, uischema.scope, path, undefined, uischema), [uischemas, schema, uischema.scope, path, uischema]);
+    const foundUISchema = useMemo(() => findUISchema(uischemas, schema, uischema.scope, path, undefined, uischema, rootSchema), [uischemas, schema, uischema.scope, path, uischema, rootSchema]);
     const appliedUiSchemaOptions = merge({}, config, uischema.options);
     return (React.createElement(Hidden, { xsUp: !visible },
         React.createElement(ArrayLayoutToolbar, { label: computeLabel(label, required, appliedUiSchemaOptions.hideRequiredAsterisk), errors: errors, path: path, addItem: addItem, createDefault: handleCreateDefaultValue }),
@@ -951,6 +942,7 @@ const ExpandPanelRendererComponent = (props) => {
     const { childLabel, childPath, index, expanded, moveDown, moveUp, enableMoveDown, enableMoveUp, handleExpansion, removeItems, path, rootSchema, schema, uischema, uischemas, renderers, cells, config } = props;
     const foundUISchema = useMemo(() => findUISchema(uischemas, schema, uischema.scope, path, undefined, uischema, rootSchema), [uischemas, schema, uischema.scope, path, uischema, rootSchema]);
     const appliedUiSchemaOptions = merge({}, config, uischema.options);
+    const showSortButtons = appliedUiSchemaOptions.showSortButtons || appliedUiSchemaOptions.showArrayLayoutSortButtons;
     return (React.createElement(Accordion, { "aria-labelledby": labelHtmlId, expanded: expanded, onChange: handleExpansion(childPath) },
         React.createElement(AccordionSummary, { expandIcon: React.createElement(ExpandMoreIcon, null) },
             React.createElement(Grid, { container: true, alignItems: 'center' },
@@ -964,7 +956,7 @@ const ExpandPanelRendererComponent = (props) => {
                     React.createElement(Grid, { container: true, justifyContent: 'flex-end' },
                         React.createElement(Grid, { item: true },
                             React.createElement(Grid, { container: true, direction: 'row', justifyContent: 'center', alignItems: 'center' },
-                                appliedUiSchemaOptions.showSortButtons ? (React.createElement(Fragment, null,
+                                showSortButtons ? (React.createElement(Fragment, null,
                                     React.createElement(Grid, { item: true },
                                         React.createElement(IconButton, { onClick: moveUp(path, index), style: iconStyle, disabled: !enableMoveUp, "aria-label": `Move up`, size: 'large' },
                                             React.createElement(ArrowUpward, null))),
@@ -1034,12 +1026,12 @@ const MaterialArrayLayoutComponent = (props) => {
 };
 const MaterialArrayLayout$1 = React.memo(MaterialArrayLayoutComponent);
 
-const MaterialArrayLayoutRenderer = ({ visible, enabled, id, uischema, schema, label, rootSchema, renderers, cells, data, path, errors, uischemas, addItem }) => {
+const MaterialArrayLayoutRenderer = ({ visible, addItem, ...props }) => {
     const addItemCb = useCallback((p, value) => addItem(p, value), [
         addItem
     ]);
     return (React.createElement(Hidden, { xsUp: !visible },
-        React.createElement(MaterialArrayLayout$1, { label: label, uischema: uischema, schema: schema, id: id, rootSchema: rootSchema, errors: errors, enabled: enabled, visible: visible, data: data, path: path, addItem: addItemCb, renderers: renderers, cells: cells, uischemas: uischemas })));
+        React.createElement(MaterialArrayLayout$1, Object.assign({ visible: visible, addItem: addItemCb }, props))));
 };
 const materialArrayLayoutTester = rankWith(4, isObjectArrayWithNesting);
 var MaterialArrayLayout = withJsonFormsArrayLayoutProps(MaterialArrayLayoutRenderer);