Better data formatting and consistant data return

Author: lukefrogger

Diff for: README.md

@@ -53,6 +53,7 @@ const CustomFormLayout = () => {
 
     const onFinish = (values) => {
         console.log('values', values);
+        // To show an error on the form, return a message as a string.
     };
 
     return (

Diff for: package-lock.json

@@ -72,6 +72,7 @@
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.0.1",
     "react-scripts": "4.0.3",
-    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17"
+    "tailwindcss": "npm:@tailwindcss/postcss7-compat@^2.2.17",
+    "react": "^16.8.6"
   }
 }

Diff for: package.json

@@ -1,6 +1,6 @@
 import { BrowserRouter, Routes, Route } from 'react-router-dom';
 import ManagedForm from './examples/ManagedForm';
-import HookParent from './examples/hookForm/Parent';
+import HookParent from './examples/hookform/Parent';
 import Layout from './examples/components/Layout';
 
 function App() {

Diff for: src/App.js

@@ -2,11 +2,8 @@ import React from 'react';
 import { FetchForm, FetchFormsProvider } from '../lib/index';
 
 const ManagedForm = () => {
-  const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-
   const onSubmit = async (values) => {
-    await sleep(1000);
-    // Your logic here
+    /* return 'There was an error submitting the form'; */
     console.log('return values', values);
   };
   return (

Diff for: src/examples/ManagedForm.js

@@ -33,28 +33,28 @@ const FetchForm = ({ slug, showFormError, onSubmit }) => {
     const formattedValues = {
       ...values
     };
-    const keys = Object.keys(values);
-    for (let i = 0; i < keys.length; i++) {
-      if (typeof values[keys[i]] !== 'boolean' && !isNaN(values[keys[i]])) {
-        formattedValues[keys[i]] = parseInt(values[keys[i]]);
+    const valueKeys = Object.keys(values);
+
+    for (let i = 0; i < valueKeys.length; i++) {
+      const fieldType = fetchForm.formItems.find(
+        (item) => item.name === valueKeys[i]
+      );
+
+      if (fieldType.type === 'number') {
+        formattedValues[valueKeys[i]] = parseInt(values[valueKeys[i]]);
       } else {
-        formattedValues[keys[i]] = values[keys[i]];
+        formattedValues[valueKeys[i]] = values[valueKeys[i]];
       }
     }
 
-    if (fetchForm.cloudSave) {
-      try {
+    try {
+      if (fetchForm.cloudSave) {
         const isSaved = await doCloudSubmit(fetchForm.id, formattedValues);
         if (!isSaved.success) {
           throw isSaved.message;
         }
-      } catch (err) {
-        console.log(err);
-        setSubmitError(err);
       }
-    }
 
-    try {
       const hasError = await onSubmit(formattedValues);
       if (hasError) {
         throw hasError;