@jsonforms/material-renderers 2.5.2 → 3.0.0-alpha.3

package/src/controls/MaterialNativeControl.tsx

@@ -24,77 +24,72 @@
 */
 import React from 'react';
 import {
-  computeLabel,
   ControlProps,
-  ControlState,
+  showAsRequired,
   isDateControl,
   isDescriptionHidden,
-  isPlainLabel,
   isTimeControl,
   or,
   RankedTester,
   rankWith
 } from '@jsonforms/core';
-import { Hidden } from '@material-ui/core';
-import { Control, withJsonFormsControlProps } from '@jsonforms/react';
-import TextField from '@material-ui/core/TextField';
+import { Hidden, TextField } from '@mui/material';
+import { withJsonFormsControlProps } from '@jsonforms/react';
 import merge from 'lodash/merge';
+import { useDebouncedChange, useFocus } from '../util';
 
-export class MaterialNativeControl extends Control<ControlProps, ControlState> {
-  render() {
-    const {
-      id,
-      errors,
-      label,
-      schema,
-      description,
-      enabled,
-      visible,
-      required,
-      path,
-      handleChange,
-      data,
-      config
-    } = this.props;
-    const isValid = errors.length === 0;
-    const appliedUiSchemaOptions = merge(
-      {},
-      config,
-      this.props.uischema.options
-    );
-    const onChange = (ev: any) => handleChange(path, ev.target.value);
-    const fieldType = schema.format;
-    const showDescription = !isDescriptionHidden(
-      visible,
-      description,
-      this.state.isFocused,
-      appliedUiSchemaOptions.showUnfocusedDescription
-    );
+export const MaterialNativeControl = (props: ControlProps) => {
+  const [focused, onFocus, onBlur] = useFocus();
+  const {
+    id,
+    errors,
+    label,
+    schema,
+    description,
+    enabled,
+    visible,
+    required,
+    path,
+    handleChange,
+    data,
+    config
+  } = props;
+  const isValid = errors.length === 0;
+  const appliedUiSchemaOptions = merge(
+    {},
+    config,
+    props.uischema.options
+  );
+  const [inputValue, onChange] = useDebouncedChange(handleChange, '', data, path);
+  const fieldType = appliedUiSchemaOptions.format ?? schema.format;
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
 
-    return (
-      <Hidden xsUp={!visible}>
-        <TextField
-          id={id + '-input'}
-          label={computeLabel(
-            isPlainLabel(label) ? label : label.default,
-            required,
-            appliedUiSchemaOptions.hideRequiredAsterisk
-          )}
-          type={fieldType}
-          error={!isValid}
-          disabled={!enabled}
-          fullWidth={!appliedUiSchemaOptions.trim}
-          onFocus={this.onFocus}
-          onBlur={this.onBlur}
-          helperText={!isValid ? errors : showDescription ? description : null}
-          InputLabelProps={{ shrink: true }}
-          value={data}
-          onChange={onChange}
-        />
-      </Hidden>
-    );
-  }
-}
+  return (
+    <Hidden xsUp={!visible}>
+      <TextField
+        required={showAsRequired(required,
+          appliedUiSchemaOptions.hideRequiredAsterisk)}
+        id={id + '-input'}
+        label={label}
+        type={fieldType}
+        error={!isValid}
+        disabled={!enabled}
+        fullWidth={!appliedUiSchemaOptions.trim}
+        onFocus={onFocus}
+        onBlur={onBlur}
+        helperText={!isValid ? errors : showDescription ? description : null}
+        InputLabelProps={{ shrink: true }}
+        value={inputValue}
+        onChange={onChange}
+      />
+    </Hidden>
+  );
+};
 
 export const materialNativeControlTester: RankedTester = rankWith(
   2,

package/src/controls/MaterialOneOfEnumControl.tsx

@@ -35,7 +35,7 @@ import { MuiSelect } from '../mui-controls/MuiSelect';
 import { MaterialInputControl } from './MaterialInputControl';
 
 export const MaterialOneOfEnumControl = (props: ControlProps & OwnPropsOfEnum) => (
-    <MaterialInputControl {...props} input={MuiSelect} />
+  <MaterialInputControl {...props} input={MuiSelect} />
 );
 
 export const materialOneOfEnumControlTester: RankedTester = rankWith(

package/src/controls/MaterialOneOfRadioGroupControl.tsx

@@ -36,12 +36,12 @@ import { withJsonFormsOneOfEnumProps } from '@jsonforms/react';
 import { MaterialRadioGroup } from './MaterialRadioGroup';
 
 export const MaterialOneOfRadioGroupControl = (props: ControlProps & OwnPropsOfEnum) => {
-   return <MaterialRadioGroup {...props}/>;
+  return <MaterialRadioGroup {...props}/>;
 };
 
 export const materialOneOfRadioGroupControlTester: RankedTester = rankWith(
-    20,
-    and(isOneOfEnumControl, optionIs('format', 'radio'))
-  );
+  20,
+  and(isOneOfEnumControl, optionIs('format', 'radio'))
+);
 
 export default withJsonFormsOneOfEnumProps(MaterialOneOfRadioGroupControl);

package/src/controls/MaterialRadioGroup.tsx

@@ -25,90 +25,89 @@
 import merge from 'lodash/merge';
 import React from 'react';
 import {
-  computeLabel,
   ControlProps,
-  ControlState,
+  showAsRequired,
   isDescriptionHidden,
-  isPlainLabel,
   OwnPropsOfEnum
 } from '@jsonforms/core';
-import { Control } from '@jsonforms/react';
-import Radio from '@material-ui/core/Radio';
-import RadioGroup from '@material-ui/core/RadioGroup';
 import {
   FormControl,
   FormControlLabel,
   FormHelperText,
   FormLabel,
-  Hidden
-} from '@material-ui/core';
+  Hidden,
+  Radio,
+  RadioGroup
+} from '@mui/material';
+import { useFocus } from '../util';
 
-export class MaterialRadioGroup extends Control<
-  ControlProps & OwnPropsOfEnum,
-  ControlState
-> {
-  render() {
-    const {
-      config,
-      id,
-      label,
-      required,
-      description,
-      errors,
-      data,
-      visible,
-      options
-    } = this.props;
-    const isValid = errors.length === 0;
-    const appliedUiSchemaOptions = merge(
-      {},
-      config,
-      this.props.uischema.options
-    );
-    const showDescription = !isDescriptionHidden(
-      visible,
-      description,
-      this.state.isFocused,
-      appliedUiSchemaOptions.showUnfocusedDescription
-    );
+export const MaterialRadioGroup = (props: ControlProps & OwnPropsOfEnum) => {
+  const [focused, onFocus, onBlur] = useFocus();
+  const {
+    config,
+    id,
+    label,
+    required,
+    description,
+    errors,
+    data,
+    visible,
+    options,
+    handleChange,
+    path,
+    enabled
+  } = props;
+  const isValid = errors.length === 0;
+  const appliedUiSchemaOptions = merge(
+    {},
+    config,
+    props.uischema.options
+  );
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
+  const onChange = (_ev:any, value:any) => handleChange(path, value);
 
-    return (
-      <Hidden xsUp={!visible}>
-        <FormControl
-          component={'fieldset' as 'div'}
-          fullWidth={!appliedUiSchemaOptions.trim}
+  return (
+    <Hidden xsUp={!visible}>
+      <FormControl
+        component={'fieldset' as 'div'}
+        fullWidth={!appliedUiSchemaOptions.trim}
+        onFocus={onFocus}
+        onBlur={onBlur}
+      >
+        <FormLabel
+          htmlFor={id}
+          error={!isValid}
+          component={'legend' as 'label'}
+          required={showAsRequired(required,
+            appliedUiSchemaOptions.hideRequiredAsterisk)}
         >
-          <FormLabel
-            htmlFor={id}
-            error={!isValid}
-            component={'legend' as 'label'}
-          >
-            {computeLabel(
-              isPlainLabel(label) ? label : label.default,
-              required,
-              appliedUiSchemaOptions.hideRequiredAsterisk
-            )}
-          </FormLabel>
+          {label}
+        </FormLabel>
 
-          <RadioGroup
-            value={this.state.value}
-            onChange={(_ev, value) => this.handleChange(value)}
-            row={true}
-          >
-            {options.map(option => (
-              <FormControlLabel
-                value={option.value}
-                key={option.label}
-                control={<Radio checked={data === option.value} />}
-                label={option.label}
-              />
-            ))}
-          </RadioGroup>
-          <FormHelperText error={!isValid}>
-            {!isValid ? errors : showDescription ? description : null}
-          </FormHelperText>
-        </FormControl>
-      </Hidden>
-    );
-  }
-}
+        <RadioGroup
+          value={props.data}
+          onChange={onChange}
+          row={true}
+        >
+          {options.map(option => (
+            <FormControlLabel
+              value={option.value}
+              key={option.label}
+              control={<Radio checked={data === option.value} />}
+              label={option.label}
+              disabled={!enabled}
+            />
+          ))}
+        </RadioGroup>
+        <FormHelperText error={!isValid}>
+          {!isValid ? errors : showDescription ? description : null}
+        </FormHelperText>
+      </FormControl>
+    </Hidden>
+  );
+};

package/src/controls/MaterialRadioGroupControl.tsx

@@ -32,7 +32,7 @@ import {
 import {  withJsonFormsEnumProps } from '@jsonforms/react';
 import { MaterialRadioGroup } from './MaterialRadioGroup';
 export const MaterialRadioGroupControl = (props: ControlProps & OwnPropsOfEnum) => {
-   return <MaterialRadioGroup {...props} />;
+  return <MaterialRadioGroup {...props} />;
 };
 
 export const materialRadioGroupControlTester: RankedTester = rankWith(

package/src/controls/MaterialSliderControl.tsx

@@ -22,115 +22,119 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import React from 'react';
+import React, {useCallback} from 'react';
 import {
-  computeLabel,
   ControlProps,
-  ControlState,
+  showAsRequired,
   isDescriptionHidden,
-  isPlainLabel,
   isRangeControl,
   RankedTester,
   rankWith
 } from '@jsonforms/core';
-import { Control, withJsonFormsControlProps } from '@jsonforms/react';
+import { withJsonFormsControlProps } from '@jsonforms/react';
 
 import {
   FormControl,
   FormHelperText,
+  FormLabel,
   Hidden,
   Slider,
   Typography
-} from '@material-ui/core';
+} from '@mui/material';
 import merge from 'lodash/merge';
+import { useFocus } from '../util';
 
-export class MaterialSliderControl extends Control<ControlProps, ControlState> {
-  render() {
-    const {
-      id,
-      data,
-      description,
-      enabled,
-      errors,
-      label,
-      schema,
-      handleChange,
-      visible,
-      path,
-      required,
-      config
-    } = this.props;
-    const isValid = errors.length === 0;
-    const appliedUiSchemaOptions = merge(
-      {},
-      config,
-      this.props.uischema.options
-    );
-    const labelStyle: { [x: string]: any } = {
-      whiteSpace: 'nowrap',
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      width: '100%'
-    };
-    const rangeContainerStyle: { [x: string]: any } = {
-      display: 'flex'
-    };
-    const rangeItemStyle: { [x: string]: any } = {
-      flexGrow: '1'
-    };
-    const sliderStyle: { [x: string]: any } = {
-      marginTop: '7px'
-    };
+export const MaterialSliderControl = (props: ControlProps) => {
+  const [focused, onFocus, onBlur] = useFocus();
+  const {
+    id,
+    data,
+    description,
+    enabled,
+    errors,
+    label,
+    schema,
+    handleChange,
+    visible,
+    path,
+    required,
+    config
+  } = props;
+  const isValid = errors.length === 0;
+  const appliedUiSchemaOptions = merge(
+    {},
+    config,
+    props.uischema.options
+  );
+  const labelStyle: { [x: string]: any } = {
+    whiteSpace: 'nowrap',
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    width: '100%'
+  };
+  const rangeContainerStyle: { [x: string]: any } = {
+    display: 'flex'
+  };
+  const rangeItemStyle: { [x: string]: any } = {
+    flexGrow: '1'
+  };
+  const sliderStyle: { [x: string]: any } = {
+    marginTop: '7px'
+  };
 
-    const showDescription = !isDescriptionHidden(
-      visible,
-      description,
-      this.state.isFocused,
-      appliedUiSchemaOptions.showUnfocusedDescription
-    );
-    return (
-      <Hidden xsUp={!visible}>
-        <FormControl
-          fullWidth={!appliedUiSchemaOptions.trim}
-          onFocus={this.onFocus}
-          onBlur={this.onBlur}
-          id={id}
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
+
+  const onChange = useCallback((_ev: any, value: any) => handleChange(path, Number(value)), [path, handleChange]);
+
+  return (
+    <Hidden xsUp={!visible}>
+      <FormControl
+        fullWidth={!appliedUiSchemaOptions.trim}
+        onFocus={onFocus}
+        onBlur={onBlur}
+        id={id}
+      >
+        <FormLabel
+          htmlFor={id}
+          error={!isValid}
+          component={'legend' as 'label'}
+          required={showAsRequired(required,
+            appliedUiSchemaOptions.hideRequiredAsterisk)}
         >
           <Typography id={id + '-typo'} style={labelStyle} variant='caption'>
-            {computeLabel(
-              isPlainLabel(label) ? label : label.default,
-              required,
-              appliedUiSchemaOptions.hideRequiredAsterisk
-            )}
+            {label}
+          </Typography>
+        </FormLabel>
+        <div style={rangeContainerStyle}>
+          <Typography style={rangeItemStyle} variant='caption' align='left'>
+            {schema.minimum}
+          </Typography>
+          <Typography style={rangeItemStyle} variant='caption' align='right'>
+            {schema.maximum}
           </Typography>
-          <div style={rangeContainerStyle}>
-            <Typography style={rangeItemStyle} variant='caption' align='left'>
-              {schema.minimum}
-            </Typography>
-            <Typography style={rangeItemStyle} variant='caption' align='right'>
-              {schema.maximum}
-            </Typography>
-          </div>
-          <Slider
-            style={sliderStyle}
-            min={schema.minimum}
-            max={schema.maximum}
-            value={Number(data || schema.default)}
-            onChange={(_ev: any, value: any) => {
-              handleChange(path, Number(value));
-            }}
-            id={id + '-input'}
-            disabled={!enabled}
-            step={schema.multipleOf || 1}
-          />
-          <FormHelperText error={!isValid}>
-            {!isValid ? errors : showDescription ? description : null}
-          </FormHelperText>
-        </FormControl>
-      </Hidden>
-    );
-  }
-}
+        </div>
+        <Slider
+          style={sliderStyle}
+          min={schema.minimum}
+          max={schema.maximum}
+          value={Number(data || schema.default)}
+          onChange={onChange}
+          id={id + '-input'}
+          disabled={!enabled}
+          step={schema.multipleOf || 1}
+        />
+        <FormHelperText error={!isValid}>
+          {!isValid ? errors : showDescription ? description : null}
+        </FormHelperText>
+      </FormControl>
+    </Hidden>
+  );
+};
 export const materialSliderControlTester: RankedTester = rankWith(
   4,
   isRangeControl

package/src/controls/MaterialTimeControl.tsx

@@ -0,0 +1,133 @@
+/*
+  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, { useMemo } from 'react';
+import merge from 'lodash/merge';
+import {
+  ControlProps,
+  isTimeControl,
+  isDescriptionHidden,
+  RankedTester,
+  rankWith
+} from '@jsonforms/core';
+import { withJsonFormsControlProps } from '@jsonforms/react';
+import { FormHelperText, Hidden, TextField } from '@mui/material';
+import {
+  TimePicker,
+  LocalizationProvider 
+} from '@mui/lab';
+import AdapterDayjs from '@mui/lab/AdapterDayjs';
+import { createOnChangeHandler, getData, useFocus } from '../util';
+
+export const MaterialTimeControl = (props: ControlProps) => {
+  const [focused, onFocus, onBlur] = useFocus();
+    const {
+    id,
+    description,
+    errors,
+    label,
+    uischema,
+    visible,
+    enabled,
+    required,
+    path,
+    handleChange,
+    data,
+    config
+  } = props;
+  const appliedUiSchemaOptions = merge({}, config, uischema.options);
+  const isValid = errors.length === 0;
+
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
+
+  const format = appliedUiSchemaOptions.timeFormat ?? 'HH:mm';
+    const saveFormat = appliedUiSchemaOptions.timeSaveFormat ?? 'HH:mm:ss';
+
+  const firstFormHelperText = showDescription
+    ? description
+    : !isValid
+    ? errors
+    : null;
+  const secondFormHelperText = showDescription && !isValid ? errors : null;
+
+  const onChange = useMemo(() => createOnChangeHandler(
+    path,
+    handleChange,
+    saveFormat
+  ),[path, handleChange, saveFormat]);
+
+  return (
+    <Hidden xsUp={!visible}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
+        <TimePicker
+          label={label}
+          value={getData(data, saveFormat)}
+          clearable
+          onChange={onChange}
+          inputFormat={format}
+          disableMaskedInput
+          ampm={!!appliedUiSchemaOptions.ampm}
+          views={appliedUiSchemaOptions.views}
+          disabled={!enabled}
+          cancelText={appliedUiSchemaOptions.cancelLabel}
+          clearText={appliedUiSchemaOptions.clearLabel}
+          okText={appliedUiSchemaOptions.okLabel}
+          renderInput={params => (
+            <TextField 
+              {...params}
+              id={id + '-input'}
+              required={required && !appliedUiSchemaOptions.hideRequiredAsterisk}
+              autoFocus={appliedUiSchemaOptions.focus}
+              error={!isValid}
+              fullWidth={!appliedUiSchemaOptions.trim}
+              inputProps={{ ...params.inputProps, type: 'text' }}
+              InputLabelProps={data ? { shrink: true } : undefined}
+              onFocus={onFocus}
+              onBlur={onBlur}
+              variant={'standard'}
+            />
+          )}
+        />
+        <FormHelperText error={!isValid && !showDescription}>
+          {firstFormHelperText}
+        </FormHelperText>
+        <FormHelperText error={!isValid}>
+          {secondFormHelperText}
+        </FormHelperText>
+      </LocalizationProvider>
+    </Hidden>
+  );
+};
+
+export const materialTimeControlTester: RankedTester = rankWith(
+  4,
+  isTimeControl
+);
+
+export default withJsonFormsControlProps(MaterialTimeControl);