From 1c012ab4f00b236f548506bdba14531ca4be664e Mon Sep 17 00:00:00 2001
From: FaithForHumans <vogel.spencer@gmail.com>
Date: Mon, 28 May 2018 23:29:43 -0500
Subject: [PATCH] Replacing reactstrap components with generics.

---
 types/reactstrap/lib/Alert.d.ts                | 15 +++++++--------
 types/reactstrap/lib/Badge.d.ts                |  7 ++++---
 types/reactstrap/lib/Breadcrumb.d.ts           |  7 ++++---
 types/reactstrap/lib/BreadcrumbItem.d.ts       |  7 ++++---
 types/reactstrap/lib/Button.d.ts               |  6 +++---
 types/reactstrap/lib/ButtonDropdown.d.ts       | 15 +++++----------
 types/reactstrap/lib/ButtonGroup.d.ts          |  7 ++++---
 types/reactstrap/lib/ButtonToolbar.d.ts        |  7 ++++---
 types/reactstrap/lib/Card.d.ts                 |  7 ++++---
 types/reactstrap/lib/CardBody.d.ts             |  7 ++++---
 types/reactstrap/lib/CardColumns.d.ts          |  7 ++++---
 types/reactstrap/lib/CardDeck.d.ts             |  7 ++++---
 types/reactstrap/lib/CardFooter.d.ts           |  7 ++++---
 types/reactstrap/lib/CardGroup.d.ts            |  7 ++++---
 types/reactstrap/lib/CardHeader.d.ts           |  7 ++++---
 types/reactstrap/lib/CardImg.d.ts              |  7 ++++---
 types/reactstrap/lib/CardImgOverlay.d.ts       |  7 ++++---
 types/reactstrap/lib/CardLink.d.ts             |  7 ++++---
 types/reactstrap/lib/CardSubtitle.d.ts         |  7 ++++---
 types/reactstrap/lib/CardText.d.ts             |  7 ++++---
 types/reactstrap/lib/CardTitle.d.ts            |  7 ++++---
 types/reactstrap/lib/Carousel.d.ts             |  6 +++---
 types/reactstrap/lib/CarouselCaption.d.ts      |  7 ++++---
 types/reactstrap/lib/CarouselControl.d.ts      |  7 ++++---
 types/reactstrap/lib/CarouselIndicators.d.ts   |  7 ++++---
 types/reactstrap/lib/CarouselItem.d.ts         |  2 +-
 types/reactstrap/lib/Col.d.ts                  |  8 +++++---
 types/reactstrap/lib/Collapse.d.ts             |  6 +++---
 types/reactstrap/lib/Container.d.ts            |  7 ++++---
 types/reactstrap/lib/Dropdown.d.ts             | 18 +++++++-----------
 types/reactstrap/lib/DropdownItem.d.ts         |  6 +++---
 types/reactstrap/lib/DropdownMenu.d.ts         |  7 ++++---
 types/reactstrap/lib/DropdownToggle.d.ts       |  6 +++---
 types/reactstrap/lib/Fade.d.ts                 |  7 ++++---
 types/reactstrap/lib/Form.d.ts                 |  6 +++---
 types/reactstrap/lib/FormFeedback.d.ts         |  7 ++++---
 types/reactstrap/lib/FormGroup.d.ts            |  7 ++++---
 types/reactstrap/lib/FormText.d.ts             |  7 ++++---
 types/reactstrap/lib/Input.d.ts                |  6 +++---
 types/reactstrap/lib/InputGroup.d.ts           |  7 ++++---
 types/reactstrap/lib/InputGroupAddon.d.ts      |  7 ++++---
 .../lib/InputGroupButtonDropdown.d.ts          |  7 ++++---
 types/reactstrap/lib/InputGroupText.d.ts       |  7 ++++---
 types/reactstrap/lib/Jumbotron.d.ts            |  7 ++++---
 types/reactstrap/lib/Label.d.ts                | 11 ++++++-----
 types/reactstrap/lib/ListGroup.d.ts            |  7 ++++---
 types/reactstrap/lib/ListGroupItem.d.ts        |  7 ++++---
 types/reactstrap/lib/ListGroupItemHeading.d.ts |  7 ++++---
 types/reactstrap/lib/ListGroupItemText.d.ts    |  7 ++++---
 types/reactstrap/lib/Media.d.ts                |  7 ++++---
 types/reactstrap/lib/Modal.d.ts                |  6 +++---
 types/reactstrap/lib/ModalBody.d.ts            |  7 ++++---
 types/reactstrap/lib/ModalFooter.d.ts          |  7 ++++---
 types/reactstrap/lib/ModalHeader.d.ts          |  7 ++++---
 types/reactstrap/lib/Nav.d.ts                  |  7 ++++---
 types/reactstrap/lib/NavItem.d.ts              |  7 ++++---
 types/reactstrap/lib/NavLink.d.ts              |  6 +++---
 types/reactstrap/lib/Navbar.d.ts               |  7 ++++---
 types/reactstrap/lib/NavbarBrand.d.ts          |  7 ++++---
 types/reactstrap/lib/NavbarToggler.d.ts        |  7 ++++---
 types/reactstrap/lib/Pagination.d.ts           |  7 ++++---
 types/reactstrap/lib/PaginationItem.d.ts       |  7 ++++---
 types/reactstrap/lib/PaginationLink.d.ts       |  7 ++++---
 types/reactstrap/lib/Popover.d.ts              |  6 +++---
 types/reactstrap/lib/PopoverBody.d.ts          |  7 ++++---
 types/reactstrap/lib/PopoverHeader.d.ts        |  7 ++++---
 types/reactstrap/lib/Progress.d.ts             |  6 +++---
 types/reactstrap/lib/Row.d.ts                  |  7 ++++---
 types/reactstrap/lib/TabContent.d.ts           |  6 +++---
 types/reactstrap/lib/TabPane.d.ts              |  7 ++++---
 types/reactstrap/lib/Table.d.ts                |  7 ++++---
 types/reactstrap/lib/Tag.d.ts                  |  7 ++++---
 types/reactstrap/lib/Tooltip.d.ts              | 14 ++++++--------
 types/reactstrap/lib/Uncontrolled.d.ts         |  8 ++++----
 types/reactstrap/reactstrap-tests.tsx          |  2 +-
 75 files changed, 294 insertions(+), 249 deletions(-)

diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index 2a5a0f8dde..73d3469473 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   color?: string;
@@ -8,15 +9,13 @@ export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
   transitionAppearTimeout?: number;
   transitionEnterTimeout?: number;
   transitionLeaveTimeout?: number;
-}
-export interface UncontrolledAlertProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+} & T;
+export type UncontrolledAlertProps<T = {}> = UncontrolledProps<T>;
 
-export interface AlertProps extends UncontrolledAlertProps {
+export type AlertProps<T = {}> = UncontrolledAlertProps<T> & {
   isOpen?: boolean;
   toggle?: () => void;
-}
+};
 
-declare const Alert: React.StatelessComponent<AlertProps>;
+declare class Alert<T = {}> extends React.Component<AlertProps<T>> {}
 export default Alert;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index f45c418c52..eccd2ea240 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface BadgeProps extends React.HTMLAttributes<HTMLElement> {
+export type BadgeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Badge: React.StatelessComponent<BadgeProps>;
+declare class Badge<T = {}> extends React.Component<BadgeProps<T>> {}
 export default Badge;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index 74e770de4f..be7c1aab89 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
+export type BreadcrumbProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Breadcrumb: React.StatelessComponent<BreadcrumbProps>;
+declare class Breadcrumb<T = {}> extends React.Component<BreadcrumbProps<T>> {}
 export default Breadcrumb;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index ab2e9cbc4e..614ca34b99 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
+export type BreadcrumbItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
@@ -8,7 +9,7 @@ export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
   // if a is passed as a string
   // this could be href
   [others: string]: any;
-}
+} & T;
 
-declare const BreadcrumbItem: React.StatelessComponent<BreadcrumbItemProps>;
+declare class BreadcrumbItem<T = {}> extends React.Component<BreadcrumbItemProps<T>> {}
 export default BreadcrumbItem;
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index bf75bcec8e..43075dc3dc 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
+export type ButtonProps<T = {}> = React.HTMLProps<HTMLButtonElement> & {
   outline?: boolean;
   active?: boolean;
   block?: boolean;
@@ -16,7 +16,7 @@ export interface ButtonProps extends React.HTMLProps<HTMLButtonElement> {
   style?: React.CSSProperties;
 
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Button extends React.Component<ButtonProps> {}
+declare class Button<T = {}> extends React.Component<ButtonProps<T>> {}
 export default Button;
diff --git a/types/reactstrap/lib/ButtonDropdown.d.ts b/types/reactstrap/lib/ButtonDropdown.d.ts
index fd09d6da8f..ebae860bc7 100644
--- a/types/reactstrap/lib/ButtonDropdown.d.ts
+++ b/types/reactstrap/lib/ButtonDropdown.d.ts
@@ -1,15 +1,10 @@
+import * as React from 'react';
 import { UncontrolledDropdownProps, DropdownProps } from './Dropdown';
 
-export interface UncontrolledProps extends UncontrolledDropdownProps {
-  /* intentionally blank */
-}
-export interface UncontrolledButtonDropdownProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+export type UncontrolledProps<T = {}> = UncontrolledDropdownProps<T>;
+export type UncontrolledButtonDropdownProps<T = {}> = UncontrolledProps<T>;
 
-export interface ButtonDropdownProps extends DropdownProps {
-  /* intentionally blank */
-}
+export type ButtonDropdownProps<T = {}> = DropdownProps<T>;
 
-declare const ButtonDropdown: React.StatelessComponent<ButtonDropdownProps>;
+declare class ButtonDropdown<T = {}> extends React.Component<ButtonDropdownProps<T>> {}
 export default ButtonDropdown;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index 10549f5347..27053d271c 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type ButtonGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
@@ -8,7 +9,7 @@ export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
   role?: string;
   size?: string;
   vertical?: boolean;
-}
+} & T;
 
-declare const ButtonGroup: React.StatelessComponent<ButtonGroupProps>;
+declare class ButtonGroup<T = {}> extends React.Component<ButtonGroupProps<T>> {}
 export default ButtonGroup;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index ebd8733b28..ea258a7c49 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ButtonToolbarProps extends React.HTMLAttributes<HTMLElement> {
+export type ButtonToolbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
   role?: string;
-}
+} & T;
 
-declare const ButtonToolbar: React.StatelessComponent<ButtonToolbarProps>;
+declare class ButtonToolbar<T = {}> extends React.Component<ButtonToolbarProps<T>> {}
 export default ButtonToolbar;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 0387ae3e94..269a524087 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardProps extends React.HTMLAttributes<HTMLElement> {
+export type CardProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   inverse?: boolean;
   color?: string;
@@ -10,7 +11,7 @@ export interface CardProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   style?: React.CSSProperties;
-}
+} & T;
 
-declare const Card: React.StatelessComponent<CardProps>;
+declare class Card<T = {}> extends React.Component<CardProps<T>> {}
 export default Card;
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index d95ac0d31b..3890cf4650 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardBodyProps extends React.HTMLAttributes<HTMLElement> {
+export type CardBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardBody: React.StatelessComponent<CardBodyProps>;
+declare class CardBody<T = {}> extends React.Component<CardBodyProps<T>> {}
 export default CardBody;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index 19f53cc250..be4688edb3 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardColumnsProps extends React.HTMLAttributes<HTMLElement> {
+export type CardColumnsProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardColumns: React.StatelessComponent<CardColumnsProps>;
+declare class CardColumns<T = {}> extends React.Component<CardColumnsProps<T>> {}
 export default CardColumns;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index 09b3d39c34..28882603b1 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardDeckProps extends React.HTMLAttributes<HTMLElement> {
+export type CardDeckProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardDeck: React.StatelessComponent<CardDeckProps>;
+declare class CardDeck<T = {}> extends React.Component<CardDeckProps<T>> {}
 export default CardDeck;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index f1ee324f03..9268ed4e70 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardFooterProps extends React.HTMLAttributes<HTMLElement> {
+export type CardFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardFooter: React.StatelessComponent<CardFooterProps>;
+declare class CardFooter<T = {}> extends React.Component<CardFooterProps<T>> {}
 export default CardFooter;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index 5bf83900bf..6e0d422656 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type CardGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardGroup: React.StatelessComponent<CardGroupProps>;
+declare class CardGroup<T = {}> extends React.Component<CardGroupProps<T>> {}
 export default CardGroup;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index d630954e78..821b2d809f 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardHeaderProps extends React.HTMLAttributes<HTMLElement> {
+export type CardHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardHeader: React.StatelessComponent<CardHeaderProps>;
+declare class CardHeader<T = {}> extends React.Component<CardHeaderProps<T>> {}
 export default CardHeader;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index b4b7021232..e9242704b4 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
+export type CardImgProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   top?: boolean;
   bottom?: boolean;
@@ -10,7 +11,7 @@ export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
   width?: string;
   height?: string;
   alt?: string;
-}
+} & T;
 
-declare const CardImg: React.StatelessComponent<CardImgProps>;
+declare class CardImg<T = {}> extends React.Component<CardImgProps<T>> {}
 export default CardImg;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index ccc76fa9c9..7e252f6248 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardImgOverlayProps extends React.HTMLAttributes<HTMLElement> {
+export type CardImgOverlayProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardImgOverlay: React.StatelessComponent<CardImgOverlayProps>;
+declare class CardImgOverlay<T = {}> extends React.Component<CardImgOverlayProps<T>> {}
 export default CardImgOverlay;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 1a24b55658..256d55d31c 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardLinkProps extends React.HTMLAttributes<HTMLElement> {
+export type CardLinkProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLAnchorElement>;
   className?: string;
   cssModule?: CSSModule;
   href?: string;
-}
+} & T;
 
-declare const CardLink: React.StatelessComponent<CardLinkProps>;
+declare class CardLink<T = {}> extends React.Component<CardLinkProps<T>> {}
 export default CardLink;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index a237c29119..a5285469cd 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardSubtitleProps extends React.HTMLAttributes<HTMLElement> {
+export type CardSubtitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardSubtitle: React.StatelessComponent<CardSubtitleProps>;
+declare class CardSubtitle<T = {}> extends React.Component<CardSubtitleProps<T>> {}
 export default CardSubtitle;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index 462c1abef3..b09eea4de7 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardTextProps extends React.HTMLAttributes<HTMLElement> {
+export type CardTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardText: React.StatelessComponent<CardTextProps>;
+declare class CardText<T = {}> extends React.Component<CardTextProps<T>> {}
 export default CardText;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 68c5c6120c..6f3e91d26a 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CardTitleProps extends React.HTMLAttributes<HTMLElement> {
+export type CardTitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const CardTitle: React.StatelessComponent<CardTitleProps>;
+declare class CardTitle<T = {}> extends React.Component<CardTitleProps<T>> {}
 export default CardTitle;
diff --git a/types/reactstrap/lib/Carousel.d.ts b/types/reactstrap/lib/Carousel.d.ts
index 1f21364cdf..d4c8de35a5 100644
--- a/types/reactstrap/lib/Carousel.d.ts
+++ b/types/reactstrap/lib/Carousel.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselProps extends React.HTMLProps<HTMLElement> {
+export type CarouselProps<T = {}> = React.HTMLProps<HTMLElement> & {
     activeIndex?: number;
     next: () => void;
     previous: () => void;
@@ -13,7 +13,7 @@ export interface CarouselProps extends React.HTMLProps<HTMLElement> {
     mouseExit?: () => void;
     slide?: boolean;
     cssModule?: CSSModule
-}
+} & T;
 
-declare class Carousel extends React.Component<CarouselProps> {}
+declare class Carousel<T = {}> extends React.Component<CarouselProps<T>> {}
 export default Carousel;
diff --git a/types/reactstrap/lib/CarouselCaption.d.ts b/types/reactstrap/lib/CarouselCaption.d.ts
index 58be0e29b3..2d6eea7d7f 100644
--- a/types/reactstrap/lib/CarouselCaption.d.ts
+++ b/types/reactstrap/lib/CarouselCaption.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselCaptionProps extends React.HTMLProps<HTMLElement> {
+export type CarouselCaptionProps<T = {}> = React.HTMLProps<HTMLElement> & {
     captionHeader?: string;
     captionText: string;
     cssModule?: CSSModule;
-}
+} & T;
 
-declare const CarouselCaption: React.StatelessComponent<CarouselCaptionProps>;
+declare class CarouselCaption<T = {}> extends React.Component<CarouselCaptionProps<T>> {}
 export default CarouselCaption;
diff --git a/types/reactstrap/lib/CarouselControl.d.ts b/types/reactstrap/lib/CarouselControl.d.ts
index 0e94fd5c70..1605c84dd0 100644
--- a/types/reactstrap/lib/CarouselControl.d.ts
+++ b/types/reactstrap/lib/CarouselControl.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselControlProps extends React.HTMLProps<HTMLElement> {
+export type CarouselControlProps<T = {}> = React.HTMLProps<HTMLElement> & {
     direction: 'prev' | 'next';
     onClickHandler: () => void;
     cssModule?: CSSModule;
     directionText: string;
-}
+} & T;
 
-declare const CarouselControl: React.StatelessComponent<CarouselControlProps>;
+declare class CarouselControl<T = {}> extends React.Component<CarouselControlProps<T>> {}
 export default CarouselControl;
diff --git a/types/reactstrap/lib/CarouselIndicators.d.ts b/types/reactstrap/lib/CarouselIndicators.d.ts
index 8a8ead6c06..34c8c16eef 100644
--- a/types/reactstrap/lib/CarouselIndicators.d.ts
+++ b/types/reactstrap/lib/CarouselIndicators.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CarouselIndicatorsProps extends React.HTMLProps<HTMLElement> {
+export type CarouselIndicatorsProps<T = {}> = React.HTMLProps<HTMLElement> & {
     items: object[];
     activeIndex: number;
     cssModule?: CSSModule;
     onClickHandler: (idx: number) => void;
-}
+} & T;
 
-declare const CarouselIndicators: React.StatelessComponent<CarouselIndicatorsProps>;
+declare class CarouselIndicators<T = {}> extends React.Component<CarouselIndicatorsProps<T>> {}
 export default CarouselIndicators;
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
index 88e93dfcf1..264d093695 100644
--- a/types/reactstrap/lib/CarouselItem.d.ts
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -17,5 +17,5 @@ export interface CarouselItemProps extends React.HTMLProps<HTMLElement>, Transit
     slide?: boolean;
 }
 
-declare class CarouselItem extends React.Component<CarouselItemProps> {}
+declare class CarouselItem<T = {}> extends React.Component<CarouselItemProps> {}
 export default CarouselItem;
diff --git a/types/reactstrap/lib/Col.d.ts b/types/reactstrap/lib/Col.d.ts
index 57829ac931..5e6a3e8ffa 100644
--- a/types/reactstrap/lib/Col.d.ts
+++ b/types/reactstrap/lib/Col.d.ts
@@ -1,3 +1,5 @@
+import * as React from 'react';
+
 export type ColumnProps
   = string
   | boolean
@@ -10,7 +12,7 @@ export type ColumnProps
     order?: string | number
   };
 
-export interface ColProps extends React.HTMLProps<HTMLDivElement> {
+export type ColProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   tag?: React.ReactType;
   xs?: ColumnProps;
   sm?: ColumnProps;
@@ -20,7 +22,7 @@ export interface ColProps extends React.HTMLProps<HTMLDivElement> {
 
   //custom widths
   widths?: string[];
-}
+} & T;
 
-declare const Col: React.StatelessComponent<ColProps>;
+declare class Col<T = {}> extends React.Component<ColProps<T>> {}
 export default Col;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index d83ff45666..8123c29b28 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface CollapseProps extends React.HTMLProps<HTMLElement> {
+export type CollapseProps<T = {}> = React.HTMLProps<HTMLElement> & {
   isOpen?: boolean;
   classNames?: string;
   cssModule?: CSSModule;
@@ -18,7 +18,7 @@ export interface CollapseProps extends React.HTMLProps<HTMLElement> {
   onExit?: () => void;
   onExiting?: () => void;
   onExited?: () => void;
-}
+} & T;
 
-declare class Collapse extends React.Component<CollapseProps> {}
+declare class Collapse<T = {}> extends React.Component<CollapseProps<T>> {}
 export default Collapse;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index df2114e773..5497f3e295 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ContainerProps extends React.HTMLAttributes<HTMLElement> {
+export type ContainerProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Container: React.StatelessComponent<ContainerProps>;
+declare class Container<T = {}> extends React.Component<ContainerProps<T>> {}
 export default Container;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 4d892fff5c..803ece5bf3 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -7,29 +7,25 @@ export type Direction =
   | "left"
   | "right"
 
-export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   toggle?: () => void;
   className?: string;
   cssModule?: CSSModule;
   nav?: boolean;
   inNavbar?: boolean;
-}
-export interface UncontrolledDropdownProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+} & T;
+export type UncontrolledDropdownProps<T = {}> = UncontrolledProps<T>;
 
-export interface Props extends UncontrolledProps {
+export type Props<T = {}> = UncontrolledProps<T> & {
   disabled?: boolean;
   direction?: Direction;
   group?: boolean;
   size?: string;
   tag?: React.ReactType;
   addonType?: boolean | 'prepend' | 'append';
-}
-export interface DropdownProps extends Props {
-  /* intentionally blank */
-}
+};
+export type DropdownProps<T = {}> = Props<T>;
 
-declare class Dropdown extends React.Component<DropdownProps> {}
+declare class Dropdown<T = {}> extends React.Component<DropdownProps<T>> {}
 export default Dropdown;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index 723e4707d4..d6b4344d59 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
+export type DropdownItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   disabled?: boolean;
   divider?: boolean;
   tag?: React.ReactType;
@@ -12,7 +12,7 @@ export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
   href?: string;
   toggle?: boolean;
   active?: boolean;
-}
+} & T;
 
-declare class DropdownItem extends React.Component<DropdownItemProps> {}
+declare class DropdownItem<T> extends React.Component<DropdownItemProps<T>> {}
 export default DropdownItem;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index 8d3cdb6acd..ffb493faa6 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface DropdownMenuProps extends React.HTMLAttributes<HTMLElement> {
+export type DropdownMenuProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   right?: boolean;
   className?: string;
   cssModule?: CSSModule;
   flip?: boolean;
-}
+} & T;
 
-declare const DropdownMenu: React.StatelessComponent<DropdownMenuProps>;
+declare class DropdownMenu<T = {}> extends React.Component<DropdownMenuProps<T>> {}
 export default DropdownMenu;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index d02edd50b2..cdb665c6ce 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
+export type DropdownToggleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   caret?: boolean;
   className?: string;
   cssModule?: CSSModule;
@@ -15,7 +15,7 @@ export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
   nav?: boolean;
   color?: string;
   size?: string;
-}
+} & T;
 
-declare class DropdownToggle extends React.Component<DropdownToggleProps> {}
+declare class DropdownToggle<T> extends React.Component<DropdownToggleProps<T>> {}
 export default DropdownToggle;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 05a13502e1..7e0d4ec775 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
+export type FadeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   in?: boolean;
   baseClass?: string;
   baseClassIn?: string;
@@ -15,7 +16,7 @@ export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
   transitionLeave?: boolean;
   onLeave?: () => void;
   onEnter?: () => void;
-}
+} & T;
 
-declare const Fade: React.StatelessComponent<FadeProps>;
+declare class Fade<T = {}> extends React.Component<FadeProps<T>> {}
 export default Fade;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index 3b6f846d08..2b6668b631 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormProps extends React.HTMLProps<HTMLFormElement> {
+export type FormProps<T = {}> = React.HTMLProps<HTMLFormElement> & {
   inline?: boolean;
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLFormElement>;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Form extends React.Component<FormProps> {}
+declare class Form<T> extends React.Component<FormProps<T>> {}
 export default Form;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index 946aab01d8..78e6f66676 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormFeedbackProps extends React.HTMLAttributes<HTMLElement> {
+export type FormFeedbackProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
   valid?: boolean;
-}
+} & T;
 
-declare const FormFeedback: React.StatelessComponent<FormFeedbackProps>;
+declare class FormFeedback<T = {}> extends React.Component<FormFeedbackProps<T>> {}
 export default FormFeedback;
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index 52c96f3060..b463487e07 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
+export type FormGroupProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   row?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -8,7 +9,7 @@ export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const FormGroup: React.StatelessComponent<FormGroupProps>;
+declare class FormGroup<T = {}> extends React.Component<FormGroupProps<T>> {}
 export default FormGroup;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index 99a3675d6b..378b67d8a8 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface FormTextProps extends React.HTMLAttributes<HTMLElement> {
+export type FormTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   inline?: boolean;
   tag?: React.ReactType;
   color?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const FormText: React.StatelessComponent<FormTextProps>;
+declare class FormText<T = {}> extends React.Component<FormTextProps<T>> {}
 export default FormText;
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 9d160ec2c4..87415b7e10 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -28,7 +28,7 @@ export type InputType =
   | 'time'
   | 'color';
 
-export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+export type InputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElement> & {
   type?: InputType;
   bsSize?: 'lg' | 'sm';
   state?: string;
@@ -40,7 +40,7 @@ export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement>
   addon?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Input extends React.Component<InputProps> {}
+declare class Input<T> extends React.Component<InputProps<T>> {}
 export default Input;
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 468b46f1c5..3a74adb3d8 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type InputGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   size?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const InputGroup: React.StatelessComponent<InputGroupProps>;
+declare class InputGroup<T = {}> extends React.Component<InputGroupProps<T>> {}
 export default InputGroup;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index 88b4f678c7..a76ae81a35 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupAddonProps extends React.HTMLAttributes<HTMLElement> {
+export type InputGroupAddonProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   addonType: 'prepend' | 'append';
-}
+} & T;
 
-declare const InputGroupAddon: React.StatelessComponent<InputGroupAddonProps>;
+declare class InputGroupAddon<T = {}> extends React.Component<InputGroupAddonProps<T>> {}
 export default InputGroupAddon;
diff --git a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
index 32a129d43d..2bd235f1f0 100644
--- a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
+++ b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
@@ -1,8 +1,9 @@
+import * as React from 'react';
 import { DropdownProps } from './Dropdown';
 
-export interface InputGroupButtonDropdownProps extends DropdownProps {
+export type InputGroupButtonDropdownProps<T = {}> = DropdownProps & {
     addonType: 'prepend' | 'append';
-}
+} & T;
 
-declare const InputGroupButtonDropdown: React.StatelessComponent<InputGroupButtonDropdownProps>;
+declare class InputGroupButtonDropdown<T = {}> extends React.Component<InputGroupButtonDropdownProps<T>> {}
 export default InputGroupButtonDropdown;
diff --git a/types/reactstrap/lib/InputGroupText.d.ts b/types/reactstrap/lib/InputGroupText.d.ts
index 356babe8f4..e8b5a7acfc 100644
--- a/types/reactstrap/lib/InputGroupText.d.ts
+++ b/types/reactstrap/lib/InputGroupText.d.ts
@@ -1,9 +1,10 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupTextProps extends React.HTMLAttributes<HTMLElement>  {
+export type InputGroupTextProps<T = {}> = React.HTMLAttributes<HTMLElement>  & {
   tag?: React.ReactType;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const InputGroupText: React.StatelessComponent<InputGroupTextProps>;
+declare class InputGroupText<T = {}> extends React.Component<InputGroupTextProps<T>> {}
 export default InputGroupText;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index 9145e73223..8b4fc45652 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface JumbotronProps extends React.HTMLAttributes<HTMLElement> {
+export type JumbotronProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Jumbotron: React.StatelessComponent<JumbotronProps>;
+declare class Jumbotron<T = {}> extends React.Component<JumbotronProps<T>> {}
 export default Jumbotron;
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index ae73e100f4..5669a63bad 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 import { ColumnProps } from './Col';
 
-interface Intermediate extends React.LabelHTMLAttributes<HTMLLabelElement> {
+type Intermediate = React.LabelHTMLAttributes<HTMLLabelElement> & {
   size?: any;
-}
+};
 
-export interface LabelProps extends Intermediate {
+export type LabelProps<T = {}> = Intermediate & {
   hidden?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -20,7 +21,7 @@ export interface LabelProps extends Intermediate {
   md?: ColumnProps;
   lg?: ColumnProps;
   xl?: ColumnProps;
-}
+} & T;
 
-declare const Label: React.StatelessComponent<LabelProps>;
+declare class Label<T = {}> extends React.Component<LabelProps<T>> {}
 export default Label;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index e9cb511cf0..2c69fcf294 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   flush?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ListGroup: React.StatelessComponent<ListGroupProps>;
+declare class ListGroup<T = {}> extends React.Component<ListGroupProps<T>> {}
 export default ListGroup;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index 045aa9539e..3d4553aa7b 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   active?: boolean;
   disabled?: boolean;
@@ -11,7 +12,7 @@ export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
   href?: string;
 
   onClick?: React.MouseEventHandler<any>;
-}
+} & T;
 
-declare const ListGroupItem: React.StatelessComponent<ListGroupItemProps>;
+declare class ListGroupItem<T = {}> extends React.Component<ListGroupItemProps<T>> {}
 export default ListGroupItem;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index 09e29f9434..c4f04e0330 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupItemHeadingProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupItemHeadingProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ListGroupItemHeading: React.StatelessComponent<ListGroupItemHeadingProps>;
+declare class ListGroupItemHeading<T = {}> extends React.Component<ListGroupItemHeadingProps<T>> {}
 export default ListGroupItemHeading;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index 947ee4cd7a..6fa1153ae2 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ListGroupItemTextProps extends React.HTMLAttributes<HTMLElement> {
+export type ListGroupItemTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ListGroupItemText: React.StatelessComponent<ListGroupItemTextProps>;
+declare class ListGroupItemText<T = {}> extends React.Component<ListGroupItemTextProps<T>> {}
 export default ListGroupItemText;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index f7a9afb2c0..b64eeffd7f 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
+export type MediaProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   body?: boolean;
   bottom?: boolean;
   className?: string;
@@ -15,7 +16,7 @@ export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
   top?: boolean;
   href?: string;
   alt?: string;
-}
+} & T;
 
-declare const Media: React.StatelessComponent<MediaProps>;
+declare class Media<T = {}> extends React.Component<MediaProps<T>> {}
 export default Media;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index 1049ec7918..f2761bbc91 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
-export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   autoFocus?: boolean;
   size?: string;
@@ -27,7 +27,7 @@ export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
   external?: React.ReactNode;
   labelledBy?: string;
   role?: string;
-}
+} & T;
 
-declare class Modal extends React.Component<ModalProps> {}
+declare class Modal<T> extends React.Component<ModalProps<T>> {}
 export default Modal;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index 083ac04186..4817e64bf4 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ModalBodyProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ModalBody: React.StatelessComponent<ModalBodyProps>;
+declare class ModalBody<T = {}> extends React.Component<ModalBodyProps<T>> {}
 export default ModalBody;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index 40ed54f9ae..7997d6931a 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ModalFooterProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const ModalFooter: React.StatelessComponent<ModalFooterProps>;
+declare class ModalFooter<T = {}> extends React.Component<ModalFooterProps<T>> {}
 export default ModalFooter;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index c1a3e55b7a..9e37201941 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface ModalHeaderProps extends React.HTMLAttributes<HTMLElement> {
+export type ModalHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   wrapTag?: React.ReactType;
   toggle?: () => void;
-}
+} & T;
 
-declare const ModalHeader: React.StatelessComponent<ModalHeaderProps>;
+declare class ModalHeader<T = {}> extends React.Component<ModalHeaderProps<T>> {}
 export default ModalHeader;
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index d96ab6e5d6..6868b01665 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavProps extends React.HTMLProps<HTMLUListElement> {
+export type NavProps<T = {}> = React.HTMLProps<HTMLUListElement> & {
   tabs?: boolean;
   pills?: boolean;
   vertical?: boolean | string;
@@ -12,7 +13,7 @@ export interface NavProps extends React.HTMLProps<HTMLUListElement> {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Nav: React.StatelessComponent<NavProps>;
+declare class Nav<T = {}> extends React.Component<NavProps<T>> {}
 export default Nav;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index e42e4c8e5e..969369bfee 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavItemProps extends React.HTMLAttributes<HTMLElement> {
+export type NavItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const NavItem: React.StatelessComponent<NavItemProps>;
+declare class NavItem<T = {}> extends React.Component<NavItemProps<T>> {}
 export default NavItem;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 0fdfdec641..4e88666c22 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
+export type NavLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLAnchorElement>;
   disabled?: boolean;
@@ -10,7 +10,7 @@ export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
   cssModule?: CSSModule;
   onClick?: React.MouseEventHandler<any>;
   href?: string;
-}
+} & T;
 
-declare class NavLink extends React.Component<NavLinkProps> {}
+declare class NavLink<T> extends React.Component<NavLinkProps<T>> {}
 export default NavLink;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 83e720731a..39d7340d79 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
+export type NavbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   light?: boolean;
   dark?: boolean;
   inverse?: boolean;
@@ -14,7 +15,7 @@ export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
   cssModule?: CSSModule;
   toggleable?: boolean | string;
   expand?: boolean | string;
-}
+} & T;
 
-declare const Navbar: React.StatelessComponent<NavbarProps>;
+declare class Navbar<T = {}> extends React.Component<NavbarProps<T>> {}
 export default Navbar;
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index 83ac8367b5..f7a814b31b 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavbarBrandProps extends React.HTMLProps<HTMLAnchorElement> {
+export type NavbarBrandProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const NavbarBrand: React.StatelessComponent<NavbarBrandProps>;
+declare class NavbarBrand<T = {}> extends React.Component<NavbarBrandProps<T>> {}
 export default NavbarBrand;
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index 542b671d28..b3dbedb20f 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface NavbarTogglerProps extends React.HTMLProps<HTMLAnchorElement> {
+export type NavbarTogglerProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   tag?: React.ReactType;
   type?: string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const NavbarToggler: React.StatelessComponent<NavbarTogglerProps>;
+declare class NavbarToggler<T = {}> extends React.Component<NavbarTogglerProps<T>> {}
 export default NavbarToggler;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 9dabaf8829..15f30547b7 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PaginationProps extends React.HTMLAttributes<HTMLElement> {
+export type PaginationProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
-}
+} & T;
 
-declare const Pagination: React.StatelessComponent<PaginationProps>;
+declare class Pagination<T = {}> extends React.Component<PaginationProps<T>> {}
 export default Pagination;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index a00fddc413..b555239371 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PaginationItemProps extends React.HTMLAttributes<HTMLElement> {
+export type PaginationItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   active?: boolean;
   disabled?: boolean;
   tag?: React.ReactType;
-}
+} & T;
 
-declare const PaginationItem: React.StatelessComponent<PaginationItemProps>;
+declare class PaginationItem<T = {}> extends React.Component<PaginationItemProps<T>> {}
 export default PaginationItem;
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index 52fbc6353a..90ea909d4e 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -1,13 +1,14 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PaginationLinkProps extends React.HTMLProps<HTMLAnchorElement> {
+export type PaginationLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
   next?: boolean;
   previous?: boolean;
   tag?: React.ReactType;
-}
+} & T;
 
-declare const PaginationLink: React.StatelessComponent<PaginationLinkProps>;
+declare class PaginationLink<T = {}> extends React.Component<PaginationLinkProps<T>> {}
 export default PaginationLink;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index e1ef254ee2..d1a0d56127 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { Popper } from './Popper';
 
-export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
+export type PopoverProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   toggle?: () => void;
   target: string | HTMLElement;
@@ -16,7 +16,7 @@ export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
   delay?: number | {show: number, hide: number};
   modifiers?: Popper.Modifiers;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class Popover extends React.Component<PopoverProps> {}
+declare class Popover<T> extends React.Component<PopoverProps<T>> {}
 export default Popover;
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
index bf67919e49..d5a3d6732f 100644
--- a/types/reactstrap/lib/PopoverBody.d.ts
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PopoverBodyProps extends React.HTMLAttributes<HTMLElement> {
+export type PopoverBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const PopoverBody: React.StatelessComponent<PopoverBodyProps>;
+declare class PopoverBody<T = {}> extends React.Component<PopoverBodyProps<T>> {}
 export default PopoverBody;
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
index caa0847233..7033dc90f8 100644
--- a/types/reactstrap/lib/PopoverHeader.d.ts
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -1,10 +1,11 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface PopoverHeaderProps extends React.HTMLAttributes<HTMLElement> {
+export type PopoverHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const PopoverHeader: React.StatelessComponent<PopoverHeaderProps>;
+declare class PopoverHeader<T = {}> extends React.Component<PopoverHeaderProps<T>> {}
 export default PopoverHeader;
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 6f252622a1..4bd99ab690 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,6 +1,6 @@
 import { CSSModule } from '../index';
 
-export interface ProgressProps extends React.HTMLAttributes<HTMLElement> {
+export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   bar?: boolean;
   multi?: boolean;
   tag?: string;
@@ -12,7 +12,7 @@ export interface ProgressProps extends React.HTMLAttributes<HTMLElement> {
   className?: string;
   cssModule?: CSSModule;
   barClassName?: string;
-}
+} & T;
 
-declare const Progress: React.StatelessComponent<ProgressProps>;
+declare class Progress<T = {}> extends React.Component<ProgressProps<T>> {};
 export default Progress;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index 35284a9f70..d430e336e0 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface RowProps extends React.HTMLProps<HTMLElement> {
+export type RowProps<T = {}> = React.HTMLProps<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   tag?: React.ReactType;
   noGutters?: boolean;
-}
+} & T;
 
-declare const Row: React.StatelessComponent<RowProps>;
+declare class Row<T = {}> extends React.Component<RowProps<T>> {}
 export default Row;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index 46bf48d079..6597484f9e 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
+export type TabContentProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   activeTab?: number | string;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare class TabContent extends React.Component<TabContentProps> {}
+declare class TabContent<T> extends React.Component<TabContentProps<T>> {}
 export default TabContent;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index 0bcbfd5d17..1472fe28b7 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -1,11 +1,12 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TabPaneProps extends React.HTMLAttributes<HTMLElement> {
+export type TabPaneProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   tabId?: number | string;
-}
+} & T;
 
-declare const TabPane: React.StatelessComponent<TabPaneProps>;
+declare class TabPane<T = {}> extends React.Component<TabPaneProps<T>> {}
 export default TabPane;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index 0374d7a0b5..3ad14b8c0a 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -1,6 +1,7 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TableProps extends React.HTMLAttributes<HTMLElement> {
+export type TableProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   size?: string;
@@ -12,7 +13,7 @@ export interface TableProps extends React.HTMLAttributes<HTMLElement> {
   responsive?: boolean;
   tag?: React.ReactType;
   responsiveTag?: React.ReactType;
-}
+} & T;
 
-declare const Table: React.StatelessComponent<TableProps>;
+declare class Table<T = {}> extends React.Component<TableProps<T>> {}
 export default Table;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index 49df70b240..ea09231942 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -1,12 +1,13 @@
+import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface TagProps extends React.HTMLAttributes<HTMLElement> {
+export type TagProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-}
+} & T;
 
-declare const Tag: React.StatelessComponent<TagProps>;
+declare class Tag<T = {}> extends React.Component<TagProps<T>> {}
 export default Tag;
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index 9c79c8a6d3..5cfcfcab1e 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import {Popper} from './Popper';
 
-export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
+export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   target: string | HTMLElement;
   container?: string | HTMLElement;
   delay?: number | {show: number, hide: number};
@@ -12,15 +12,13 @@ export interface UncontrolledProps extends React.HTMLAttributes<HTMLElement> {
   placement?: Popper.Placement;
   modifiers?: Popper.Modifiers;
   cssModule?: CSSModule;
-}
-export interface UncontrolledTooltipProps extends UncontrolledProps {
-  /* intentionally blank */
-}
+} & T;
+export type UncontrolledTooltipProps<T = {}> = UncontrolledProps<T>;
 
-export interface TooltipProps extends UncontrolledTooltipProps {
+export type TooltipProps<T = {}> = UncontrolledTooltipProps<T> & {
   toggle?: () => void;
   isOpen?: boolean;
-}
+};
 
-declare class Tooltip extends React.Component<TooltipProps> {}
+declare class Tooltip<T> extends React.Component<TooltipProps<T>> {}
 export default Tooltip;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index d7aed3962f..f54652710c 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -5,10 +5,10 @@ import { UncontrolledButtonDropdownProps } from './ButtonDropdown';
 import { UncontrolledDropdownProps       } from './Dropdown';
 import { UncontrolledTooltipProps        } from './Tooltip';
 
-export class UncontrolledAlert extends React.Component<UncontrolledAlertProps> {}
-export class UncontrolledButtonDropdown extends React.Component<UncontrolledButtonDropdownProps> {}
-export class UncontrolledDropdown extends React.Component<UncontrolledDropdownProps> {}
-export class UncontrolledTooltip extends React.Component<UncontrolledTooltipProps> {}
+export class UncontrolledAlert<T = {}> extends React.Component<UncontrolledAlertProps<T>> {}
+export class UncontrolledButtonDropdown<T = {}> extends React.Component<UncontrolledButtonDropdownProps<T>> {}
+export class UncontrolledDropdown<T = {}> extends React.Component<UncontrolledDropdownProps<T>> {}
+export class UncontrolledTooltip<T = {}> extends React.Component<UncontrolledTooltipProps<T>> {}
 
 export { UncontrolledAlertProps          } from './Alert';
 export { UncontrolledButtonDropdownProps } from './ButtonDropdown';
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 959ac2658b..770cb01fa1 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -350,7 +350,7 @@ class Example15 extends React.Component<any, any> {
           <DropdownItem disabled>Action</DropdownItem>
           <DropdownItem>Another Action</DropdownItem>
           <DropdownItem divider />
-          <DropdownItem onClick={event => {
+          <DropdownItem onClick={(event: React.MouseEvent<HTMLElement>) => {
             // something happens here
           }}>Another Action</DropdownItem>
         </DropdownMenu>