@jsonforms/material-renderers 2.5.2-alpha.0 → 3.0.0-alpha.2

package/lib/util/debounce.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useDebouncedChange = void 0;
+/*
+  The MIT License
+  
+  Copyright (c) 2021 EclipseSource Munich
+  https://github.com/eclipsesource/jsonforms
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+var lodash_1 = require("lodash");
+var react_1 = require("react");
+var eventToValue = function (ev) { return ev.target.value; };
+var useDebouncedChange = function (handleChange, defaultValue, data, path, eventToValueFunction, timeout) {
+    if (eventToValueFunction === void 0) { eventToValueFunction = eventToValue; }
+    if (timeout === void 0) { timeout = 300; }
+    var _a = react_1.useState(data !== null && data !== void 0 ? data : defaultValue), input = _a[0], setInput = _a[1];
+    react_1.useEffect(function () {
+        setInput(data !== null && data !== void 0 ? data : defaultValue);
+    }, [data]);
+    var debouncedUpdate = react_1.useCallback(lodash_1.debounce(function (newValue) { return handleChange(path, newValue); }, timeout), [handleChange, path, timeout]);
+    var onChange = react_1.useCallback(function (ev) {
+        var newValue = eventToValueFunction(ev);
+        setInput(newValue !== null && newValue !== void 0 ? newValue : defaultValue);
+        debouncedUpdate(newValue);
+    }, [debouncedUpdate, eventToValueFunction]);
+    var onClear = react_1.useCallback(function () { setInput(defaultValue); handleChange(path, undefined); }, [defaultValue, handleChange, path]);
+    return [input, onChange, onClear];
+};
+exports.useDebouncedChange = useDebouncedChange;
+//# sourceMappingURL=debounce.js.map

package/lib/util/debounce.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"debounce.js","sourceRoot":"","sources":["../../src/util/debounce.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,iCAAkC;AAClC,+BAAwD;AAGxD,IAAM,YAAY,GAAG,UAAC,EAAO,IAAK,OAAA,EAAE,CAAC,MAAM,CAAC,KAAK,EAAf,CAAe,CAAC;AAC3C,IAAM,kBAAkB,GAAG,UAAC,YAAgD,EAAE,YAAiB,EAAE,IAAS,EAAE,IAAY,EAAE,oBAAqD,EAAE,OAAa;IAApE,qCAAA,EAAA,mCAAqD;IAAE,wBAAA,EAAA,aAAa;IAC7L,IAAA,KAAoB,gBAAQ,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,YAAY,CAAC,EAAjD,KAAK,QAAA,EAAE,QAAQ,QAAkC,CAAC;IACzD,iBAAS,CAAC;QACR,QAAQ,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,YAAY,CAAC,CAAC;IACjC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACX,IAAM,eAAe,GAAG,mBAAW,CAAC,iBAAQ,CAAC,UAAC,QAAgB,IAAK,OAAA,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,EAA5B,CAA4B,EAAE,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;IAC1I,IAAM,QAAQ,GAAG,mBAAW,CAAC,UAAC,EAAO;QACnC,IAAM,QAAQ,GAAG,oBAAoB,CAAC,EAAE,CAAC,CAAC;QAC1C,QAAQ,CAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,YAAY,CAAC,CAAC;QACnC,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC5B,CAAC,EAAE,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAC5C,IAAM,OAAO,GAAG,mBAAW,CAAC,cAAQ,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IACjI,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;AACpC,CAAC,CAAC;AAbW,QAAA,kBAAkB,sBAa7B"}

package/lib/util/focus.d.ts

@@ -0,0 +1 @@
+export declare const useFocus: () => [boolean, () => void, () => void];

package/lib/util/focus.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useFocus = void 0;
+/*
+  The MIT License
+  
+  Copyright (c) 2021 EclipseSource Munich
+  https://github.com/eclipsesource/jsonforms
+  
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+var react_1 = require("react");
+var useFocus = function () {
+    var _a = react_1.useState(false), focused = _a[0], setFocused = _a[1];
+    var onFocus = react_1.useCallback(function () { return setFocused(true); }, []);
+    var onBlur = react_1.useCallback(function () { return setFocused(false); }, []);
+    return [focused, onFocus, onBlur];
+};
+exports.useFocus = useFocus;
+//# sourceMappingURL=focus.js.map

package/lib/util/focus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"focus.js","sourceRoot":"","sources":["../../src/util/focus.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,+BAA4C;AAErC,IAAM,QAAQ,GAAG;IACd,IAAA,KAAwB,gBAAQ,CAAC,KAAK,CAAC,EAAtC,OAAO,QAAA,EAAE,UAAU,QAAmB,CAAC;IAC9C,IAAM,OAAO,GAAG,mBAAW,CAAC,cAAM,OAAA,UAAU,CAAC,IAAI,CAAC,EAAhB,CAAgB,EAAE,EAAE,CAAC,CAAC;IACxD,IAAM,MAAM,GAAG,mBAAW,CAAC,cAAM,OAAA,UAAU,CAAC,KAAK,CAAC,EAAjB,CAAiB,EAAE,EAAE,CAAC,CAAC;IACxD,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACtC,CAAC,CAAC;AALW,QAAA,QAAQ,YAKnB"}

package/lib/util/index.d.ts

@@ -1,2 +1,5 @@
+export * from './datejs';
 export * from './layout';
 export * from './theme';
+export * from './debounce';
+export * from './focus';

package/lib/util/index.js

@@ -25,5 +25,9 @@ var tslib_1 = require("tslib");
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
+tslib_1.__exportStar(require("./datejs"), exports);
 tslib_1.__exportStar(require("./layout"), exports);
+tslib_1.__exportStar(require("./theme"), exports);
+tslib_1.__exportStar(require("./debounce"), exports);
+tslib_1.__exportStar(require("./focus"), exports);
 //# sourceMappingURL=index.js.map

package/lib/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,mDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,mDAAyB;AACzB,mDAAyB;AACzB,kDAAwB;AACxB,qDAA2B;AAC3B,kDAAwB"}

package/lib/util/layout.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import { Ajv } from 'ajv';
+import { ComponentType } from 'react';
+import Ajv from 'ajv';
 import { JsonFormsCellRendererRegistryEntry, JsonFormsRendererRegistryEntry, JsonSchema, OwnPropsOfRenderer, UISchemaElement } from '@jsonforms/core';
 export declare const renderLayoutElements: (elements: UISchemaElement[], schema: JsonSchema, path: string, enabled: boolean, renderers?: JsonFormsRendererRegistryEntry[], cells?: JsonFormsCellRendererRegistryEntry[]) => JSX.Element[];
 export interface MaterialLayoutRendererProps extends OwnPropsOfRenderer {

package/lib/util/layout.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.withAjvProps = exports.MaterialLayoutRenderer = exports.renderLayoutElements = void 0;
 var tslib_1 = require("tslib");
 /*
   The MIT License
@@ -30,11 +31,12 @@ var react_1 = tslib_1.__importDefault(require("react"));
 var core_1 = require("@jsonforms/core");
 var react_2 = require("@jsonforms/react");
 var core_2 = require("@material-ui/core");
-exports.renderLayoutElements = function (elements, schema, path, enabled, renderers, cells) {
+var renderLayoutElements = function (elements, schema, path, enabled, renderers, cells) {
     return elements.map(function (child, index) { return (react_1.default.createElement(core_2.Grid, { item: true, key: path + "-" + index, xs: true },
-        react_1.default.createElement(react_2.ResolvedJsonFormsDispatch, { uischema: child, schema: schema, path: path, enabled: enabled, renderers: renderers, cells: cells }))); });
+        react_1.default.createElement(react_2.JsonFormsDispatch, { uischema: child, schema: schema, path: path, enabled: enabled, renderers: renderers, cells: cells }))); });
 };
-exports.MaterialLayoutRenderer = react_1.default.memo(function (_a) {
+exports.renderLayoutElements = renderLayoutElements;
+var MaterialLayoutRendererComponent = function (_a) {
     var visible = _a.visible, elements = _a.elements, schema = _a.schema, path = _a.path, enabled = _a.enabled, direction = _a.direction, renderers = _a.renderers, cells = _a.cells;
     if (isEmpty_1.default(elements)) {
         return null;
@@ -43,12 +45,14 @@ exports.MaterialLayoutRenderer = react_1.default.memo(function (_a) {
         return (react_1.default.createElement(core_2.Hidden, { xsUp: !visible },
             react_1.default.createElement(core_2.Grid, { container: true, direction: direction, spacing: direction === 'row' ? 2 : 0 }, exports.renderLayoutElements(elements, schema, path, enabled, renderers, cells))));
     }
-}, react_2.areEqual);
-exports.withAjvProps = function (Component) {
+};
+exports.MaterialLayoutRenderer = react_1.default.memo(MaterialLayoutRendererComponent);
+var withAjvProps = function (Component) {
     return function (props) {
         var ctx = react_2.useJsonForms();
         var ajv = core_1.getAjv({ jsonforms: tslib_1.__assign({}, ctx) });
         return (react_1.default.createElement(Component, tslib_1.__assign({}, props, { ajv: ajv })));
     };
 };
+exports.withAjvProps = withAjvProps;
 //# sourceMappingURL=layout.js.map

package/lib/util/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/util/layout.tsx"],"names":[],"mappings":";;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,mEAAqC;AACrC,wDAA0B;AAG1B,wCAOyB;AACzB,0CAAqF;AACrF,0CAAiD;AAEpC,QAAA,oBAAoB,GAAG,UAClC,QAA2B,EAC3B,MAAkB,EAClB,IAAY,EACZ,OAAgB,EAChB,SAA4C,EAC5C,KAA4C;IAE5C,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAC,KAAK,EAAE,KAAK,IAAK,OAAA,CACpC,8BAAC,WAAI,IAAC,IAAI,QAAC,GAAG,EAAK,IAAI,SAAI,KAAO,EAAE,EAAE;QACpC,8BAAC,iCAAyB,IACxB,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,GACZ,CACG,CACR,EAXqC,CAWrC,CAAC,CAAC;AACL,CAAC,CAAC;AAMW,QAAA,sBAAsB,GAAG,eAAK,CAAC,IAAI,CAC9C,UAAC,EAS6B;QAR5B,oBAAO,EACP,sBAAQ,EACR,kBAAM,EACN,cAAI,EACJ,oBAAO,EACP,wBAAS,EACT,wBAAS,EACT,gBAAK;IAEL,IAAI,iBAAO,CAAC,QAAQ,CAAC,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,CACL,8BAAC,aAAM,IAAC,IAAI,EAAE,CAAC,OAAO;YACpB,8BAAC,WAAI,IACH,SAAS,QACT,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAEnC,4BAAoB,CACnB,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,OAAO,EACP,SAAS,EACT,KAAK,CACN,CACI,CACA,CACV,CAAC;KACH;AACH,CAAC,EACD,gBAAQ,CACT,CAAC;AAMW,QAAA,YAAY,GAAG,UAAe,SAAsC;IAC/E,OAAA,UAAC,KAAQ;QACP,IAAM,GAAG,GAAG,oBAAY,EAAE,CAAC;QAC3B,IAAM,GAAG,GAAG,aAAM,CAAC,EAAC,SAAS,uBAAM,GAAG,CAAC,EAAC,CAAC,CAAC;QAE1C,OAAO,CAAC,8BAAC,SAAS,uBAAK,KAAK,IAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;AALD,CAKC,CAAC"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/util/layout.tsx"],"names":[],"mappings":";;;;AAAA;;;;;;;;;;;;;;;;;;;;;;;EAuBE;AACF,mEAAqC;AACrC,wDAA0B;AAG1B,wCAOyB;AACzB,0CAAmE;AACnE,0CAAiD;AAE1C,IAAM,oBAAoB,GAAG,UAClC,QAA2B,EAC3B,MAAkB,EAClB,IAAY,EACZ,OAAgB,EAChB,SAA4C,EAC5C,KAA4C;IAE5C,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAC,KAAK,EAAE,KAAK,IAAK,OAAA,CACpC,8BAAC,WAAI,IAAC,IAAI,QAAC,GAAG,EAAK,IAAI,SAAI,KAAO,EAAE,EAAE;QACpC,8BAAC,yBAAiB,IAChB,QAAQ,EAAE,KAAK,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,SAAS,EACpB,KAAK,EAAE,KAAK,GACZ,CACG,CACR,EAXqC,CAWrC,CAAC,CAAC;AACL,CAAC,CAAC;AApBW,QAAA,oBAAoB,wBAoB/B;AAMF,IAAM,+BAA+B,GACnC,UAAC,EAS6B;QAR5B,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,OAAO,aAAA,EACP,SAAS,eAAA,EACT,SAAS,eAAA,EACT,KAAK,WAAA;IAEL,IAAI,iBAAO,CAAC,QAAQ,CAAC,EAAE;QACrB,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,CACL,8BAAC,aAAM,IAAC,IAAI,EAAE,CAAC,OAAO;YACpB,8BAAC,WAAI,IACH,SAAS,QACT,SAAS,EAAE,SAAS,EACpB,OAAO,EAAE,SAAS,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAEnC,4BAAoB,CACnB,QAAQ,EACR,MAAM,EACN,IAAI,EACJ,OAAO,EACP,SAAS,EACT,KAAK,CACN,CACI,CACA,CACV,CAAC;KACH;AACH,CAAC,CAAC;AACS,QAAA,sBAAsB,GAAG,eAAK,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;AAM3E,IAAM,YAAY,GAAG,UAAe,SAAsC;IAC/E,OAAA,UAAC,KAAQ;QACP,IAAM,GAAG,GAAG,oBAAY,EAAE,CAAC;QAC3B,IAAM,GAAG,GAAG,aAAM,CAAC,EAAC,SAAS,uBAAM,GAAG,CAAC,EAAC,CAAC,CAAC;QAE1C,OAAO,CAAC,8BAAC,SAAS,uBAAK,KAAK,IAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC9C,CAAC;AALD,CAKC,CAAC;AANS,QAAA,YAAY,gBAMrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/material-renderers",
-  "version": "2.5.2-alpha.0",
+  "version": "3.0.0-alpha.2",
   "description": "Material Renderer Set for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -65,27 +65,26 @@
     ]
   },
   "dependencies": {
-    "@date-io/moment": "1.3.11",
-    "@material-ui/pickers": "^3.2.8",
-    "@types/uuid": "^3.4.6",
-    "moment": "^2.24.0",
-    "uuid": "^3.3.3"
+    "@date-io/dayjs": "1.3.13",
+    "dayjs": "1.10.6"
   },
   "peerDependencies": {
-    "@jsonforms/core": "^2.5.2-alpha.0",
-    "@jsonforms/react": "^2.5.2-alpha.0",
+    "@jsonforms/core": "^3.0.0-alpha.0",
+    "@jsonforms/react": "^3.0.0-alpha.0",
     "@material-ui/core": "^4.7.0",
-    "@material-ui/icons": "^4.5.1"
+    "@material-ui/icons": "^4.5.1",
+    "@material-ui/pickers": "^3.3.10"
   },
   "optionalPeerDependencies": {
     "@material-ui/lab": "^4.0.0-alpha.56"
   },
   "devDependencies": {
-    "@jsonforms/core": "^2.5.2-alpha.0",
-    "@jsonforms/react": "^2.5.2-alpha.0",
+    "@jsonforms/core": "^3.0.0-alpha.2",
+    "@jsonforms/react": "^3.0.0-alpha.2",
     "@material-ui/core": "^4.7.0",
     "@material-ui/icons": "^4.5.1",
     "@material-ui/lab": "^4.0.0-alpha.56",
+    "@material-ui/pickers": "^3.2.8",
     "@types/enzyme": "^3.10.3",
     "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/react-dom": "^16.8.0",
@@ -102,10 +101,10 @@
     "tslint": "^5.20.1",
     "tslint-loader": "^3.5.4",
     "typedoc": "^0.19.2",
-    "typescript": "3.8.3",
+    "typescript": "4.2.3",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.2.1",
     "webpack-dev-server": "^3.9.0"
   },
-  "gitHead": "139a598636f0d23b99c2f872d08ed4c1b094a320"
+  "gitHead": "7532a3e16558d9f0934bd5c602ccbe3a35ed9dab"
 }

package/src/additional/MaterialListWithDetailRenderer.tsx

@@ -30,13 +30,12 @@ import {
   createDefaultValue,
   findUISchema,
   isObjectArray,
-  isPlainLabel,
   RankedTester,
   rankWith,
   uiTypeIs
 } from '@jsonforms/core';
 import {
-  ResolvedJsonFormsDispatch,
+  JsonFormsDispatch,
   withJsonFormsArrayLayoutProps
 } from '@jsonforms/react';
 import { Grid, Hidden, List, Typography } from '@material-ui/core';
@@ -101,7 +100,7 @@ export const MaterialListWithDetailRenderer = ({
     <Hidden xsUp={!visible}>
       <ArrayLayoutToolbar
         label={computeLabel(
-          isPlainLabel(label) ? label : label.default,
+          label,
           required,
           appliedUiSchemaOptions.hideRequiredAsterisk
         )}
@@ -132,7 +131,7 @@ export const MaterialListWithDetailRenderer = ({
         </Grid>
         <Grid item xs>
           {selectedIndex !== undefined ? (
-            <ResolvedJsonFormsDispatch
+            <JsonFormsDispatch
               renderers={renderers}
               cells={cells}
               visible={visible}

package/src/cells/CustomizableCells.ts

@@ -28,5 +28,6 @@ export { MaterialEnumCell } from './MaterialEnumCell';
 export { MaterialIntegerCell } from './MaterialIntegerCell';
 export { MaterialNumberCell } from './MaterialNumberCell';
 export { MaterialNumberFormatCell } from './MaterialNumberFormatCell';
+export { MaterialOneOfEnumCell } from './MaterialOneOfEnumCell';
 export { MaterialTextCell } from './MaterialTextCell';
 export { MaterialTimeCell } from './MaterialTimeCell';

package/src/cells/MaterialOneOfEnumCell.tsx

@@ -0,0 +1,46 @@
+/*
+  The MIT License
+
+  Copyright (c) 2017-2019 EclipseSource Munich
+  https://github.com/eclipsesource/jsonforms
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+import React from 'react';
+import {
+  EnumCellProps,
+  isOneOfEnumControl,
+  RankedTester,
+  rankWith,
+  WithClassname
+} from '@jsonforms/core';
+import { withJsonFormsOneOfEnumCellProps } from '@jsonforms/react';
+import { MuiSelect } from '../mui-controls/MuiSelect';
+
+export const MaterialOneOfEnumCell = (props: EnumCellProps & WithClassname) => (
+  <MuiSelect {...props} />
+);
+
+/**
+ * Default tester for oneOf enum controls.
+ * @type {RankedTester}
+ */
+export const materialOneOfEnumCellTester: RankedTester = rankWith(2, isOneOfEnumControl);
+
+export default withJsonFormsOneOfEnumCellProps(MaterialOneOfEnumCell);

package/src/cells/MaterialTimeCell.tsx

@@ -37,4 +37,5 @@ export const MaterialTimeCell = (props: CellProps & WithClassname) => (
   <MuiInputTime {...props} />
 );
 export const materialTimeCellTester: RankedTester = rankWith(2, isTimeControl);
+
 export default withJsonFormsCellProps(MaterialTimeCell);

package/src/cells/index.ts

@@ -39,6 +39,9 @@ import MaterialNumberCell, {
 import MaterialNumberFormatCell, {
   materialNumberFormatCellTester
 } from './MaterialNumberFormatCell';
+import MaterialOneOfEnumCell, {
+  materialOneOfEnumCellTester
+} from './MaterialOneOfEnumCell';
 import MaterialTextCell, { materialTextCellTester } from './MaterialTextCell';
 import MaterialTimeCell, { materialTimeCellTester } from './MaterialTimeCell';
 
@@ -57,6 +60,8 @@ export {
   materialNumberCellTester,
   MaterialNumberFormatCell,
   materialNumberFormatCellTester,
+  MaterialOneOfEnumCell,
+  materialOneOfEnumCellTester,
   MaterialTextCell,
   materialTextCellTester,
   MaterialTimeCell,

package/src/complex/CombinatorProperties.tsx

@@ -25,7 +25,7 @@
 import React from 'react';
 import _ from 'lodash';
 import { Generate, JsonSchema, Layout, UISchemaElement } from '@jsonforms/core';
-import { ResolvedJsonFormsDispatch } from '@jsonforms/react';
+import { JsonFormsDispatch } from '@jsonforms/react';
 
 interface CombinatorPropertiesProps {
   schema: JsonSchema;
@@ -51,7 +51,7 @@ export class CombinatorProperties extends React.Component<CombinatorPropertiesPr
 
     if (isLayoutWithElements) {
       return (
-        <ResolvedJsonFormsDispatch
+        <JsonFormsDispatch
           schema={otherProps}
           path={path}
           uischema={foundUISchema}

package/src/complex/MaterialAllOfRenderer.tsx

@@ -35,9 +35,9 @@ import {
   resolveSubSchemas,
   StatePropsOfCombinator
 } from '@jsonforms/core';
-import { ResolvedJsonFormsDispatch, withJsonFormsAllOfProps } from '@jsonforms/react';
+import { JsonFormsDispatch, withJsonFormsAllOfProps } from '@jsonforms/react';
 
-const MaterialAllOfRenderer = ({
+export const MaterialAllOfRenderer = ({
   schema,
   rootSchema,
   visible,
@@ -56,7 +56,7 @@ const MaterialAllOfRenderer = ({
   if (delegateUISchema) {
     return (
       <Hidden xsUp={!visible}>
-        <ResolvedJsonFormsDispatch
+        <JsonFormsDispatch
           schema={_schema}
           uischema={delegateUISchema}
           path={path}
@@ -78,7 +78,7 @@ const MaterialAllOfRenderer = ({
   return (
     <Hidden xsUp={!visible}>
       {allOfRenderInfos.map((allOfRenderInfo, allOfIndex) => (
-        <ResolvedJsonFormsDispatch
+        <JsonFormsDispatch
           key={allOfIndex}
           schema={allOfRenderInfo.schema}
           uischema={allOfRenderInfo.uischema}
@@ -95,4 +95,5 @@ export const materialAllOfControlTester: RankedTester = rankWith(
   3,
   isAllOfControl
 );
+
 export default withJsonFormsAllOfProps(MaterialAllOfRenderer);

package/src/complex/MaterialAnyOfRenderer.tsx

@@ -33,11 +33,11 @@ import {
   resolveSubSchemas,
   StatePropsOfCombinator
 } from '@jsonforms/core';
-import { ResolvedJsonFormsDispatch, withJsonFormsAnyOfProps } from '@jsonforms/react';
+import { JsonFormsDispatch, withJsonFormsAnyOfProps } from '@jsonforms/react';
 import { Hidden, Tab, Tabs } from '@material-ui/core';
 import CombinatorProperties from './CombinatorProperties';
 
-const MaterialAnyOfRenderer = ({
+export const MaterialAnyOfRenderer = ({
   schema,
   rootSchema,
   indexOfFittingSchema,
@@ -79,7 +79,7 @@ const MaterialAnyOfRenderer = ({
       {anyOfRenderInfos.map(
         (anyOfRenderInfo, anyOfIndex) =>
           selectedAnyOf === anyOfIndex && (
-            <ResolvedJsonFormsDispatch
+            <JsonFormsDispatch
               key={anyOfIndex}
               schema={anyOfRenderInfo.schema}
               uischema={anyOfRenderInfo.uischema}
@@ -97,4 +97,5 @@ export const materialAnyOfControlTester: RankedTester = rankWith(
   3,
   isAnyOfControl
 );
+
 export default withJsonFormsAnyOfProps(MaterialAnyOfRenderer);

package/src/complex/MaterialEnumArrayRenderer.tsx

@@ -35,6 +35,7 @@ export const MaterialEnumArrayRenderer = ({
   data,
   addItem,
   removeItem,
+  handleChange,
   ...otherProps
 }: ControlProps & OwnPropsOfEnum & DispatchPropsOfMultiEnumControl) => {
   return (

package/src/complex/MaterialObjectRenderer.tsx

@@ -27,16 +27,15 @@ import {
   findUISchema,
   GroupLayout,
   isObjectControl,
-  isPlainLabel,
   RankedTester,
   rankWith,
   StatePropsOfControlWithDetail
 } from '@jsonforms/core';
-import { ResolvedJsonFormsDispatch, withJsonFormsDetailProps } from '@jsonforms/react';
+import { JsonFormsDispatch, withJsonFormsDetailProps } from '@jsonforms/react';
 import { Hidden } from '@material-ui/core';
 import React, { useMemo } from 'react';
 
-const MaterialObjectRenderer = ({
+export const MaterialObjectRenderer = ({
   renderers,
   cells,
   uischemas,
@@ -64,11 +63,11 @@ const MaterialObjectRenderer = ({
   if (isEmpty(path)) {
     detailUiSchema.type = 'VerticalLayout';
   } else {
-    (detailUiSchema as GroupLayout).label = isPlainLabel(label) ? label : label.default;
+    (detailUiSchema as GroupLayout).label = label;
   }
   return (
     <Hidden xsUp={!visible}>
-      <ResolvedJsonFormsDispatch
+      <JsonFormsDispatch
         visible={visible}
         enabled={enabled}
         schema={schema}
@@ -85,4 +84,5 @@ export const materialObjectControlTester: RankedTester = rankWith(
   2,
   isObjectControl
 );
+
 export default withJsonFormsDetailProps(MaterialObjectRenderer);

package/src/complex/MaterialOneOfRenderer.tsx

@@ -26,7 +26,7 @@ import React, { useCallback, useState } from 'react';
 import isEmpty from 'lodash/isEmpty';
 
 import {
-  CombinatorProps,
+  CombinatorRendererProps,
   createCombinatorRenderInfos,
   createDefaultValue,
   isOneOfControl,
@@ -48,7 +48,7 @@ import {
   Tabs
 } from '@material-ui/core';
 import {
-  ResolvedJsonFormsDispatch,
+  JsonFormsDispatch,
   withJsonFormsOneOfProps
 } from '@jsonforms/react';
 import CombinatorProperties from './CombinatorProperties';
@@ -57,9 +57,8 @@ export interface OwnOneOfProps extends OwnPropsOfControl {
   indexOfFittingSchema?: number;
 }
 
-const oneOf = 'oneOf';
-const MaterialOneOfRenderer =
-  ({ handleChange, schema, path, renderers, cells, rootSchema, id, visible, indexOfFittingSchema, uischema, uischemas, data }: CombinatorProps) => {
+export const MaterialOneOfRenderer =
+  ({ handleChange, schema, path, renderers, cells, rootSchema, id, visible, indexOfFittingSchema, uischema, uischemas, data }: CombinatorRendererProps) => {
     const [open, setOpen] = useState(false);
     const [selectedIndex, setSelectedIndex] = useState(indexOfFittingSchema || 0);
     const [newSelectedIndex, setNewSelectedIndex] = useState(0);
@@ -67,11 +66,11 @@ const MaterialOneOfRenderer =
     const cancel = useCallback(() => {
       setOpen(false);
     }, [setOpen]);
-    const _schema = resolveSubSchemas(schema, rootSchema, oneOf);
+    const _schema = resolveSubSchemas(schema, rootSchema, 'oneOf');
     const oneOfRenderInfos = createCombinatorRenderInfos(
       (_schema as JsonSchema).oneOf,
       rootSchema,
-      oneOf,
+      'oneOf',
       uischema,
       path,
       uischemas
@@ -112,7 +111,7 @@ const MaterialOneOfRenderer =
         {
           oneOfRenderInfos.map((oneOfRenderInfo, oneOfIndex) => (
             selectedIndex === oneOfIndex && (
-              <ResolvedJsonFormsDispatch
+              <JsonFormsDispatch
                 key={oneOfIndex}
                 schema={oneOfRenderInfo.schema}
                 uischema={oneOfRenderInfo.uischema}
@@ -150,4 +149,5 @@ const MaterialOneOfRenderer =
   };
 
 export const materialOneOfControlTester: RankedTester = rankWith(3, isOneOfControl);
+
 export default withJsonFormsOneOfProps(MaterialOneOfRenderer);