Change checkEmpty to return bool

Author: Hyperkid123

packages/react-form-renderer/demo/index.js

@@ -27,7 +27,7 @@ const App = () => (
             initialValues={{
                 text_box_1: 'hue'
             }}
-            deletedValue={null}
+            deletedValue={'bla'}
             layoutMapper={layoutMapper}
             formFieldsMapper={formFieldsMapper}
             onSubmit={console.log}

packages/react-form-renderer/src/form-renderer/enhanced-on-change.js

@@ -48,34 +48,29 @@ const convertType = (dataType, value) => ({
  */
 const checkEmpty = value => {
   if (typeof value === 'number') {
-    return value;
+    return false;
   }
 
   if (typeof value === 'string' && value.length > 0) {
-    return value;
+    return false;
   }
 
   if (!isEmpty(value)) {
-    return value;
+    return false;
   }
 
-  return undefined;
+  return true;
 };
 
 /**
  * Casts input value into selected data type
- * @param {FieldDataTypes} dataType intended data type of output value
- * @param {Function} onChange original function to be modified
- * @param {Any} initial initial value of field
- * @param {Any} value value to be type casted
- * @param  {...any} args rest of orininal function arguments
  */
-const enhancedOnChange = (dataType, onChange, initial, deletedValue, value, ...args) => {
+const enhancedOnChange = ({ dataType, onChange, initial, deletedValue, dirty, ...rest }, value, ...args) => {
   const sanitizedValue = sanitizeValue(value);
   const result = Array.isArray(sanitizedValue)
     ? sanitizedValue.map(item => convertType(dataType, sanitizeValue(item)))
     : convertType(dataType, sanitizedValue);
-  if (typeof checkEmpty(result) === 'undefined' && typeof initial !== 'undefined') {
+  if (checkEmpty(result) && typeof initial !== 'undefined') {
     return onChange(deletedValue, ...args);
   }
 

packages/react-form-renderer/src/form-renderer/field-provider.js

@@ -29,7 +29,13 @@ class FieldProvider extends Component{
           input={{
             ...input,
             onChange: (...args) => {
-              enhancedOnChange(dataType, onChange, fieldsProps.meta.initial, this.props.formOptions.deletedValue, ...args);
+              enhancedOnChange({
+                ...fieldsProps.meta,
+                dataType,
+                onChange,
+                deletedValue: this.props.formOptions.deletedValue,
+              }, ...args);
+              // enhancedOnChange(dataType, onChange, fieldsProps.meta.initial, this.props.formOptions.deletedValue, ...args);
             },
           }}
         />
@@ -41,7 +47,13 @@ class FieldProvider extends Component{
         ...fieldsProps,
         input: {
           ...input,
-          onChange: (...args) => enhancedOnChange(dataType, onChange, fieldsProps.meta.initial, this.props.formOptions.deletedValue, ...args),
+          onChange: (...args) =>
+            enhancedOnChange({
+              ...fieldsProps.meta,
+              dataType,
+              onChange,
+              deletedValue: this.props.formOptions.deletedValue,
+            }, ...args),
         },
       }) } />;
     }
@@ -53,7 +65,13 @@ class FieldProvider extends Component{
           Children.only(
             <ChildComponent
               { ...fieldsProps }
-              input={{ ...input, onChange: (...args) => enhancedOnChange(dataType, onChange, fieldsProps.meta.initial, this.props.formOptions.deletedValue, ...args)  }}
+              input={{ ...input, onChange: (...args) =>
+                enhancedOnChange({
+                  ...fieldsProps.meta,
+                  dataType,
+                  onChange,
+                  deletedValue: this.props.formOptions.deletedValue,
+                }, ...args)  }}
             />
           ) }
       </Field>

packages/react-form-renderer/src/tests/form-renderer/enhanced-on-change.test.js

@@ -2,10 +2,10 @@ import enhancedOnChange from '../../form-renderer/enhanced-on-change';
 
 describe('#enhancedOnChange', () => {
   const deletedValue = 'this is deleted value';
-  const initialValue = 'some initial value';
+  const initial = 'some initial value';
   it('should return value directly if event is not passed', () => {
     const value = 'foo';
-    expect(enhancedOnChange(undefined, value => value, undefined, deletedValue, value)).toEqual('foo');
+    expect(enhancedOnChange({ onChange: value => value, deletedValue }, value)).toEqual('foo');
   });
 
   it('should return value from event if input is of type checkbox', () => {
@@ -16,7 +16,7 @@ describe('#enhancedOnChange', () => {
         checked: false,
       },
     };
-    expect(enhancedOnChange(undefined, value => value, undefined, deletedValue, value)).toEqual(false);
+    expect(enhancedOnChange({ onChange: value => value, deletedValue }, value)).toEqual(false);
   });
 
   it('should return value from event', () => {
@@ -26,49 +26,49 @@ describe('#enhancedOnChange', () => {
         checked: 'not me',
       },
     };
-    expect(enhancedOnChange(undefined, value => value, undefined, deletedValue, value)).toEqual('Me');
+    expect(enhancedOnChange({ onChange: value => value, deletedValue }, value)).toEqual('Me');
   });
 
   it('should correctly convert array datatype from strings to integers', () => {
     const value = [ '1', '2', 3 ];
-    expect(enhancedOnChange('integer', value => value, undefined, deletedValue, value)).toEqual([ 1, 2, 3 ]);
+    expect(enhancedOnChange({ dataType: 'integer', onChange: value => value, deletedValue }, value)).toEqual([ 1, 2, 3 ]);
   });
 
   describe('#setting delete value', () => {
     it('should not set any delete value after sending empty value', () => {
       const value = undefined;
-      expect(enhancedOnChange(undefined, value => value, undefined, deletedValue, value)).toEqual(undefined);
+      expect(enhancedOnChange({ onChange: value => value, deletedValue }, value)).toEqual(undefined);
     });
 
     it('should set delete value after sending empty string value', () => {
       const value = undefined;
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, value)).toEqual(deletedValue);
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, '')).toEqual(deletedValue);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, value)).toEqual(deletedValue);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, '')).toEqual(deletedValue);
     });
 
     it('should not set delete value after sending number 0', () => {
       const value = 0;
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, value)).toEqual(value);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, value)).toEqual(value);
     });
 
     it('should set delete value after sending empty array', () => {
       const value = [];
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, value)).toEqual(deletedValue);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, value)).toEqual(deletedValue);
     });
 
     it('should set delete value after sending empty object', () => {
       const value = {};
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, value)).toEqual(deletedValue);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, value)).toEqual(deletedValue);
     });
 
     it('should not set delete value after sending array', () => {
       const value = [ 1, 2, 'foo' ];
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, value)).toEqual(value);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, value)).toEqual(value);
     });
 
     it('should not set delete value after sending object', () => {
       const value = { foo: 'bar' };
-      expect(enhancedOnChange(undefined, value => value, initialValue, deletedValue, value)).toEqual(value);
+      expect(enhancedOnChange({ onChange: value => value, initial, deletedValue }, value)).toEqual(value);
     });
   });
 });