fix(v5): Fix form types (#5350)

* fix(Form): Fix types * Remove extra props
react-bootstrap · Aug 1, 2020 · 835d397 · 835d397
1 parent 5c5e7ec
commit 835d397
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/Form.tsx b/src/Form.tsx
@@ -16,7 +16,9 @@ export interface FormProps extends React.HTMLAttributes<HTMLElement>, AsProp {
   validated?: boolean;
 }
 
-type Form = {
+type Form = React.ForwardRefExoticComponent<
+  FormProps & React.RefAttributes<HTMLElement>
+> & {
   Group: typeof FormGroup;
   Control: typeof FormControl;
   Check: typeof FormCheck;
@@ -26,9 +28,6 @@ type Form = {
   Text: typeof FormText;
   Range: typeof FormRange;
   Select: typeof FormSelect;
-  propTypes?: any;
-  defaultProps?: Partial<FormProps>;
-  displayName?: string;
 };
 
 const propTypes = {
@@ -72,7 +71,7 @@ const FormImpl: Form = (React.forwardRef(
 ) as unknown) as Form;
 
 FormImpl.displayName = 'Form';
-FormImpl.propTypes = propTypes;
+FormImpl.propTypes = propTypes as any;
 
 FormImpl.Group = FormGroup;
 FormImpl.Control = FormControl;

diff --git a/tests/simple-types-test.tsx b/tests/simple-types-test.tsx
@@ -358,12 +358,7 @@ const MegaComponent = () => (
       style={style}
     />
     <Figure.Caption as="figcaption" bsPrefix="figurecaption" />
-    <Form
-      ref={React.createRef<HTMLFormElement>()}
-      as="form"
-      validated
-      bsPrefix="form"
-    >
+    <Form ref={React.createRef<HTMLFormElement>()} as="form" validated>
       <Form.Group
         ref={React.createRef<HTMLDivElement>()}
         as="div"