@jsonforms/material-renderers 3.0.0-alpha.1 → 3.0.0-alpha.2

package/src/layouts/MaterialCategorizationLayout.tsx

@@ -22,7 +22,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import React from 'react';
+import React, {useState} from 'react';
 import { Hidden, Tab, Tabs } from '@material-ui/core';
 import AppBar from '@material-ui/core/AppBar';
 import {
@@ -37,7 +37,7 @@ import {
   UISchemaElement,
   uiTypeIs
 } from '@jsonforms/core';
-import { RendererComponent, withJsonFormsLayoutProps } from '@jsonforms/react';
+import { withJsonFormsLayoutProps } from '@jsonforms/react';
 import {
   AjvProps,
   MaterialLayoutRenderer,
@@ -76,71 +76,55 @@ export interface MaterialCategorizationLayoutRendererProps
   onChange?(selected: number, prevSelected: number): void;
 }
 
-export class MaterialCategorizationLayoutRenderer extends RendererComponent<
-  MaterialCategorizationLayoutRendererProps,
-  CategorizationState
-> {
-  state = {
-    activeCategory: 0
+export const MaterialCategorizationLayoutRenderer = (props: MaterialCategorizationLayoutRendererProps) => {
+  const {
+    data,
+    path,
+    renderers,
+    cells,
+    schema,
+    uischema,
+    visible,
+    enabled,
+    selected,
+    onChange,
+    ajv
+  } = props;
+  const categorization = uischema as Categorization;
+  const [activeCategory, setActiveCategory]= useState<number|undefined>(selected??0);
+  const categories = categorization.elements.filter((category: Category) =>
+    isVisible(category, data, undefined, ajv)
+  );
+  const childProps: MaterialLayoutRendererProps = {
+    elements: categories[activeCategory].elements,
+    schema,
+    path,
+    direction: 'column',
+    enabled,
+    visible,
+    renderers,
+    cells
   };
-
-  render() {
-    const {
-      data,
-      path,
-      renderers,
-      cells,
-      schema,
-      uischema,
-      visible,
-      enabled,
-      selected,
-      ajv
-    } = this.props;
-    const categorization = uischema as Categorization;
-    const value = this.hasOwnState() ? this.state.activeCategory : selected;
-    const childProps: MaterialLayoutRendererProps = {
-      elements: categorization.elements[value].elements,
-      schema,
-      path,
-      direction: 'column',
-      enabled,
-      visible,
-      renderers,
-      cells
-    };
-    const categories = categorization.elements.filter((category: Category) =>
-      isVisible(category, data, undefined, ajv)
-    );
-    return (
-      <Hidden xsUp={!visible}>
-        <AppBar position='static'>
-          <Tabs value={value} onChange={this.handleChange} variant='scrollable'>
-            {categories.map((e: Category, idx: number) => (
-              <Tab key={idx} label={e.label} />
-            ))}
-          </Tabs>
-        </AppBar>
-        <div style={{ marginTop: '0.5em' }}>
-          <MaterialLayoutRenderer {...childProps} />
-        </div>
-      </Hidden>
-    );
-  }
-
-  hasOwnState = () => {
-    return this.props.ownState !== undefined ? this.props.ownState : true;
-  };
-
-  private handleChange = (_event: any, value: any) => {
-    if (this.props.onChange) {
-      this.props.onChange(value, this.state.activeCategory);
-    }
-    const hasOwnState = this.hasOwnState();
-    if (hasOwnState) {
-      this.setState({ activeCategory: value });
+  const onTabChange = (_event: any, value: any) => {
+    if (onChange) {
+      onChange(value, activeCategory);
     }
+    setActiveCategory(value);
   };
-}
+  return (
+    <Hidden xsUp={!visible}>
+      <AppBar position='static'>
+        <Tabs value={activeCategory} onChange={onTabChange} variant='scrollable'>
+          {categories.map((e: Category, idx: number) => (
+            <Tab key={idx} label={e.label} />
+          ))}
+        </Tabs>
+      </AppBar>
+      <div style={{ marginTop: '0.5em' }}>
+        <MaterialLayoutRenderer {...childProps} />
+      </div>
+    </Hidden>
+  );
+};
 
 export default withJsonFormsLayoutProps(withAjvProps(MaterialCategorizationLayoutRenderer));

package/src/layouts/MaterialCategorizationStepperLayout.tsx

@@ -22,7 +22,7 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import React from 'react';
+import React, {useState} from 'react';
 import merge from 'lodash/merge';
 import { Button, Hidden, Step, StepButton, Stepper } from '@material-ui/core';
 import {
@@ -37,7 +37,7 @@ import {
   StatePropsOfLayout,
   uiTypeIs
 } from '@jsonforms/core';
-import { RendererComponent, withJsonFormsLayoutProps } from '@jsonforms/react';
+import { withJsonFormsLayoutProps } from '@jsonforms/react';
 import {
   AjvProps,
   MaterialLayoutRenderer,
@@ -63,94 +63,86 @@ export interface MaterialCategorizationStepperLayoutRendererProps
     data: any;
 }
 
-export class MaterialCategorizationStepperLayoutRenderer extends RendererComponent<
-  MaterialCategorizationStepperLayoutRendererProps,
-  CategorizationStepperState
-> {
-  state = {
-    activeCategory: 0
-  };
+export const MaterialCategorizationStepperLayoutRenderer = (props: MaterialCategorizationStepperLayoutRendererProps)=> {
+  const [activeCategory, setActiveCategory] = useState<number>(0);
 
-  handleStep = (step: number) => {
-    this.setState({ activeCategory: step });
+  const handleStep = (step: number) => {
+    setActiveCategory( step);
   };
 
-  render() {
-    const {
-      data,
-      path,
-      renderers,
-      schema,
-      uischema,
-      visible,
-      cells,
-      config,
-      ajv
-    } = this.props;
-    const categorization = uischema as Categorization;
-    const activeCategory = this.state.activeCategory;
-    const appliedUiSchemaOptions = merge({}, config, uischema.options);
-    const buttonWrapperStyle = {
-      textAlign: 'right' as 'right',
-      width: '100%',
-      margin: '1em auto'
-    };
-    const buttonNextStyle = {
-      float: 'right' as 'right'
-    };
-    const buttonStyle = {
-      marginRight: '1em'
-    };
-    const childProps: MaterialLayoutRendererProps = {
-      elements: categorization.elements[activeCategory].elements,
-      schema,
-      path,
-      direction: 'column',
-      visible,
-      renderers,
-      cells
-    };
-    const categories = categorization.elements.filter((category: Category) =>
-      isVisible(category, data, undefined, ajv)
-    );
-    return (
-      <Hidden xsUp={!visible}>
-        <Stepper activeStep={activeCategory} nonLinear>
-          {categories.map((e: Category, idx: number) => (
-            <Step key={e.label}>
-              <StepButton onClick={() => this.handleStep(idx)}>
-                {e.label}
-              </StepButton>
-            </Step>
-          ))}
-        </Stepper>
-        <div>
-          <MaterialLayoutRenderer {...childProps} />
-        </div>
-        { !!appliedUiSchemaOptions.showNavButtons ? (<div style={buttonWrapperStyle}>
-          <Button
-            style={buttonNextStyle}
-            variant="contained"
-            color="primary"
-            disabled={activeCategory >= categories.length - 1}
-            onClick={() => this.handleStep(activeCategory + 1)}
-          >
-            Next
-          </Button>
-          <Button
-            style={buttonStyle}
-            color="secondary"
-            variant="contained"
-            disabled={activeCategory <= 0}
-            onClick={() => this.handleStep(activeCategory - 1)}
-          >
-            Previous
-          </Button>
-        </div>) : (<></>)}
-      </Hidden>
-    );
-  }
-}
+  const {
+    data,
+    path,
+    renderers,
+    schema,
+    uischema,
+    visible,
+    cells,
+    config,
+    ajv
+  } = props;
+  const categorization = uischema as Categorization;
+  const appliedUiSchemaOptions = merge({}, config, uischema.options);
+  const buttonWrapperStyle = {
+    textAlign: 'right' as 'right',
+    width: '100%',
+    margin: '1em auto'
+  };
+  const buttonNextStyle = {
+    float: 'right' as 'right'
+  };
+  const buttonStyle = {
+    marginRight: '1em'
+  };
+  const categories = categorization.elements.filter((category: Category) =>
+    isVisible(category, data, undefined, ajv)
+  );
+  const childProps: MaterialLayoutRendererProps = {
+    elements: categories[activeCategory].elements,
+    schema,
+    path,
+    direction: 'column',
+    visible,
+    renderers,
+    cells
+  };
+  return (
+    <Hidden xsUp={!visible}>
+      <Stepper activeStep={activeCategory} nonLinear>
+        {categories.map((e: Category, idx: number) => (
+          <Step key={e.label}>
+            <StepButton onClick={() => handleStep(idx)}>
+              {e.label}
+            </StepButton>
+          </Step>
+        ))}
+      </Stepper>
+      <div>
+        <MaterialLayoutRenderer {...childProps} />
+      </div>
+      { !!appliedUiSchemaOptions.showNavButtons ? (<div style={buttonWrapperStyle}>
+        <Button
+          style={buttonNextStyle}
+          variant="contained"
+          color="primary"
+          disabled={activeCategory >= categories.length - 1}
+          onClick={() => handleStep(activeCategory + 1)}
+        >
+          Next
+        </Button>
+        <Button
+          style={buttonStyle}
+          color="secondary"
+          variant="contained"
+          disabled={activeCategory <= 0}
+          onClick={() => handleStep(activeCategory - 1)}
+        >
+          Previous
+        </Button>
+      </div>) : (<></>)}
+    </Hidden>
+  );
+};
 
 export default withJsonFormsLayoutProps(withAjvProps(
   MaterialCategorizationStepperLayoutRenderer

package/src/mui-controls/MuiCheckbox.tsx

@@ -25,7 +25,6 @@
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
 import Checkbox from '@material-ui/core/Checkbox';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
 
 export const MuiCheckbox = React.memo((props: CellProps & WithClassname) => {
@@ -54,4 +53,4 @@ export const MuiCheckbox = React.memo((props: CellProps & WithClassname) => {
       inputProps={inputProps}
     />
   );
-}, areEqual);
+});

package/src/mui-controls/MuiInputInteger.tsx

@@ -25,10 +25,14 @@
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
 import Input from '@material-ui/core/Input';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
+import { useDebouncedChange } from '../util';
 
-export const MuiInputInteger = React.memo(
+const toNumber = (value: string) =>
+      value === '' ? undefined : parseInt(value, 10);
+const eventToValue = (ev:any) => toNumber(ev.target.value);
+
+export const MuiInputInteger = React.memo( 
   (props: CellProps & WithClassname) => {
     const {
       data,
@@ -41,15 +45,16 @@ export const MuiInputInteger = React.memo(
       config
     } = props;
     const inputProps = { step: '1' };
-    const toNumber = (value: string) =>
-      value === '' ? undefined : parseInt(value, 10);
+    
     const appliedUiSchemaOptions = merge({}, config, uischema.options);
 
+    const [inputValue, onChange] = useDebouncedChange(handleChange, '', data, path, eventToValue);
+
     return (
       <Input
         type='number'
-        value={data !== undefined && data !== null ? data : ''}
-        onChange={ev => handleChange(path, toNumber(ev.target.value))}
+        value={inputValue}
+        onChange={onChange}
         className={className}
         id={id}
         disabled={!enabled}
@@ -58,6 +63,4 @@ export const MuiInputInteger = React.memo(
         fullWidth={true}
       />
     );
-  },
-  areEqual
-);
+  });

package/src/mui-controls/MuiInputNumber.tsx

@@ -25,9 +25,12 @@
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
 import Input from '@material-ui/core/Input';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
+import {useDebouncedChange} from '../util';
 
+const toNumber = (value: string) =>
+    value === '' ? undefined : parseFloat(value);
+const eventToValue = (ev:any) => toNumber(ev.target.value);
 export const MuiInputNumber = React.memo((props: CellProps & WithClassname) => {
   const {
     data,
@@ -40,15 +43,15 @@ export const MuiInputNumber = React.memo((props: CellProps & WithClassname) => {
     config
   } = props;
   const inputProps = { step: '0.1' };
-  const toNumber = (value: string) =>
-    value === '' ? undefined : parseFloat(value);
+  
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
+  const [inputValue, onChange] = useDebouncedChange(handleChange, '', data, path, eventToValue);
 
   return (
     <Input
       type='number'
-      value={data === undefined || data === null ? '' : data}
-      onChange={ev => handleChange(path, toNumber(ev.target.value))}
+      value={inputValue}
+      onChange={onChange}
       className={className}
       id={id}
       disabled={!enabled}
@@ -57,4 +60,4 @@ export const MuiInputNumber = React.memo((props: CellProps & WithClassname) => {
       fullWidth={true}
     />
   );
-}, areEqual);
+});

package/src/mui-controls/MuiInputNumberFormat.tsx

@@ -22,13 +22,13 @@
   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 { CellProps, Formatted, WithClassname } from '@jsonforms/core';
 import Input from '@material-ui/core/Input';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
+import { useDebouncedChange } from '../util';
 
-export const MuiInputNumberFormat = React.memo(
+export const MuiInputNumberFormat = React.memo( 
   (props: CellProps & WithClassname & Formatted<number>) => {
     const {
       className,
@@ -51,15 +51,14 @@ export const MuiInputNumberFormat = React.memo(
     }
     const formattedNumber = props.toFormatted(props.data);
 
-    const onChange = (ev: any) => {
-      const validStringNumber = props.fromFormatted(ev.currentTarget.value);
-      handleChange(path, validStringNumber);
-    };
+    const validStringNumber = useCallback((ev:any) => props.fromFormatted(ev.currentTarget.value),[props.fromFormatted]);
+    const [inputValue, onChange] = useDebouncedChange(handleChange, '', formattedNumber, path, validStringNumber);
+
 
     return (
       <Input
         type='text'
-        value={formattedNumber}
+        value={inputValue}
         onChange={onChange}
         className={className}
         id={id}
@@ -71,6 +70,4 @@ export const MuiInputNumberFormat = React.memo(
         error={!isValid}
       />
     );
-  },
-  areEqual
-);
+  });

package/src/mui-controls/MuiInputText.tsx

@@ -24,22 +24,20 @@
 */
 import React, { useState } from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
-import { areEqual } from '@jsonforms/react';
 import Input, { InputProps } from '@material-ui/core/Input';
 import merge from 'lodash/merge';
 import IconButton from '@material-ui/core/IconButton';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import Close from '@material-ui/icons/Close';
 import { useTheme } from '@material-ui/core/styles';
-import { JsonFormsTheme } from '../util';
+import { JsonFormsTheme, useDebouncedChange } from '../util';
 import { InputBaseComponentProps } from '@material-ui/core';
 
 interface MuiTextInputProps {
   muiInputProps?: InputProps['inputProps'];
   inputComponent?: InputProps['inputComponent'];
 }
-
-export const MuiInputText = React.memo((props: CellProps & WithClassname & MuiTextInputProps) => {
+export const MuiInputText = React.memo((props: CellProps & WithClassname & MuiTextInputProps) => { 
   const [showAdornment, setShowAdornment] = useState(false);
   const {
     data,
@@ -63,23 +61,27 @@ export const MuiInputText = React.memo((props: CellProps & WithClassname & MuiTe
   } else {
     inputProps = {};
   }
-
+  
   inputProps = merge(inputProps, muiInputProps);
-
+  
   if (appliedUiSchemaOptions.trim && maxLength !== undefined) {
     inputProps.size = maxLength;
-  }
-  const onChange = (ev: any) => handleChange(path, ev.target.value);
+  };
+  
+  const [inputText, onChange, onClear] = useDebouncedChange(handleChange, '', data, path);
+  const onPointerEnter = () => setShowAdornment(true);
+  const onPointerLeave = () => setShowAdornment(false);
 
   const theme: JsonFormsTheme = useTheme();
-  const inputDeleteBackgroundColor = theme.jsonforms?.input?.delete?.background || theme.palette.background.default;
+  
+  const closeStyle = {background: theme.jsonforms?.input?.delete?.background || theme.palette.background.default, borderRadius: '50%'};
 
   return (
     <Input
       type={
         appliedUiSchemaOptions.format === 'password' ? 'password' : 'text'
       }
-      value={data || ''}
+      value={inputText}
       onChange={onChange}
       className={className}
       id={id}
@@ -89,8 +91,8 @@ export const MuiInputText = React.memo((props: CellProps & WithClassname & MuiTe
       fullWidth={!appliedUiSchemaOptions.trim || maxLength === undefined}
       inputProps={inputProps}
       error={!isValid}
-      onPointerEnter={() => setShowAdornment(true) }
-      onPointerLeave={() => setShowAdornment(false) }
+      onPointerEnter={onPointerEnter}
+      onPointerLeave={onPointerLeave}
       endAdornment={
         <InputAdornment
           position='end'
@@ -103,13 +105,13 @@ export const MuiInputText = React.memo((props: CellProps & WithClassname & MuiTe
         >
           <IconButton
             aria-label='Clear input field'
-            onClick={() => handleChange(path, undefined)}   
+            onClick={onClear}   
           >
-            <Close style={{background: inputDeleteBackgroundColor, borderRadius: '50%'}}/>
+            <Close style={closeStyle}/>
           </IconButton>
         </InputAdornment>
       }
       inputComponent={inputComponent}
     />
   );
-}, areEqual);
+});

package/src/mui-controls/MuiInputTime.tsx

@@ -25,8 +25,8 @@
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
 import Input from '@material-ui/core/Input';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
+import { useDebouncedChange } from '../util';
 
 export const MuiInputTime = React.memo((props: CellProps & WithClassname) => {
   const {
@@ -40,11 +40,13 @@ export const MuiInputTime = React.memo((props: CellProps & WithClassname) => {
     config
   } = props;
   const appliedUiSchemaOptions = merge({}, config, uischema.options);
+  const [inputValue, onChange] = useDebouncedChange(handleChange, '', data, path);
+
   return (
     <Input
       type='time'
-      value={data || ''}
-      onChange={ev => handleChange(path, ev.target.value)}
+      value={inputValue}
+      onChange={onChange}
       className={className}
       id={id}
       disabled={!enabled}
@@ -52,4 +54,4 @@ export const MuiInputTime = React.memo((props: CellProps & WithClassname) => {
       fullWidth={true}
     />
   );
-}, areEqual);
+});

package/src/mui-controls/MuiSelect.tsx

@@ -27,7 +27,6 @@ import { EnumCellProps, WithClassname } from '@jsonforms/core';
 
 import Select from '@material-ui/core/Select';
 import { MenuItem } from '@material-ui/core';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
 
 export const MuiSelect = React.memo((props: EnumCellProps & WithClassname) => {
@@ -50,7 +49,7 @@ export const MuiSelect = React.memo((props: EnumCellProps & WithClassname) => {
       id={id}
       disabled={!enabled}
       autoFocus={appliedUiSchemaOptions.focus}
-      value={data || ''}
+      value={data !== undefined ? data : ''}
       onChange={ev => handleChange(path, ev.target.value)}
       fullWidth={true}
     >
@@ -63,4 +62,4 @@ export const MuiSelect = React.memo((props: EnumCellProps & WithClassname) => {
       )}
     </Select>
   );
-}, areEqual);
+});

package/src/mui-controls/MuiToggle.tsx

@@ -25,7 +25,6 @@
 import React from 'react';
 import { CellProps, WithClassname } from '@jsonforms/core';
 import Switch from '@material-ui/core/Switch';
-import { areEqual } from '@jsonforms/react';
 import merge from 'lodash/merge';
 
 export const MuiToggle = React.memo((props: CellProps & WithClassname) => {
@@ -53,4 +52,4 @@ export const MuiToggle = React.memo((props: CellProps & WithClassname) => {
       inputProps={inputProps}
     />
   );
-}, areEqual);
+});

package/src/util/debounce.ts

@@ -0,0 +1,43 @@
+/*
+  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.
+*/
+import { debounce } from 'lodash';
+import { useState, useCallback, useEffect } from 'react'
+
+
+const eventToValue = (ev: any) => ev.target.value;
+export const useDebouncedChange = (handleChange: (path: string, value: any) => void, defaultValue: any, data: any, path: string, eventToValueFunction: (ev: any) => any = eventToValue, timeout = 300): [any, React.ChangeEventHandler, () => void] => {
+  const [input, setInput] = useState(data ?? defaultValue);
+  useEffect(() => {
+    setInput(data ?? defaultValue);
+  }, [data]);
+  const debouncedUpdate = useCallback(debounce((newValue: string) => handleChange(path, newValue), timeout), [handleChange, path, timeout]);
+  const onChange = useCallback((ev: any) => {
+    const newValue = eventToValueFunction(ev);
+    setInput(newValue ?? defaultValue);
+    debouncedUpdate(newValue);
+  }, [debouncedUpdate, eventToValueFunction]);
+  const onClear = useCallback(() => { setInput(defaultValue); handleChange(path, undefined) }, [defaultValue, handleChange, path]);
+  return [input, onChange, onClear];
+};