@jsonforms/material-renderers 3.1.0 → 3.2.0-alpha.0

package/src/controls/MaterialAnyOfStringOrEnumControl.tsx

@@ -35,10 +35,10 @@ import {
   WithClassname,
 } from '@jsonforms/core';
 import { Control, withJsonFormsControlProps } from '@jsonforms/react';
-import { Input, InputBaseComponentProps } from '@mui/material';
+import { InputBaseComponentProps } from '@mui/material';
 import merge from 'lodash/merge';
 import React, { useMemo } from 'react';
-import { useDebouncedChange } from '../util';
+import { useDebouncedChange, useInputComponent, WithInputProps } from '../util';
 import { MaterialInputControl } from './MaterialInputControl';
 
 const findEnumSchema = (schemas: JsonSchema[]) =>
@@ -48,7 +48,9 @@ const findEnumSchema = (schemas: JsonSchema[]) =>
 const findTextSchema = (schemas: JsonSchema[]) =>
   schemas.find((s) => s.type === 'string' && s.enum === undefined);
 
-const MuiAutocompleteInputText = (props: EnumCellProps & WithClassname) => {
+const MuiAutocompleteInputText = (
+  props: EnumCellProps & WithClassname & WithInputProps
+) => {
   const {
     data,
     config,
@@ -60,7 +62,9 @@ const MuiAutocompleteInputText = (props: EnumCellProps & WithClassname) => {
     path,
     handleChange,
     schema,
+    label,
   } = props;
+  const InputComponent = useInputComponent();
   const enumSchema = findEnumSchema(schema.anyOf);
   const stringSchema = findTextSchema(schema.anyOf);
   const maxLength = stringSchema.maxLength;
@@ -94,12 +98,13 @@ const MuiAutocompleteInputText = (props: EnumCellProps & WithClassname) => {
     </datalist>
   );
   return (
-    <Input
+    <InputComponent
       type='text'
       value={inputText}
       onChange={onChange}
       className={className}
       id={id}
+      label={label}
       disabled={!enabled}
       autoFocus={appliedUiSchemaOptions.focus}
       fullWidth={!appliedUiSchemaOptions.trim || maxLength === undefined}

package/src/controls/MaterialDateControl.tsx

@@ -110,7 +110,6 @@ export const MaterialDateControl = (props: ControlProps) => {
               InputLabelProps: data ? { shrink: true } : undefined,
               onFocus: onFocus,
               onBlur: onBlur,
-              variant: 'standard',
             },
           }}
         />

package/src/controls/MaterialDateTimeControl.tsx

@@ -118,7 +118,6 @@ export const MaterialDateTimeControl = (props: ControlProps) => {
               InputLabelProps: data ? { shrink: true } : undefined,
               onFocus: onFocus,
               onBlur: onBlur,
-              variant: 'standard',
             },
           }}
         />

package/src/controls/MaterialInputControl.tsx

@@ -31,7 +31,7 @@ import {
 
 import { Hidden, InputLabel, FormControl, FormHelperText } from '@mui/material';
 import merge from 'lodash/merge';
-import { useFocus } from '../util';
+import { useFocus, useInputVariant } from '../util';
 
 export interface WithInput {
   input: any;
@@ -50,6 +50,7 @@ export const MaterialInputControl = (props: ControlProps & WithInput) => {
     config,
     input,
   } = props;
+  const variant = useInputVariant();
   const isValid = errors.length === 0;
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
 
@@ -74,8 +75,8 @@ export const MaterialInputControl = (props: ControlProps & WithInput) => {
         fullWidth={!appliedUiSchemaOptions.trim}
         onFocus={onFocus}
         onBlur={onBlur}
+        variant={variant}
         id={id}
-        variant={'standard'}
       >
         <InputLabel
           htmlFor={id + '-input'}

package/src/controls/MaterialTimeControl.tsx

@@ -112,7 +112,6 @@ export const MaterialTimeControl = (props: ControlProps) => {
               InputLabelProps: data ? { shrink: true } : undefined,
               onFocus: onFocus,
               onBlur: onBlur,
-              variant: 'standard',
             },
           }}
         />

package/src/mui-controls/MuiAutocomplete.tsx

@@ -123,7 +123,6 @@ export const MuiAutocomplete = (
           return (
             <TextField
               label={label}
-              variant={'standard'}
               type='text'
               inputProps={params.inputProps}
               inputRef={params.InputProps.ref}

package/src/mui-controls/MuiInputInteger.tsx

@@ -24,19 +24,28 @@
 */
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
-import { Input } from '@mui/material';
 import merge from 'lodash/merge';
-import { useDebouncedChange } from '../util';
+import { useDebouncedChange, useInputComponent, WithInputProps } from '../util';
 
 const toNumber = (value: string) =>
   value === '' ? undefined : parseInt(value, 10);
 const eventToValue = (ev: any) => toNumber(ev.target.value);
 
 export const MuiInputInteger = React.memo(function MuiInputInteger(
-  props: CellProps & WithClassname
+  props: CellProps & WithClassname & WithInputProps
 ) {
-  const { data, className, id, enabled, uischema, path, handleChange, config } =
-    props;
+  const {
+    data,
+    className,
+    id,
+    enabled,
+    uischema,
+    path,
+    handleChange,
+    config,
+    label,
+  } = props;
+  const InputComponent = useInputComponent();
   const inputProps = { step: '1' };
 
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
@@ -50,7 +59,8 @@ export const MuiInputInteger = React.memo(function MuiInputInteger(
   );
 
   return (
-    <Input
+    <InputComponent
+      label={label}
       type='number'
       value={inputValue}
       onChange={onChange}

package/src/mui-controls/MuiInputNumber.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
@@ -24,18 +24,27 @@
 */
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
-import { Input } from '@mui/material';
 import merge from 'lodash/merge';
-import { useDebouncedChange } from '../util';
+import { useDebouncedChange, useInputComponent, WithInputProps } from '../util';
 
 const toNumber = (value: string) =>
   value === '' ? undefined : parseFloat(value);
 const eventToValue = (ev: any) => toNumber(ev.target.value);
 export const MuiInputNumber = React.memo(function MuiInputNumber(
-  props: CellProps & WithClassname
+  props: CellProps & WithClassname & WithInputProps
 ) {
-  const { data, className, id, enabled, uischema, path, handleChange, config } =
-    props;
+  const {
+    data,
+    className,
+    id,
+    enabled,
+    uischema,
+    path,
+    handleChange,
+    config,
+    label,
+  } = props;
+  const InputComponent = useInputComponent();
   const inputProps = { step: '0.1' };
 
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
@@ -48,8 +57,9 @@ export const MuiInputNumber = React.memo(function MuiInputNumber(
   );
 
   return (
-    <Input
+    <InputComponent
       type='number'
+      label={label}
       value={inputValue}
       onChange={onChange}
       className={className}

package/src/mui-controls/MuiInputNumberFormat.tsx

@@ -24,12 +24,11 @@
 */
 import React, { useCallback } from 'react';
 import { CellProps, Formatted, WithClassname } from '@jsonforms/core';
-import { Input } from '@mui/material';
 import merge from 'lodash/merge';
-import { useDebouncedChange } from '../util';
+import { useDebouncedChange, useInputComponent, WithInputProps } from '../util';
 
 export const MuiInputNumberFormat = React.memo(function MuiInputNumberFormat(
-  props: CellProps & WithClassname & Formatted<number>
+  props: CellProps & WithClassname & Formatted<number> & WithInputProps
 ) {
   const {
     className,
@@ -41,7 +40,9 @@ export const MuiInputNumberFormat = React.memo(function MuiInputNumberFormat(
     handleChange,
     schema,
     config,
+    label,
   } = props;
+  const InputComponent = useInputComponent();
   const maxLength = schema.maxLength;
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
   let inputProps;
@@ -65,12 +66,13 @@ export const MuiInputNumberFormat = React.memo(function MuiInputNumberFormat(
   );
 
   return (
-    <Input
+    <InputComponent
       type='text'
       value={inputValue}
       onChange={onChange}
       className={className}
       id={id}
+      label={label}
       disabled={!enabled}
       autoFocus={appliedUiSchemaOptions.focus}
       multiline={appliedUiSchemaOptions.multi}

package/src/mui-controls/MuiInputText.tsx

@@ -26,7 +26,6 @@ import React, { useState } from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
 import {
   IconButton,
-  Input,
   InputAdornment,
   InputBaseComponentProps,
   InputProps,
@@ -34,7 +33,12 @@ import {
 } from '@mui/material';
 import merge from 'lodash/merge';
 import Close from '@mui/icons-material/Close';
-import { JsonFormsTheme, useDebouncedChange } from '../util';
+import {
+  JsonFormsTheme,
+  WithInputProps,
+  useDebouncedChange,
+  useInputComponent,
+} from '../util';
 
 interface MuiTextInputProps {
   muiInputProps?: InputProps['inputProps'];
@@ -45,7 +49,7 @@ const eventToValue = (ev: any) =>
   ev.target.value === '' ? undefined : ev.target.value;
 
 export const MuiInputText = React.memo(function MuiInputText(
-  props: CellProps & WithClassname & MuiTextInputProps
+  props: CellProps & WithClassname & MuiTextInputProps & WithInputProps
 ) {
   const [showAdornment, setShowAdornment] = useState(false);
   const {
@@ -60,8 +64,10 @@ export const MuiInputText = React.memo(function MuiInputText(
     handleChange,
     schema,
     muiInputProps,
+    label,
     inputComponent,
   } = props;
+  const InputComponent = useInputComponent();
   const maxLength = schema.maxLength;
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
   let inputProps: InputBaseComponentProps;
@@ -97,7 +103,8 @@ export const MuiInputText = React.memo(function MuiInputText(
   };
 
   return (
-    <Input
+    <InputComponent
+      label={label}
       type={appliedUiSchemaOptions.format === 'password' ? 'password' : 'text'}
       value={inputText}
       onChange={onChange}

package/src/mui-controls/MuiInputTime.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
@@ -24,15 +24,24 @@
 */
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
-import { Input } from '@mui/material';
 import merge from 'lodash/merge';
-import { useDebouncedChange } from '../util';
+import { WithInputProps, useDebouncedChange, useInputComponent } from '../util';
 
 export const MuiInputTime = React.memo(function MuiInputTime(
-  props: CellProps & WithClassname
+  props: CellProps & WithClassname & WithInputProps
 ) {
-  const { data, className, id, enabled, uischema, path, handleChange, config } =
-    props;
+  const {
+    data,
+    className,
+    id,
+    enabled,
+    uischema,
+    path,
+    handleChange,
+    config,
+    label,
+  } = props;
+  const InputComponent = useInputComponent();
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
   const [inputValue, onChange] = useDebouncedChange(
     handleChange,
@@ -42,12 +51,13 @@ export const MuiInputTime = React.memo(function MuiInputTime(
   );
 
   return (
-    <Input
+    <InputComponent
       type='time'
       value={inputValue}
       onChange={onChange}
       className={className}
       id={id}
+      label={label}
       disabled={!enabled}
       autoFocus={appliedUiSchemaOptions.focus}
       fullWidth={true}

package/src/mui-controls/MuiSelect.tsx

@@ -28,10 +28,10 @@ import { EnumCellProps, WithClassname } from '@jsonforms/core';
 import { MenuItem, Select } from '@mui/material';
 import merge from 'lodash/merge';
 import { TranslateProps } from '@jsonforms/react';
-import { i18nDefaults } from '../util';
+import { i18nDefaults, WithInputProps } from '../util';
 
 export const MuiSelect = React.memo(function MuiSelect(
-  props: EnumCellProps & WithClassname & TranslateProps
+  props: EnumCellProps & WithClassname & TranslateProps & WithInputProps
 ) {
   const {
     data,
@@ -44,6 +44,7 @@ export const MuiSelect = React.memo(function MuiSelect(
     handleChange,
     options,
     config,
+    label,
     t,
   } = props;
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
@@ -56,12 +57,12 @@ export const MuiSelect = React.memo(function MuiSelect(
     <Select
       className={className}
       id={id}
+      label={label}
       disabled={!enabled}
       autoFocus={appliedUiSchemaOptions.focus}
       value={data !== undefined ? data : ''}
       onChange={(ev) => handleChange(path, ev.target.value || undefined)}
       fullWidth={true}
-      variant={'standard'}
     >
       {[
         <MenuItem value={''} key='jsonforms.enum.none'>

package/src/util/theme.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
@@ -22,7 +22,15 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import { Theme } from '@mui/material';
+import {
+  Theme,
+  FilledInput,
+  Input,
+  OutlinedInput,
+  TextFieldProps,
+  useThemeProps,
+  InputBaseProps,
+} from '@mui/material';
 
 export interface JsonFormsTheme extends Theme {
   jsonforms?: {
@@ -33,3 +41,30 @@ export interface JsonFormsTheme extends Theme {
     };
   };
 }
+
+export interface WithInputProps {
+  label?: string;
+}
+
+const variantToInput = {
+  standard: Input,
+  filled: FilledInput,
+  outlined: OutlinedInput,
+};
+
+export const defaultInputVariant: TextFieldProps['variant'] = 'standard';
+
+export function useInputVariant(): TextFieldProps['variant'] {
+  const { variant = defaultInputVariant } = useThemeProps({
+    props: {} as TextFieldProps,
+    name: 'MuiTextField',
+  });
+  return variant;
+}
+
+export function useInputComponent(): React.JSXElementConstructor<
+  InputBaseProps & WithInputProps
+> {
+  const variant = useInputVariant();
+  return variantToInput[variant] ?? variantToInput[defaultInputVariant];
+}