From 657125c349f036ded453afc6ad210830c00af8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82?= <michal.warda@elpassion.pl>
Date: Mon, 18 Feb 2019 11:05:16 +0100
Subject: [PATCH] Add Form component FormData generic typing

---
 src/ReactFinalForm.d.test.tsx | 26 ++++++++++++++++++++++++++
 src/index.d.ts                |  8 ++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/ReactFinalForm.d.test.tsx b/src/ReactFinalForm.d.test.tsx
index f3cf0e20..38939bdf 100644
--- a/src/ReactFinalForm.d.test.tsx
+++ b/src/ReactFinalForm.d.test.tsx
@@ -116,3 +116,29 @@ function mutated() {
     </Form>
   )
 }
+
+// with typed form data
+
+const typedOnSubmit = (values: { firstName: string }) => {
+  console.log(values)
+}
+
+function withTypedFormData() {
+  return (
+    <Form<{ firstName: string }> onSubmit={typedOnSubmit}>
+      {({ handleSubmit }) => (
+        <form onSubmit={handleSubmit}>
+          <div>
+            <label>First Name</label>
+            <Field
+              name="firstName"
+              component="input"
+              type="text"
+              placeholder="First Name"
+            />
+          </div>
+        </form>
+      )}
+    </Form>
+  )
+}
diff --git a/src/index.d.ts b/src/index.d.ts
index b3f34264..412b0542 100644
--- a/src/index.d.ts
+++ b/src/index.d.ts
@@ -69,7 +69,9 @@ export interface RenderableProps<T> {
   render?: (props: T) => React.ReactNode
 }
 
-export interface FormProps extends Config, RenderableProps<FormRenderProps> {
+export interface FormProps<FormData = object>
+  extends Config<FormData>,
+    RenderableProps<FormRenderProps> {
   subscription?: FormSubscription
   decorators?: Decorator[]
   initialValuesEqual?: (a?: object, b?: object) => boolean
@@ -94,7 +96,9 @@ export interface FormSpyProps extends RenderableProps<FormSpyRenderProps> {
 }
 
 export var Field: React.ComponentType<FieldProps>
-export var Form: React.ComponentType<FormProps>
+export class Form<FormData = object> extends React.Component<
+  FormProps<FormData>
+> {}
 export var FormSpy: React.ComponentType<FormSpyProps>
 export var version: string