@jsonforms/material-renderers 3.1.0-alpha.2 → 3.1.0-beta.0

package/lib/util/datejs.d.ts

@@ -1,19 +1,3 @@
-import { TextFieldProps } from '@mui/material';
 import dayjs from 'dayjs';
-import React from 'react';
-export declare const createOnChangeHandler: (path: string, handleChange: (path: string, value: any) => void, saveFormat: string | undefined) => (time: dayjs.Dayjs, textInputValue: string) => void;
+export declare const createOnChangeHandler: (path: string, handleChange: (path: string, value: any) => void, saveFormat: string | undefined) => (time: dayjs.Dayjs) => void;
 export declare const getData: (data: any, saveFormat: string | undefined) => dayjs.Dayjs | null;
-declare type ResettableTextFieldProps = TextFieldProps & {
-    rawValue: any;
-    dayjsValueIsValid: boolean;
-    valueInInputFormat: string;
-    focused: boolean;
-};
-/**
- * The dayjs formatter/parser is very lenient and for example ignores additional digits and/or characters.
- * In these cases the input text can look vastly different than the actual value stored in the data.
- * The 'ResettableTextField' component adjusts the text field to reflect the actual value stored in the data
- * once it's no longer 'focused', i.e. when the user stops editing.
- */
-export declare const ResettableTextField: React.FC<ResettableTextFieldProps>;
-export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsonforms/material-renderers",
-  "version": "3.1.0-alpha.2",
+  "version": "3.1.0-beta.0",
   "description": "Material Renderer Set for JSON Forms",
   "repository": "https://github.com/eclipsesource/jsonforms",
   "bugs": "https://github.com/eclipsesource/jsonforms/issues",
@@ -82,20 +82,20 @@
   "peerDependencies": {
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
-    "@jsonforms/core": "3.1.0-alpha.2",
-    "@jsonforms/react": "3.1.0-alpha.2",
-    "@mui/icons-material": "~5.2.2",
-    "@mui/material": "~5.2.2",
-    "@mui/x-date-pickers": "^5.0.0-beta.5"
+    "@jsonforms/core": "3.1.0-beta.0",
+    "@jsonforms/react": "3.1.0-beta.0",
+    "@mui/icons-material": "~5.11.16",
+    "@mui/material": "~5.13.0",
+    "@mui/x-date-pickers": "^6.0.0"
   },
   "devDependencies": {
     "@emotion/react": "^11.5.0",
     "@emotion/styled": "^11.3.0",
-    "@jsonforms/core": "^3.1.0-alpha.2",
-    "@jsonforms/react": "^3.1.0-alpha.2",
-    "@mui/icons-material": "~5.2.0",
-    "@mui/material": "~5.2.2",
-    "@mui/x-date-pickers": "^5.0.0-beta.5",
+    "@jsonforms/core": "^3.1.0-beta.0",
+    "@jsonforms/react": "^3.1.0-beta.0",
+    "@mui/icons-material": "~5.11.16",
+    "@mui/material": "~5.13.0",
+    "@mui/x-date-pickers": "^6.5.0",
     "@rollup/plugin-commonjs": "^23.0.3",
     "@rollup/plugin-json": "^5.0.2",
     "@rollup/plugin-node-resolve": "^15.0.1",
@@ -132,5 +132,5 @@
     "webpack-cli": "^3.2.1",
     "webpack-dev-server": "^3.9.0"
   },
-  "gitHead": "1e1ccad5f7ebfaf80412c8af3e422faebb12d0d5"
+  "gitHead": "a5fdca6fb6afa9820eabe8051401785675f53ad7"
 }

package/src/controls/MaterialAnyOfStringOrEnumControl.tsx

@@ -133,7 +133,9 @@ const hasEnumAndText = (schemas: JsonSchema[]) => {
 const simpleAnyOf = and(
   uiTypeIs('Control'),
   schemaMatches(
-    (schema) => schema.hasOwnProperty('anyOf') && hasEnumAndText(schema.anyOf)
+    (schema) =>
+      Object.prototype.hasOwnProperty.call(schema, 'anyOf') &&
+      hasEnumAndText(schema.anyOf)
   )
 );
 export const materialAnyOfStringOrEnumControlTester: RankedTester = rankWith(

package/src/controls/MaterialDateControl.tsx

@@ -1,19 +1,19 @@
 /*
   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
@@ -35,12 +35,7 @@ import { withJsonFormsControlProps } from '@jsonforms/react';
 import { FormHelperText, Hidden } from '@mui/material';
 import { DatePicker, LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
-import {
-  createOnChangeHandler,
-  getData,
-  ResettableTextField,
-  useFocus,
-} from '../util';
+import { createOnChangeHandler, getData, useFocus } from '../util';
 
 export const MaterialDateControl = (props: ControlProps) => {
   const [focused, onFocus, onBlur] = useFocus();
@@ -84,7 +79,6 @@ export const MaterialDateControl = (props: ControlProps) => {
   );
 
   const value = getData(data, saveFormat);
-  const valueInInputFormat = value ? value.format(format) : '';
 
   return (
     <Hidden xsUp={!visible}>
@@ -93,40 +87,32 @@ export const MaterialDateControl = (props: ControlProps) => {
           label={label}
           value={value}
           onChange={onChange}
-          inputFormat={format}
-          disableMaskedInput
+          format={format}
           views={views}
           disabled={!enabled}
-          componentsProps={{
-            actionBar: {
-              actions: (variant) =>
-                variant === 'desktop' ? [] : ['clear', 'cancel', 'accept'],
+          slotProps={{
+            actionBar: ({ wrapperVariant }) => ({
+              actions:
+                wrapperVariant === 'desktop'
+                  ? []
+                  : ['clear', 'cancel', 'accept'],
+            }),
+            textField: {
+              id: id + '-input',
+              required:
+                required && !appliedUiSchemaOptions.hideRequiredAsterisk,
+              autoFocus: appliedUiSchemaOptions.focus,
+              error: !isValid,
+              fullWidth: !appliedUiSchemaOptions.trim,
+              inputProps: {
+                type: 'text',
+              },
+              InputLabelProps: data ? { shrink: true } : undefined,
+              onFocus: onFocus,
+              onBlur: onBlur,
+              variant: 'standard',
             },
           }}
-          renderInput={(params) => (
-            <ResettableTextField
-              {...params}
-              rawValue={data}
-              dayjsValueIsValid={value !== null}
-              valueInInputFormat={valueInInputFormat}
-              focused={focused}
-              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}

package/src/controls/MaterialDateTimeControl.tsx

@@ -1,19 +1,19 @@
 /*
   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
@@ -35,12 +35,7 @@ import { withJsonFormsControlProps } from '@jsonforms/react';
 import { FormHelperText, Hidden } from '@mui/material';
 import { DateTimePicker, LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
-import {
-  createOnChangeHandler,
-  getData,
-  ResettableTextField,
-  useFocus,
-} from '../util';
+import { createOnChangeHandler, getData, useFocus } from '../util';
 
 export const MaterialDateTimeControl = (props: ControlProps) => {
   const [focused, onFocus, onBlur] = useFocus();
@@ -91,7 +86,6 @@ export const MaterialDateTimeControl = (props: ControlProps) => {
   );
 
   const value = getData(data, saveFormat);
-  const valueInInputFormat = value ? value.format(format) : '';
 
   return (
     <Hidden xsUp={!visible}>
@@ -100,41 +94,33 @@ export const MaterialDateTimeControl = (props: ControlProps) => {
           label={label}
           value={value}
           onChange={onChange}
-          inputFormat={format}
-          disableMaskedInput
+          format={format}
           ampm={!!appliedUiSchemaOptions.ampm}
           views={views}
           disabled={!enabled}
-          componentsProps={{
-            actionBar: {
-              actions: (variant) =>
-                variant === 'desktop' ? [] : ['clear', 'cancel', 'accept'],
+          slotProps={{
+            actionBar: ({ wrapperVariant }) => ({
+              actions:
+                wrapperVariant === 'desktop'
+                  ? []
+                  : ['clear', 'cancel', 'accept'],
+            }),
+            textField: {
+              id: id + '-input',
+              required:
+                required && !appliedUiSchemaOptions.hideRequiredAsterisk,
+              autoFocus: appliedUiSchemaOptions.focus,
+              error: !isValid,
+              fullWidth: !appliedUiSchemaOptions.trim,
+              inputProps: {
+                type: 'text',
+              },
+              InputLabelProps: data ? { shrink: true } : undefined,
+              onFocus: onFocus,
+              onBlur: onBlur,
+              variant: 'standard',
             },
           }}
-          renderInput={(params) => (
-            <ResettableTextField
-              {...params}
-              rawValue={data}
-              dayjsValueIsValid={value !== null}
-              valueInInputFormat={valueInInputFormat}
-              focused={focused}
-              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}

package/src/controls/MaterialTimeControl.tsx

@@ -1,19 +1,19 @@
 /*
   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
@@ -35,12 +35,7 @@ import { withJsonFormsControlProps } from '@jsonforms/react';
 import { FormHelperText, Hidden } from '@mui/material';
 import { TimePicker, LocalizationProvider } from '@mui/x-date-pickers';
 import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
-import {
-  createOnChangeHandler,
-  getData,
-  ResettableTextField,
-  useFocus,
-} from '../util';
+import { createOnChangeHandler, getData, useFocus } from '../util';
 
 export const MaterialTimeControl = (props: ControlProps) => {
   const [focused, onFocus, onBlur] = useFocus();
@@ -86,8 +81,6 @@ export const MaterialTimeControl = (props: ControlProps) => {
   );
 
   const value = getData(data, saveFormat);
-  const valueInInputFormat = value ? value.format(format) : '';
-
   return (
     <Hidden xsUp={!visible}>
       <LocalizationProvider dateAdapter={AdapterDayjs}>
@@ -95,41 +88,33 @@ export const MaterialTimeControl = (props: ControlProps) => {
           label={label}
           value={value}
           onChange={onChange}
-          inputFormat={format}
-          disableMaskedInput
+          format={format}
           ampm={!!appliedUiSchemaOptions.ampm}
           views={views}
           disabled={!enabled}
-          componentsProps={{
-            actionBar: {
-              actions: (variant) =>
-                variant === 'desktop' ? [] : ['clear', 'cancel', 'accept'],
+          slotProps={{
+            actionBar: ({ wrapperVariant }) => ({
+              actions:
+                wrapperVariant === 'desktop'
+                  ? []
+                  : ['clear', 'cancel', 'accept'],
+            }),
+            textField: {
+              id: id + '-input',
+              required:
+                required && !appliedUiSchemaOptions.hideRequiredAsterisk,
+              autoFocus: appliedUiSchemaOptions.focus,
+              error: !isValid,
+              fullWidth: !appliedUiSchemaOptions.trim,
+              inputProps: {
+                type: 'text',
+              },
+              InputLabelProps: data ? { shrink: true } : undefined,
+              onFocus: onFocus,
+              onBlur: onBlur,
+              variant: 'standard',
             },
           }}
-          renderInput={(params) => (
-            <ResettableTextField
-              {...params}
-              rawValue={data}
-              dayjsValueIsValid={value !== null}
-              valueInInputFormat={valueInInputFormat}
-              focused={focused}
-              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}

package/src/util/datejs.tsx

@@ -1,7 +1,5 @@
-import { TextField, TextFieldProps } from '@mui/material';
 import dayjs from 'dayjs';
 import customParsing from 'dayjs/plugin/customParseFormat';
-import React, { useRef } from 'react';
 
 // required for the custom save formats in the date, time and date-time pickers
 dayjs.extend(customParsing);
@@ -12,13 +10,13 @@ export const createOnChangeHandler =
     handleChange: (path: string, value: any) => void,
     saveFormat: string | undefined
   ) =>
-  (time: dayjs.Dayjs, textInputValue: string) => {
+  (time: dayjs.Dayjs) => {
     if (!time) {
       handleChange(path, undefined);
       return;
     }
     const result = dayjs(time).format(saveFormat);
-    handleChange(path, result === 'Invalid Date' ? textInputValue : result);
+    handleChange(path, result);
   };
 
 export const getData = (
@@ -34,61 +32,3 @@ export const getData = (
   }
   return dayjsData;
 };
-
-interface InputRef {
-  lastInput: string;
-  toShow: string;
-}
-
-type ResettableTextFieldProps = TextFieldProps & {
-  rawValue: any;
-  dayjsValueIsValid: boolean;
-  valueInInputFormat: string;
-  focused: boolean;
-};
-
-/**
- * The dayjs formatter/parser is very lenient and for example ignores additional digits and/or characters.
- * In these cases the input text can look vastly different than the actual value stored in the data.
- * The 'ResettableTextField' component adjusts the text field to reflect the actual value stored in the data
- * once it's no longer 'focused', i.e. when the user stops editing.
- */
-export const ResettableTextField: React.FC<ResettableTextFieldProps> = ({
-  rawValue,
-  dayjsValueIsValid,
-  valueInInputFormat,
-  focused,
-  inputProps,
-  ...props
-}) => {
-  const value = useRef<InputRef>({
-    lastInput: inputProps?.value,
-    toShow: inputProps?.value,
-  });
-  if (!focused) {
-    // The input text is not focused, therefore let's show the value actually stored in the data
-    if (!dayjsValueIsValid) {
-      // pass through the "raw" value in case it can't be formatted by dayjs
-      value.current.toShow =
-        typeof rawValue === 'string' ||
-        rawValue === null ||
-        rawValue === undefined
-          ? rawValue
-          : JSON.stringify(rawValue);
-    } else {
-      // otherwise use the specified format
-      value.current.toShow = valueInInputFormat;
-    }
-  }
-  if (focused && inputProps?.value !== value.current.lastInput) {
-    // Show the current text the user is typing into the text input
-    value.current.lastInput = inputProps?.value;
-    value.current.toShow = inputProps?.value;
-  }
-  return (
-    <TextField
-      {...props}
-      inputProps={{ ...inputProps, value: value.current.toShow || '' }}
-    />
-  );
-};

package/src/util/index.ts

@@ -1,19 +1,19 @@
 /*
   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