chore: fix ts def (#408)

* chore: fix ts def

* chore: bump typescript

Author: zombieJ

package.json

@@ -57,8 +57,8 @@
     "@types/enzyme": "^3.10.5",
     "@types/jest": "^26.0.20",
     "@types/lodash": "^4.14.135",
-    "@types/react": "^16.8.19",
-    "@types/react-dom": "^16.8.4",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
     "@umijs/fabric": "^2.5.2",
     "@umijs/test": "^3.2.27",
     "dumi": "^1.1.0",
@@ -78,6 +78,6 @@
     "react-redux": "^4.4.10",
     "react-router": "^3.0.0",
     "redux": "^3.7.2",
-    "typescript": "^3.5.2"
+    "typescript": "^4.6.3"
   }
 }

src/Form.tsx

@@ -13,7 +13,7 @@ import type { FormContextProps } from './FormContext';
 import FormContext from './FormContext';
 import { isSimilar } from './utils/valueUtil';
 
-type BaseFormProps = Omit<React.FormHTMLAttributes<HTMLFormElement>, 'onSubmit'>;
+type BaseFormProps = Omit<React.FormHTMLAttributes<HTMLFormElement>, 'onSubmit' | 'children'>;
 
 type RenderProps = (values: Store, form: FormInstance) => JSX.Element | React.ReactNode;
 
@@ -117,11 +117,13 @@ const Form: React.ForwardRefRenderFunction<FormInstance, FormProps> = (
   );
 
   // Prepare children by `children` type
-  let childrenNode = children;
+  let childrenNode: React.ReactNode;
   const childrenRenderProps = typeof children === 'function';
   if (childrenRenderProps) {
     const values = formInstance.getFieldsValue(true);
     childrenNode = (children as RenderProps)(values, formInstance);
+  } else {
+    childrenNode = children;
   }
 
   // Not use subscribe when using render props

src/FormContext.tsx

@@ -17,6 +17,7 @@ export interface FormProviderProps {
   validateMessages?: ValidateMessages;
   onFormChange?: (name: string, info: FormChangeInfo) => void;
   onFormFinish?: (name: string, info: FormFinishInfo) => void;
+  children?: React.ReactNode;
 }
 
 export interface FormContextProps extends FormProviderProps {