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

package/src/controls/MaterialDateControl.tsx

@@ -22,137 +22,105 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import startsWith from 'lodash/startsWith';
 import merge from 'lodash/merge';
-import React from 'react';
+import React, { useMemo } from 'react';
 import {
-  computeLabel,
-  ControlState,
-  DispatchPropsOfControl,
+  ControlProps,
   isDateControl,
   isDescriptionHidden,
-  isPlainLabel,
   RankedTester,
   rankWith,
-  StatePropsOfControl
 } from '@jsonforms/core';
-import { Control, withJsonFormsControlProps } from '@jsonforms/react';
-import { Hidden } from '@material-ui/core';
-import KeyboardArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft';
-import KeyboardArrowRightIcon from '@material-ui/icons/KeyboardArrowRight';
-import EventIcon from '@material-ui/icons/Event';
-import moment from 'moment';
-import { Moment } from 'moment';
+import { withJsonFormsControlProps } from '@jsonforms/react';
+import { FormHelperText, Hidden, TextField } from '@mui/material';
 import {
-  KeyboardDatePicker,
-  MuiPickersUtilsProvider
-} from '@material-ui/pickers';
-import MomentUtils from '@date-io/moment';
+  DatePicker,
+  LocalizationProvider 
+} from '@mui/lab';
+import AdapterDayjs from '@mui/lab/AdapterDayjs';
+import { createOnChangeHandler, getData, useFocus } from '../util';
 
-export interface DateControl {
-  momentLocale?: Moment;
-}
+export const MaterialDateControl = (props: ControlProps)=> {
+  const [focused, onFocus, onBlur] = useFocus();
+  const {
+    description,
+    id,
+    errors,
+    label,
+    uischema,
+    visible,
+    enabled,
+    required,
+    path,
+    handleChange,
+    data,
+    config
+  } = props;
+  const isValid = errors.length === 0;
+  const appliedUiSchemaOptions = merge({}, config, uischema.options);
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
 
-// Workaround typing problems in @material-ui/pickers@3.2.3
-const AnyPropsKeyboardDatePicker: React.FunctionComponent<
-  any
-> = KeyboardDatePicker;
+  const format = appliedUiSchemaOptions.dateFormat ?? 'YYYY-MM-DD';
+  const saveFormat = appliedUiSchemaOptions.dateSaveFormat ?? 'YYYY-MM-DD';
 
-export class MaterialDateControl extends Control<
-  StatePropsOfDateControl & DispatchPropsOfControl & DateControl,
-  ControlState
-> {
-  render() {
-    const {
-      description,
-      id,
-      errors,
-      label,
-      uischema,
-      visible,
-      enabled,
-      required,
-      path,
-      handleChange,
-      data,
-      momentLocale,
-      config
-    } = this.props;
-    const defaultLabel = label as string;
-    const cancelLabel = '%cancel';
-    const clearLabel = '%clear';
-    const isValid = errors.length === 0;
-    const appliedUiSchemaOptions = merge({}, config, uischema.options);
-    const showDescription = !isDescriptionHidden(
-      visible,
-      description,
-      this.state.isFocused,
-      appliedUiSchemaOptions.showUnfocusedDescription
-    );
-    const inputProps = {};
-    const localeDateTimeFormat = momentLocale
-      ? `${momentLocale.localeData().longDateFormat('L')}`
-      : 'YYYY-MM-DD';
+  const firstFormHelperText = showDescription
+    ? description
+    : !isValid
+    ? errors
+    : null;
+  const secondFormHelperText = showDescription && !isValid ? errors : null;
+  const onChange = useMemo(() => createOnChangeHandler(
+    path,
+    handleChange,
+    saveFormat
+  ),[path, handleChange, saveFormat]);
 
-    let labelText;
-    let labelCancel;
-    let labelClear;
-
-    if (isPlainLabel(label)) {
-      labelText = label;
-      labelCancel = 'Cancel';
-      labelClear = 'Clear';
-    } else {
-      labelText = defaultLabel;
-      labelCancel = startsWith(cancelLabel, '%') ? 'Cancel' : cancelLabel;
-      labelClear = startsWith(clearLabel, '%') ? 'Clear' : clearLabel;
-    }
-
-    return (
-      <Hidden xsUp={!visible}>
-        <MuiPickersUtilsProvider utils={MomentUtils}>
-          <AnyPropsKeyboardDatePicker
-            id={id + '-input'}
-            label={computeLabel(
-              labelText,
-              required,
-              appliedUiSchemaOptions.hideRequiredAsterisk
-            )}
-            error={!isValid}
-            fullWidth={!appliedUiSchemaOptions.trim}
-            helperText={!isValid ? errors : showDescription ? description : ' '}
-            InputLabelProps={{ shrink: true }}
-            value={data || null}
-            onChange={(datetime: any) =>
-              handleChange(
-                path,
-                datetime ? moment(datetime).format('YYYY-MM-DD') : ''
-              )
-            }
-            format={localeDateTimeFormat}
-            clearable={true}
-            disabled={!enabled}
-            autoFocus={appliedUiSchemaOptions.focus}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            cancelLabel={labelCancel}
-            clearLabel={labelClear}
-            leftArrowIcon={<KeyboardArrowLeftIcon />}
-            rightArrowIcon={<KeyboardArrowRightIcon />}
-            keyboardIcon={<EventIcon />}
-            InputProps={inputProps}
-          />
-        </MuiPickersUtilsProvider>
-      </Hidden>
-    );
-  }
-}
-
-export interface StatePropsOfDateControl extends StatePropsOfControl {
-  defaultLabel: string;
-  cancelLabel: string;
-  clearLabel: string;
-}
+  return (
+    <Hidden xsUp={!visible}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
+        <DatePicker
+          label={label}
+          value={getData(data, saveFormat)}
+          clearable
+          onChange={onChange}
+          inputFormat={format}
+          disableMaskedInput
+          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 materialDateControlTester: RankedTester = rankWith(
   4,

package/src/controls/MaterialDateTimeControl.tsx

@@ -22,95 +22,108 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import React from 'react';
+import React, { useMemo } from 'react';
 import merge from 'lodash/merge';
 import {
-  computeLabel,
   ControlProps,
-  ControlState,
   isDateTimeControl,
-  isPlainLabel,
+  isDescriptionHidden,
   RankedTester,
   rankWith
 } from '@jsonforms/core';
-import { Control, withJsonFormsControlProps } from '@jsonforms/react';
-import moment from 'moment';
-import { Hidden } from '@material-ui/core';
-import KeyboardArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft';
-import KeyboardArrowRightIcon from '@material-ui/icons/KeyboardArrowRight';
-import DateRangeIcon from '@material-ui/icons/DateRange';
-import EventIcon from '@material-ui/icons/Event';
-import AccessTimeIcon from '@material-ui/icons/AccessTime';
+import { withJsonFormsControlProps } from '@jsonforms/react';
+import { FormHelperText, Hidden, TextField } from '@mui/material';
 import {
-  KeyboardDateTimePicker,
-  MuiPickersUtilsProvider
-} from '@material-ui/pickers';
-import MomentUtils from '@date-io/moment';
+  DateTimePicker,
+  LocalizationProvider 
+} from '@mui/lab';
+import AdapterDayjs from '@mui/lab/AdapterDayjs';
+import { createOnChangeHandler, getData, useFocus } from '../util';
 
-// Workaround typing problems in @material-ui/pickers@3.2.3
-const AnyPropsKeyboardDateTimepicker: React.FunctionComponent<
-  any
-> = KeyboardDateTimePicker;
+export const MaterialDateTimeControl = (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;
 
-export class MaterialDateTimeControl extends Control<
-  ControlProps,
-  ControlState
-> {
-  render() {
-    const {
-      id,
-      description,
-      errors,
-      label,
-      uischema,
-      visible,
-      enabled,
-      required,
-      path,
-      handleChange,
-      data,
-      config
-    } = this.props;
-    const appliedUiSchemaOptions = merge({}, config, uischema.options);
-    const isValid = errors.length === 0;
-    const inputProps = {};
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
+
+  const format = appliedUiSchemaOptions.dateTimeFormat ?? 'YYYY-MM-DD HH:mm';
+  const saveFormat = appliedUiSchemaOptions.dateTimeSaveFormat ?? undefined;
+
+  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}>
-        <MuiPickersUtilsProvider utils={MomentUtils}>
-          <AnyPropsKeyboardDateTimepicker
-            id={id + '-input'}
-            label={computeLabel(
-              isPlainLabel(label) ? label : label.default,
-              required,
-              appliedUiSchemaOptions.hideRequiredAsterisk
-            )}
-            error={!isValid}
-            fullWidth={!appliedUiSchemaOptions.trim}
-            onFocus={this.onFocus}
-            onBlur={this.onBlur}
-            helperText={!isValid ? errors : description}
-            InputLabelProps={{ shrink: true }}
-            value={data || null}
-            onChange={(datetime: any) =>
-              handleChange(path, datetime ? moment(datetime).format() : '')
-            }
-            format='MM/DD/YYYY h:mm a'
-            clearable={true}
-            disabled={!enabled}
-            autoFocus={appliedUiSchemaOptions.focus}
-            leftArrowIcon={<KeyboardArrowLeftIcon />}
-            rightArrowIcon={<KeyboardArrowRightIcon />}
-            dateRangeIcon={<DateRangeIcon />}
-            keyboardIcon={<EventIcon />}
-            timeIcon={<AccessTimeIcon />}
-            InputProps={inputProps}
-          />
-        </MuiPickersUtilsProvider>
-      </Hidden>
-    );
-  }
-}
+  return (
+    <Hidden xsUp={!visible}>
+      <LocalizationProvider dateAdapter={AdapterDayjs}>
+        <DateTimePicker
+          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 materialDateTimeControlTester: RankedTester = rankWith(
   2,

package/src/controls/MaterialEnumControl.tsx

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

package/src/controls/MaterialInputControl.tsx

@@ -1,7 +1,7 @@
 /*
   The MIT License
 
-  Copyright (c) 2017-2019 EclipseSource Munich
+  Copyright (c) 2017-2021 EclipseSource Munich
   https://github.com/eclipsesource/jsonforms
 
   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -24,88 +24,81 @@
 */
 import React from 'react';
 import {
-  computeLabel,
+  showAsRequired,
   ControlProps,
-  ControlState,
   isDescriptionHidden,
-  isPlainLabel
 } from '@jsonforms/core';
-import { Control } from '@jsonforms/react';
 
-import { Hidden, InputLabel } from '@material-ui/core';
-import { FormControl, FormHelperText } from '@material-ui/core';
+import { Hidden, InputLabel } from '@mui/material';
+import { FormControl, FormHelperText } from '@mui/material';
 import merge from 'lodash/merge';
+import { useFocus } from '../util';
 
 export interface WithInput {
   input: any;
 }
 
-export abstract class MaterialInputControl extends Control<
-  ControlProps & WithInput,
-  ControlState
-> {
-  render() {
-    const {
-      id,
-      description,
-      errors,
-      label,
-      uischema,
-      visible,
-      required,
-      config,
-      input
-    } = this.props;
-    const isValid = errors.length === 0;
-    const appliedUiSchemaOptions = merge({}, config, uischema.options);
+export const MaterialInputControl = (props: ControlProps & WithInput) => {
+  const [focused, onFocus, onBlur] = useFocus();
+  const {
+    id,
+    description,
+    errors,
+    label,
+    uischema,
+    visible,
+    required,
+    config,
+    input
+  } = props;
+  const isValid = errors.length === 0;
+  const appliedUiSchemaOptions = merge({}, config, uischema.options);
 
-    const showDescription = !isDescriptionHidden(
-      visible,
-      description,
-      this.state.isFocused,
-      appliedUiSchemaOptions.showUnfocusedDescription
-    );
+  const showDescription = !isDescriptionHidden(
+    visible,
+    description,
+    focused,
+    appliedUiSchemaOptions.showUnfocusedDescription
+  );
 
-    const firstFormHelperText = showDescription
-      ? description
-      : !isValid
-      ? errors
-      : null;
-    const secondFormHelperText = showDescription && !isValid ? errors : null;
-    const InnerComponent = input;
+  const firstFormHelperText = showDescription
+    ? description
+    : !isValid
+    ? errors
+    : null;
+  const secondFormHelperText = showDescription && !isValid ? errors : null;
+  const InnerComponent = input;
 
-    return (
-      <Hidden xsUp={!visible}>
-        <FormControl
-          fullWidth={!appliedUiSchemaOptions.trim}
-          onFocus={this.onFocus}
-          onBlur={this.onBlur}
-          id={id}
+  return (
+    <Hidden xsUp={!visible}>
+      <FormControl
+        fullWidth={!appliedUiSchemaOptions.trim}
+        onFocus={onFocus}
+        onBlur={onBlur}
+        id={id}
+        variant={'standard'}
+      >
+        <InputLabel
+          htmlFor={id + '-input'}
+          error={!isValid}
+          required={showAsRequired(required,
+            appliedUiSchemaOptions.hideRequiredAsterisk)}
         >
-          <InputLabel
-            htmlFor={id + '-input'}
-            error={!isValid}
-          >
-            {computeLabel(
-              isPlainLabel(label) ? label : label.default,
-              required,
-              appliedUiSchemaOptions.hideRequiredAsterisk
-            )}
-          </InputLabel>
-          <InnerComponent
-            {...this.props}
-            id={id + '-input'}
-            isValid={isValid}
-            visible={visible}
-          />
-          <FormHelperText error={!isValid && !showDescription}>
-            {firstFormHelperText}
-          </FormHelperText>
-          <FormHelperText error={!isValid}>
-            {secondFormHelperText}
-          </FormHelperText>
-        </FormControl>
-      </Hidden>
-    );
-  }
-}
+          {label}
+        </InputLabel>
+        <InnerComponent
+          {...props}
+          id={id + '-input'}
+          isValid={isValid}
+          visible={visible}
+        />
+        <FormHelperText error={!isValid && !showDescription}>
+          {firstFormHelperText}
+        </FormHelperText>
+        <FormHelperText error={!isValid}>
+          {secondFormHelperText}
+        </FormHelperText>
+      </FormControl>
+    </Hidden>
+  );
+};