Merge pull request #775 from rvsia/convertInitialValue

fix(manager): convert initialValue/defaultValue when dataType

Author: Hyperkid123

packages/form-state-manager/src/files/use-field.ts

@@ -3,8 +3,8 @@ import FormManagerContext from '../files/form-manager-context';
 import UseField, { OnChangeEvent, UseFieldData, Format } from '../types/use-field';
 import isEmpty from 'lodash/isEmpty';
 
-import convertType from '../utils/convert-type';
 import generateId from '../utils/generate-id';
+import convertValue from '../utils/convert-value';
 
 const checkboxTypes = ['checkbox', 'radio'];
 
@@ -75,13 +75,13 @@ const useField = ({
 
     registerField({
       name,
-      initialValue,
+      initialValue: dataType ? convertValue(initialValue, dataType) : initialValue,
       initializeOnMount,
       render,
       validate,
       subscription,
       internalId,
-      defaultValue,
+      defaultValue: dataType ? convertValue(defaultValue, dataType) : defaultValue,
       beforeSubmit,
       afterSubmit
     });
@@ -98,9 +98,7 @@ const useField = ({
     const hasClearedValue = Object.prototype.hasOwnProperty.call(props, 'clearedValue') || Object.prototype.hasOwnProperty.call(rest, 'clearedValue');
 
     if (dataType) {
-      sanitizedValue = Array.isArray(sanitizedValue)
-        ? sanitizedValue.map((item) => convertType(dataType, sanitizeValue(item)))
-        : convertType(dataType, sanitizedValue);
+      sanitizedValue = convertValue(sanitizedValue, dataType);
     }
 
     if (hasClearedValue && checkEmpty(sanitizedValue) && typeof state?.meta.initial === 'undefined') {

packages/form-state-manager/src/tests/files/use-field.test.js

@@ -672,6 +672,36 @@ describe('useField', () => {
 
       expect(managerApi().values.field).toEqual([1, 2, 45]);
     });
+
+    it('should parse initialValue - float', async () => {
+      wrapper = mount(
+        <FormManagerContext.Provider value={{ ...managerApi(), formOptions: managerApi }}>
+          <Setter name="field" dataType="float" initialValue="12.34" />
+        </FormManagerContext.Provider>
+      );
+
+      expect(managerApi().values.field).toEqual(12.34);
+    });
+
+    it('should parse defaultValue - float', async () => {
+      wrapper = mount(
+        <FormManagerContext.Provider value={{ ...managerApi(), formOptions: managerApi }}>
+          <Setter name="field" dataType="float" defaultValue="12.34" />
+        </FormManagerContext.Provider>
+      );
+
+      expect(managerApi().values.field).toEqual(12.34);
+    });
+
+    it('should parse defaultValue - objects', async () => {
+      wrapper = mount(
+        <FormManagerContext.Provider value={{ ...managerApi(), formOptions: managerApi }}>
+          <Setter name="field" dataType="float" defaultValue={[{ value: '23.67' }, { value: '123.34' }]} />
+        </FormManagerContext.Provider>
+      );
+
+      expect(managerApi().values.field).toEqual([{ value: 23.67 }, { value: 123.34 }]);
+    });
   });
 
   describe('type', () => {

packages/form-state-manager/src/types/data-types.d.ts

@@ -1,4 +1,8 @@
+import AnyObject from './any-object';
+
 export type DataType = 'integer' | 'float' | 'number' | 'boolean' | 'string';
+export type BasicTypes = number | boolean | string;
+export type DataTypeTypes = BasicTypes | AnyObject | Array<BasicTypes>;
 
 interface dataTypes {
   INTEGER: 'integer';

packages/form-state-manager/src/utils/convert-value.ts

@@ -0,0 +1,23 @@
+import convertType from './convert-type';
+import { DataType, DataTypeTypes } from '../types/data-types';
+
+const convertValue = (value: any, dataType: DataType): DataTypeTypes => {
+  if (value === undefined || !dataType) {
+    return value;
+  }
+
+  if (Array.isArray(value)) {
+    return value.map((value) =>
+      typeof value === 'object'
+        ? {
+            ...value,
+            value: Object.prototype.hasOwnProperty.call(value, 'value') ? convertType(dataType, value.value) : value
+          }
+        : convertType(dataType, value)
+    );
+  }
+
+  return convertType(dataType, value);
+};
+
+export default convertValue;