From c7a220ca579b0bea3beb24ee0ffb6ce333842aae Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <293473+sandersn@users.noreply.github.com>
Date: Wed, 17 Apr 2019 16:08:14 -0700
Subject: [PATCH] Make reactstrap compile faster (#34809)

* Re-export classes directly, don't re-subclass

This cuts about 30% of the types the Typescript compiler was creating in
TS 3.3 to compile reactstrap. I don't know how many types it was creating in
3.4 because it would run out of memory.

Note that lint still crashes because it runs out of memory. I'll
continue improving performance.

* Remove strict generic checking

This reverts the strictness part of #26094 without changing its
interface. It retains

1. string index signatures, so that arbitrary props can be passed in.
2. extending from React.Componenent, so that individual types can be
subclassed.
3. Type parameters on the individual types.

However, string index signatures can no longer be avoided, and type
parameters are ignored. This preserves interface compatibility --
existing code will not break from this change -- but disables excess
prop checking. It's possible that a breaking change that returns the
type package to its old strict behaviour can be made at the same time as
a breaking change of reactstrap itself.

This change improves performance dramatically, and allows linting to
succeed without running out of memory.

* Add missing semicolon
---
 types/reactstrap/index.d.ts                   | 257 ++++++------------
 types/reactstrap/lib/Alert.d.ts               |  13 +-
 types/reactstrap/lib/Badge.d.ts               |   7 +-
 types/reactstrap/lib/Breadcrumb.d.ts          |   7 +-
 types/reactstrap/lib/BreadcrumbItem.d.ts      |   6 +-
 types/reactstrap/lib/Button.d.ts              |   7 +-
 types/reactstrap/lib/ButtonDropdown.d.ts      |   8 +-
 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            |  66 ++---
 types/reactstrap/lib/CarouselCaption.d.ts     |   7 +-
 types/reactstrap/lib/CarouselControl.d.ts     |  16 +-
 types/reactstrap/lib/CarouselIndicators.d.ts  |  15 +-
 types/reactstrap/lib/CarouselItem.d.ts        |  28 +-
 types/reactstrap/lib/Col.d.ts                 |   7 +-
 types/reactstrap/lib/Collapse.d.ts            |  14 +-
 types/reactstrap/lib/Container.d.ts           |   7 +-
 types/reactstrap/lib/CustomInput.d.ts         |   7 +-
 types/reactstrap/lib/Dropdown.d.ts            |  15 +-
 types/reactstrap/lib/DropdownItem.d.ts        |   7 +-
 types/reactstrap/lib/DropdownMenu.d.ts        |   7 +-
 types/reactstrap/lib/DropdownToggle.d.ts      |   7 +-
 types/reactstrap/lib/Fade.d.ts                |   7 +-
 types/reactstrap/lib/Form.d.ts                |   7 +-
 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               |   7 +-
 types/reactstrap/lib/InputGroup.d.ts          |   7 +-
 types/reactstrap/lib/InputGroupAddon.d.ts     |   7 +-
 .../lib/InputGroupButtonDropdown.d.ts         |   6 +-
 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 +-
 .../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               |   7 +-
 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             |   7 +-
 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             |  11 +-
 types/reactstrap/lib/PopoverBody.d.ts         |   7 +-
 types/reactstrap/lib/PopoverHeader.d.ts       |   7 +-
 types/reactstrap/lib/Progress.d.ts            |   7 +-
 types/reactstrap/lib/Row.d.ts                 |   7 +-
 types/reactstrap/lib/Spinner.d.ts             |   7 +-
 types/reactstrap/lib/TabContent.d.ts          |   7 +-
 types/reactstrap/lib/TabPane.d.ts             |   7 +-
 types/reactstrap/lib/Table.d.ts               |   7 +-
 types/reactstrap/lib/Tag.d.ts                 |   7 +-
 types/reactstrap/lib/Toast.d.ts               |   7 +-
 types/reactstrap/lib/ToastBody.d.ts           |   7 +-
 types/reactstrap/lib/ToastHeader.d.ts         |   7 +-
 types/reactstrap/lib/Tooltip.d.ts             |  12 +-
 types/reactstrap/lib/Uncontrolled.d.ts        |  14 +-
 80 files changed, 457 insertions(+), 490 deletions(-)

diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index b489b1cadb..479db55494 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -16,257 +16,170 @@ export interface CSSModule {
   [className: string]: string;
 }
 
-import { default as Alert_ } from './lib/Alert';
-export class Alert<T = {}> extends Alert_<T> {}
+export { default as Alert } from './lib/Alert';
 export { AlertProps } from './lib/Alert';
-import { default as Badge_ } from './lib/Badge';
-export class Badge<T = {}> extends Badge_<T> {}
+export { default as Badge } from './lib/Badge';
 export { BadgeProps } from './lib/Badge';
-import { default as Breadcrumb_ } from './lib/Breadcrumb';
-export class Breadcrumb<T = {}> extends Breadcrumb_<T> {}
+export { default as Breadcrumb } from './lib/Breadcrumb';
 export { BreadcrumbProps } from './lib/Breadcrumb';
-import { default as BreadcrumbItem_ } from './lib/BreadcrumbItem';
-export class BreadcrumbItem<T = {}> extends BreadcrumbItem_<T> {}
+export { default as BreadcrumbItem } from './lib/BreadcrumbItem';
 export { BreadcrumbItemProps } from './lib/BreadcrumbItem';
-import { default as Button_ } from './lib/Button';
-export class Button<T = {}> extends Button_<T> {}
+export { default as Button } from './lib/Button';
 export { ButtonProps } from './lib/Button';
-import { default as ButtonDropdown_ } from './lib/ButtonDropdown';
-export class ButtonDropdown<T = {}> extends ButtonDropdown_<T> {}
+export { default as ButtonDropdown } from './lib/ButtonDropdown';
 export { ButtonDropdownProps } from './lib/ButtonDropdown';
-import { default as ButtonGroup_ } from './lib/ButtonGroup';
-export class ButtonGroup<T = {}> extends ButtonGroup_<T> {}
+export { default as ButtonGroup } from './lib/ButtonGroup';
 export { ButtonGroupProps } from './lib/ButtonGroup';
-import { default as ButtonToolbar_ } from './lib/ButtonToolbar';
-export class ButtonToolbar<T = {}> extends ButtonToolbar_<T> {}
+export { default as ButtonToolbar } from './lib/ButtonToolbar';
 export { ButtonToolbarProps } from './lib/ButtonToolbar';
-import { default as Card_ } from './lib/Card';
-export class Card<T = {}> extends Card_<T> {}
+export { default as Card } from './lib/Card';
 export { CardProps } from './lib/Card';
-import { default as CardBody_ } from './lib/CardBody';
-export class CardBody<T = {}> extends CardBody_<T> {}
+export { default as CardBody } from './lib/CardBody';
 export { CardBodyProps } from './lib/CardBody';
-import { default as CardColumns_ } from './lib/CardColumns';
-export class CardColumns<T = {}> extends CardColumns_<T> {}
+export { default as CardColumns } from './lib/CardColumns';
 export { CardColumnsProps } from './lib/CardColumns';
-import { default as CardDeck_ } from './lib/CardDeck';
-export class CardDeck<T = {}> extends CardDeck_<T> {}
+export { default as CardDeck } from './lib/CardDeck';
 export { CardDeckProps } from './lib/CardDeck';
-import { default as CardFooter_ } from './lib/CardFooter';
-export class CardFooter<T = {}> extends CardFooter_<T> {}
+export { default as CardFooter } from './lib/CardFooter';
 export { CardFooterProps } from './lib/CardFooter';
-import { default as CardGroup_ } from './lib/CardGroup';
-export class CardGroup<T = {}> extends CardGroup_<T> {}
+export { default as CardGroup } from './lib/CardGroup';
 export { CardGroupProps } from './lib/CardGroup';
-import { default as CardHeader_ } from './lib/CardHeader';
-export class CardHeader<T = {}> extends CardHeader_<T> {}
+export { default as CardHeader } from './lib/CardHeader';
 export { CardHeaderProps } from './lib/CardHeader';
-import { default as CardImg_ } from './lib/CardImg';
-export class CardImg<T = {}> extends CardImg_<T> {}
+export { default as CardImg } from './lib/CardImg';
 export { CardImgProps } from './lib/CardImg';
-import { default as CardImgOverlay_ } from './lib/CardImgOverlay';
-export class CardImgOverlay<T = {}> extends CardImgOverlay_<T> {}
+export { default as CardImgOverlay } from './lib/CardImgOverlay';
 export { CardImgOverlayProps } from './lib/CardImgOverlay';
-import { default as CardLink_ } from './lib/CardLink';
-export class CardLink<T = {}> extends CardLink_<T> {}
+export { default as CardLink } from './lib/CardLink';
 export { CardLinkProps } from './lib/CardLink';
-import { default as CardSubtitle_ } from './lib/CardSubtitle';
-export class CardSubtitle<T = {}> extends CardSubtitle_<T> {}
+export { default as CardSubtitle } from './lib/CardSubtitle';
 export { CardSubtitleProps } from './lib/CardSubtitle';
-import { default as CardText_ } from './lib/CardText';
-export class CardText<T = {}> extends CardText_<T> {}
+export { default as CardText } from './lib/CardText';
 export { CardTextProps } from './lib/CardText';
-import { default as CardTitle_ } from './lib/CardTitle';
-export class CardTitle<T = {}> extends CardTitle_<T> {}
+export { default as CardTitle } from './lib/CardTitle';
 export { CardTitleProps } from './lib/CardTitle';
-import { default as Carousel_ } from './lib/Carousel';
-export class Carousel<T = {}> extends Carousel_<T> {}
+export { default as Carousel } from './lib/Carousel';
 export { CarouselProps } from './lib/Carousel';
-import { default as CarouselItem_ } from './lib/CarouselItem';
-export class CarouselItem<T = {}> extends CarouselItem_<T> {}
+export { default as CarouselItem } from './lib/CarouselItem';
 export { CarouselItemProps } from './lib/CarouselItem';
-import { default as CarouselControl_ } from './lib/CarouselControl';
-export class CarouselControl<T = {}> extends CarouselControl_<T> {}
+export { default as CarouselControl } from './lib/CarouselControl';
 export { CarouselControlProps } from './lib/CarouselControl';
-import { default as CarouselIndicators_ } from './lib/CarouselIndicators';
-export class CarouselIndicators<T = {}> extends CarouselIndicators_<T> {}
+export { default as CarouselIndicators } from './lib/CarouselIndicators';
 export { CarouselIndicatorsProps } from './lib/CarouselIndicators';
-import { default as CarouselCaption_ } from './lib/CarouselCaption';
-export class CarouselCaption<T = {}> extends CarouselCaption_<T> {}
+export { default as CarouselCaption } from './lib/CarouselCaption';
 export { CarouselCaptionProps } from './lib/CarouselCaption';
-import { default as Col_ } from './lib/Col';
-export class Col<T = {}> extends Col_<T> {}
+export { default as Col } from './lib/Col';
 export { ColProps } from './lib/Col';
-import { default as Collapse_ } from './lib/Collapse';
-export class Collapse<T = {}> extends Collapse_<T> {}
+export { default as Collapse } from './lib/Collapse';
 export { CollapseProps } from './lib/Collapse';
-import { default as Container_ } from './lib/Container';
-export class Container<T = {}> extends Container_<T> {}
+export { default as Container } from './lib/Container';
 export { ContainerProps } from './lib/Container';
-import { default as CustomInput_ } from './lib/CustomInput';
-export class CustomInput<T = {}> extends CustomInput_<T> {}
+export { default as CustomInput } from './lib/CustomInput';
 export { CustomInputProps } from './lib/CustomInput';
-import { default as Dropdown_ } from './lib/Dropdown';
-export class Dropdown<T = {}> extends Dropdown_<T> {}
+export { default as Dropdown } from './lib/Dropdown';
 export { DropdownProps } from './lib/Dropdown';
-import { default as DropdownItem_ } from './lib/DropdownItem';
-export class DropdownItem<T = {}> extends DropdownItem_<T> {}
+export { default as DropdownItem } from './lib/DropdownItem';
 export { DropdownItemProps } from './lib/DropdownItem';
-import { default as DropdownMenu_ } from './lib/DropdownMenu';
-export class DropdownMenu<T = {}> extends DropdownMenu_<T> {}
+export { default as DropdownMenu } from './lib/DropdownMenu';
 export { DropdownMenuProps } from './lib/DropdownMenu';
-import { default as DropdownToggle_ } from './lib/DropdownToggle';
-export class DropdownToggle<T = {}> extends DropdownToggle_<T> {}
+export { default as DropdownToggle } from './lib/DropdownToggle';
 export { DropdownToggleProps } from './lib/DropdownToggle';
-import { default as Fade_ } from './lib/Fade';
-export class Fade<T = {}> extends Fade_<T> {}
+export { default as Fade } from './lib/Fade';
 export { FadeProps } from './lib/Fade';
-import { default as Form_ } from './lib/Form';
-export class Form<T = {}> extends Form_<T> {}
+export { default as Form } from './lib/Form';
 export { FormProps } from './lib/Form';
-import { default as FormFeedback_ } from './lib/FormFeedback';
-export class FormFeedback<T = {}> extends FormFeedback_<T> {}
+export { default as FormFeedback } from './lib/FormFeedback';
 export { FormFeedbackProps } from './lib/FormFeedback';
-import { default as FormGroup_ } from './lib/FormGroup';
-export class FormGroup<T = {}> extends FormGroup_<T> {}
+export { default as FormGroup } from './lib/FormGroup';
 export { FormGroupProps } from './lib/FormGroup';
-import { default as FormText_ } from './lib/FormText';
-export class FormText<T = {}> extends FormText_<T> {}
+export { default as FormText } from './lib/FormText';
 export { FormTextProps } from './lib/FormText';
-import { default as Input_ } from './lib/Input';
-export class Input<T = {}> extends Input_<T> {}
+export { default as Input } from './lib/Input';
 export { InputProps } from './lib/Input';
-import { default as InputGroup_ } from './lib/InputGroup';
-export class InputGroup<T = {}> extends InputGroup_<T> {}
+export { default as InputGroup } from './lib/InputGroup';
 export { InputGroupProps } from './lib/InputGroup';
-import { default as InputGroupAddon_ } from './lib/InputGroupAddon';
-export class InputGroupAddon<T = {}> extends InputGroupAddon_<T> {}
+export { default as InputGroupAddon } from './lib/InputGroupAddon';
 export { InputGroupAddonProps } from './lib/InputGroupAddon';
-import { default as InputGroupButtonDropdown_ } from './lib/InputGroupButtonDropdown';
-export class InputGroupButtonDropdown<T = {}> extends InputGroupButtonDropdown_<T> {}
+export { default as InputGroupButtonDropdown } from './lib/InputGroupButtonDropdown';
 export { InputGroupButtonDropdownProps } from './lib/InputGroupButtonDropdown';
-import { default as InputGroupText_ } from './lib/InputGroupText';
-export class InputGroupText<T = {}> extends InputGroupText_<T> {}
+export { default as InputGroupText } from './lib/InputGroupText';
 export { InputGroupTextProps } from './lib/InputGroupText';
-import { default as Jumbotron_ } from './lib/Jumbotron';
-export class Jumbotron<T = {}> extends Jumbotron_<T> {}
+export { default as Jumbotron } from './lib/Jumbotron';
 export { JumbotronProps } from './lib/Jumbotron';
-import { default as Label_ } from './lib/Label';
-export class Label<T = {}> extends Label_<T> {}
+export { default as Label } from './lib/Label';
 export { LabelProps } from './lib/Label';
-import { default as ListGroup_ } from './lib/ListGroup';
-export class ListGroup<T = {}> extends ListGroup_<T> {}
+export { default as ListGroup } from './lib/ListGroup';
 export { ListGroupProps } from './lib/ListGroup';
-import { default as ListGroupItem_ } from './lib/ListGroupItem';
-export class ListGroupItem<T = {}> extends ListGroupItem_<T> {}
+export { default as ListGroupItem } from './lib/ListGroupItem';
 export { ListGroupItemProps } from './lib/ListGroupItem';
-import { default as ListGroupItemHeading_ } from './lib/ListGroupItemHeading';
-export class ListGroupItemHeading<T = {}> extends ListGroupItemHeading_<T> {}
+export { default as ListGroupItemHeading } from './lib/ListGroupItemHeading';
 export { ListGroupItemHeadingProps } from './lib/ListGroupItemHeading';
-import { default as ListGroupItemText_ } from './lib/ListGroupItemText';
-export class ListGroupItemText<T = {}> extends ListGroupItemText_<T> {}
+export { default as ListGroupItemText } from './lib/ListGroupItemText';
 export { ListGroupItemTextProps } from './lib/ListGroupItemText';
-import { default as Media_ } from './lib/Media';
-export class Media<T = {}> extends Media_<T> {}
+export { default as Media } from './lib/Media';
 export { MediaProps } from './lib/Media';
-import { default as Modal_ } from './lib/Modal';
-export class Modal<T = {}> extends Modal_<T> {}
+export { default as Modal } from './lib/Modal';
 export { ModalProps } from './lib/Modal';
-import { default as ModalBody_ } from './lib/ModalBody';
-export class ModalBody<T = {}> extends ModalBody_<T> {}
+export { default as ModalBody } from './lib/ModalBody';
 export { ModalBodyProps } from './lib/ModalBody';
-import { default as ModalFooter_ } from './lib/ModalFooter';
-export class ModalFooter<T = {}> extends ModalFooter_<T> {}
+export { default as ModalFooter } from './lib/ModalFooter';
 export { ModalFooterProps } from './lib/ModalFooter';
-import { default as ModalHeader_ } from './lib/ModalHeader';
-export class ModalHeader<T = {}> extends ModalHeader_<T> {}
+export { default as ModalHeader } from './lib/ModalHeader';
 export { ModalHeaderProps } from './lib/ModalHeader';
-import { default as Nav_ } from './lib/Nav';
-export class Nav<T = {}> extends Nav_<T> {}
+export { default as Nav } from './lib/Nav';
 export { NavProps } from './lib/Nav';
-import { default as Navbar_ } from './lib/Navbar';
-export class Navbar<T = {}> extends Navbar_<T> {}
+export { default as Navbar } from './lib/Navbar';
 export { NavbarProps } from './lib/Navbar';
-import { default as NavbarBrand_ } from './lib/NavbarBrand';
-export class NavbarBrand<T = {}> extends NavbarBrand_<T> {}
+export { default as NavbarBrand } from './lib/NavbarBrand';
 export { NavbarBrandProps } from './lib/NavbarBrand';
-import { default as NavbarToggler_ } from './lib/NavbarToggler';
-export class NavbarToggler<T = {}> extends NavbarToggler_<T> {}
+export { default as NavbarToggler } from './lib/NavbarToggler';
 export { NavbarTogglerProps } from './lib/NavbarToggler';
-import { default as NavItem_ } from './lib/NavItem';
-export class NavItem<T = {}> extends NavItem_<T> {}
+export { default as NavItem } from './lib/NavItem';
 export { NavItemProps } from './lib/NavItem';
-import { default as NavLink_ } from './lib/NavLink';
-export class NavLink<T = {}> extends NavLink_<T> {}
+export { default as NavLink } from './lib/NavLink';
 export { NavLinkProps } from './lib/NavLink';
-import { default as Pagination_ } from './lib/Pagination';
-export class Pagination<T = {}> extends Pagination_<T> {}
+export { default as Pagination } from './lib/Pagination';
 export { PaginationProps } from './lib/Pagination';
-import { default as PaginationItem_ } from './lib/PaginationItem';
-export class PaginationItem<T = {}> extends PaginationItem_<T> {}
+export { default as PaginationItem } from './lib/PaginationItem';
 export { PaginationItemProps } from './lib/PaginationItem';
-import { default as PaginationLink_ } from './lib/PaginationLink';
-export class PaginationLink<T = {}> extends PaginationLink_<T> {}
+export { default as PaginationLink } from './lib/PaginationLink';
 export { PaginationLinkProps } from './lib/PaginationLink';
-import { default as Popover_ } from './lib/Popover';
-export class Popover<T = {}> extends Popover_<T> {}
+export { default as Popover } from './lib/Popover';
 export { PopoverProps } from './lib/Popover';
-import { default as PopoverBody_ } from './lib/PopoverBody';
-export class PopoverBody<T = {}> extends PopoverBody_<T> {}
+export { default as PopoverBody } from './lib/PopoverBody';
 export { PopoverBodyProps } from './lib/PopoverBody';
-import { default as PopoverHeader_ } from './lib/PopoverHeader';
-export class PopoverHeader<T = {}> extends PopoverHeader_<T> {}
+export { default as PopoverHeader } from './lib/PopoverHeader';
 export { PopoverHeaderProps } from './lib/PopoverHeader';
-import { default as Progress_ } from './lib/Progress';
-export class Progress<T = {}> extends Progress_<T> {}
+export { default as Progress } from './lib/Progress';
 export { ProgressProps } from './lib/Progress';
-import { default as Row_ } from './lib/Row';
-export class Row<T = {}> extends Row_<T> {}
+export { default as Row } from './lib/Row';
 export { RowProps } from './lib/Row';
-import { default as Spinner_ } from './lib/Spinner';
-export class Spinner<T = {}> extends Spinner_<T> {}
+export { default as Spinner } from './lib/Spinner';
 export { SpinnerProps } from './lib/Spinner';
-import { default as TabContent_ } from './lib/TabContent';
-export class TabContent<T = {}> extends TabContent_<T> {}
+export { default as TabContent } from './lib/TabContent';
 export { TabContentProps } from './lib/TabContent';
-import { default as Table_ } from './lib/Table';
-export class Table<T = {}> extends Table_<T> {}
+export { default as Table } from './lib/Table';
 export { TableProps } from './lib/Table';
-import { default as TabPane_ } from './lib/TabPane';
-export class TabPane<T = {}> extends TabPane_<T> {}
+export { default as TabPane } from './lib/TabPane';
 export { TabPaneProps } from './lib/TabPane';
-import { default as Tag_ } from './lib/Tag';
-export class Tag<T = {}> extends Tag_<T> {}
+export { default as Tag } from './lib/Tag';
 export { TagProps } from './lib/Tag';
-import { default as Toast_ } from './lib/Toast';
-export class Toast<T = {}> extends Toast_<T> {}
+export { default as Toast } from './lib/Toast';
 export { ToastProps } from './lib/Toast';
-import { default as ToastBody_ } from './lib/ToastBody';
-export class ToastBody<T = {}> extends ToastBody_<T> {}
+export { default as ToastBody } from './lib/ToastBody';
 export { ToastBodyProps } from './lib/ToastBody';
-import { default as ToastHeader_ } from './lib/ToastHeader';
-export class ToastHeader<T = {}> extends ToastHeader_<T> {}
+export { default as ToastHeader } from './lib/ToastHeader';
 export { ToastHeaderProps } from './lib/ToastHeader';
-import { default as Tooltip_ } from './lib/Tooltip';
-export class Tooltip<T = {}> extends Tooltip_<T> {}
+export { default as Tooltip } from './lib/Tooltip';
 export { TooltipProps } from './lib/Tooltip';
-import {
-  UncontrolledAlert as UncontrolledAlert_,
-  UncontrolledButtonDropdown as UncontrolledButtonDropdown_,
-  UncontrolledDropdown as UncontrolledDropdown_,
-  UncontrolledTooltip as UncontrolledTooltip_,
-  UncontrolledCollapse as UncontrolledCollapse_,
-  UncontrolledCarousel as UncontrolledCarousel_,
-  UncontrolledPopover as UncontrolledPopover_
-} from './lib/Uncontrolled';
-export class UncontrolledAlert<T = {}> extends UncontrolledAlert_<T> {}
-export class UncontrolledButtonDropdown<T = {}> extends UncontrolledButtonDropdown_<T> {}
-export class UncontrolledDropdown<T = {}> extends UncontrolledDropdown_<T> {}
-export class UncontrolledTooltip<T = {}> extends UncontrolledTooltip_<T> {}
-export class UncontrolledCollapse<T = {}> extends UncontrolledCollapse_<T> {}
-export class UncontrolledCarousel<T = {}> extends UncontrolledCarousel_<T> {}
-export class UncontrolledPopover<T = {}> extends UncontrolledPopover_<T> {}
 export {
+  UncontrolledAlert,
+  UncontrolledButtonDropdown,
+  UncontrolledDropdown,
+  UncontrolledTooltip,
+  UncontrolledCollapse,
+  UncontrolledCarousel,
+  UncontrolledPopover,
   UncontrolledButtonDropdownProps,
   UncontrolledAlertProps,
   UncontrolledDropdownProps,
diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index 5aa58f862a..61ce1e85bc 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -2,19 +2,18 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
-export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface UncontrolledAlertProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   className?: string;
   cssModule?: CSSModule;
   color?: string;
   tag?: React.ReactType;
   transition?: FadeProps;
-} & T;
-export type UncontrolledAlertProps<T = {}> = UncontrolledProps<T>;
-
-export type AlertProps<T = {}> = UncontrolledAlertProps<T> & {
+}
+export interface AlertProps extends UncontrolledAlertProps {
   isOpen?: boolean;
   toggle?: () => void;
-};
+}
 
-declare class Alert<T = {[key: string]: any}> extends React.Component<AlertProps<T>> {}
+declare class Alert<T = {[key: string]: any}> extends React.Component<AlertProps> {}
 export default Alert;
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index 651521ac67..b64ec53441 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type BadgeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface BadgeProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Badge<T = {[key: string]: any}> extends React.Component<BadgeProps<T>> {}
+declare class Badge<T = {[key: string]: any}> extends React.Component<BadgeProps> {}
 export default Badge;
diff --git a/types/reactstrap/lib/Breadcrumb.d.ts b/types/reactstrap/lib/Breadcrumb.d.ts
index 9fd2385041..9aca2499ff 100644
--- a/types/reactstrap/lib/Breadcrumb.d.ts
+++ b/types/reactstrap/lib/Breadcrumb.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type BreadcrumbProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface BreadcrumbProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: string;
   className?: string;
   listTag?: string;
   listClassName?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Breadcrumb<T = {[key: string]: any}> extends React.Component<BreadcrumbProps<T>> {}
+declare class Breadcrumb<T = {[key: string]: any}> extends React.Component<BreadcrumbProps> {}
 export default Breadcrumb;
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index a3ce8156bf..6ecd81b079 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type BreadcrumbItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
@@ -9,7 +9,7 @@ export type BreadcrumbItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   // if a is passed as a string
   // this could be href
   [others: string]: any;
-} & T;
+}
 
-declare class BreadcrumbItem<T = {[key: string]: any}> extends React.Component<BreadcrumbItemProps<T>> {}
+declare class BreadcrumbItem<T = {[key: string]: any}> extends React.Component<BreadcrumbItemProps> {}
 export default BreadcrumbItem;
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index f19ecf4e32..8460a46035 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ButtonProps<T = {}> = React.ButtonHTMLAttributes<HTMLButtonElement> & {
+export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  [key: string]: any;
   outline?: boolean;
   active?: boolean;
   block?: boolean;
@@ -16,7 +17,7 @@ export type ButtonProps<T = {}> = React.ButtonHTMLAttributes<HTMLButtonElement>
   style?: React.CSSProperties;
 
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Button<T = {[key: string]: any}> extends React.Component<ButtonProps<T>> {}
+declare class Button<T = {[key: string]: any}> extends React.Component<ButtonProps> {}
 export default Button;
diff --git a/types/reactstrap/lib/ButtonDropdown.d.ts b/types/reactstrap/lib/ButtonDropdown.d.ts
index 92f16ce5ce..175c5e8767 100644
--- a/types/reactstrap/lib/ButtonDropdown.d.ts
+++ b/types/reactstrap/lib/ButtonDropdown.d.ts
@@ -1,10 +1,6 @@
 import * as React from 'react';
 import { UncontrolledDropdownProps, DropdownProps } from './Dropdown';
+export { UncontrolledDropdownProps as UncontrolledButtonDropdownProps, DropdownProps as ButtonDropdownProps };
 
-export type UncontrolledProps<T = {}> = UncontrolledDropdownProps<T>;
-export type UncontrolledButtonDropdownProps<T = {}> = UncontrolledProps<T>;
-
-export type ButtonDropdownProps<T = {}> = DropdownProps<T>;
-
-declare class ButtonDropdown<T = {[key: string]: any}> extends React.Component<ButtonDropdownProps<T>> {}
+declare class ButtonDropdown<T = {[key: string]: any}> extends React.Component<DropdownProps> {}
 export default ButtonDropdown;
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index 736f894165..fab9dfb712 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ButtonGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
@@ -9,7 +10,7 @@ export type ButtonGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   role?: string;
   size?: string;
   vertical?: boolean;
-} & T;
+}
 
-declare class ButtonGroup<T = {[key: string]: any}> extends React.Component<ButtonGroupProps<T>> {}
+declare class ButtonGroup<T = {[key: string]: any}> extends React.Component<ButtonGroupProps> {}
 export default ButtonGroup;
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index b19fff3274..1396b2433e 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ButtonToolbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ButtonToolbarProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
   role?: string;
-} & T;
+}
 
-declare class ButtonToolbar<T = {[key: string]: any}> extends React.Component<ButtonToolbarProps<T>> {}
+declare class ButtonToolbar<T = {[key: string]: any}> extends React.Component<ButtonToolbarProps> {}
 export default ButtonToolbar;
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index d14bb52a81..3de8b2dc1d 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   inverse?: boolean;
   color?: string;
@@ -10,7 +11,7 @@ export type CardProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   style?: React.CSSProperties;
-} & T;
+}
 
-declare class Card<T = {[key: string]: any}> extends React.Component<CardProps<T>> {}
+declare class Card<T = {[key: string]: any}> extends React.Component<CardProps> {}
 export default Card;
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index d8bcac515b..59c61bfadb 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardBodyProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardBody<T = {[key: string]: any}> extends React.Component<CardBodyProps<T>> {}
+declare class CardBody<T = {[key: string]: any}> extends React.Component<CardBodyProps> {}
 export default CardBody;
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index ccce622907..139b53a5a3 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardColumnsProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardColumnsProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardColumns<T = {[key: string]: any}> extends React.Component<CardColumnsProps<T>> {}
+declare class CardColumns<T = {[key: string]: any}> extends React.Component<CardColumnsProps> {}
 export default CardColumns;
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index 88f1166339..e8632747f3 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardDeckProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardDeckProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardDeck<T = {[key: string]: any}> extends React.Component<CardDeckProps<T>> {}
+declare class CardDeck<T = {[key: string]: any}> extends React.Component<CardDeckProps> {}
 export default CardDeck;
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index c65ba5f8cf..61c80dc756 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardFooterProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardFooter<T = {[key: string]: any}> extends React.Component<CardFooterProps<T>> {}
+declare class CardFooter<T = {[key: string]: any}> extends React.Component<CardFooterProps> {}
 export default CardFooter;
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index be33a187d5..69dde4198c 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardGroupProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardGroup<T = {[key: string]: any}> extends React.Component<CardGroupProps<T>> {}
+declare class CardGroup<T = {[key: string]: any}> extends React.Component<CardGroupProps> {}
 export default CardGroup;
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index ac46ca37ba..be946f21bc 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardHeaderProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardHeader<T = {[key: string]: any}> extends React.Component<CardHeaderProps<T>> {}
+declare class CardHeader<T = {[key: string]: any}> extends React.Component<CardHeaderProps> {}
 export default CardHeader;
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index 6c77d88257..fc86aaeb37 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardImgProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   top?: boolean;
   bottom?: boolean;
@@ -11,7 +12,7 @@ export type CardImgProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   width?: string;
   height?: string;
   alt?: string;
-} & T;
+}
 
-declare class CardImg<T = {[key: string]: any}> extends React.Component<CardImgProps<T>> {}
+declare class CardImg<T = {[key: string]: any}> extends React.Component<CardImgProps> {}
 export default CardImg;
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index f4da865ae7..d20a83dbb5 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardImgOverlayProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardImgOverlayProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardImgOverlay<T = {[key: string]: any}> extends React.Component<CardImgOverlayProps<T>> {}
+declare class CardImgOverlay<T = {[key: string]: any}> extends React.Component<CardImgOverlayProps> {}
 export default CardImgOverlay;
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 359cb6e32a..2ad18a9eda 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardLinkProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardLinkProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLAnchorElement>;
   className?: string;
   cssModule?: CSSModule;
   href?: string;
-} & T;
+}
 
-declare class CardLink<T = {[key: string]: any}> extends React.Component<CardLinkProps<T>> {}
+declare class CardLink<T = {[key: string]: any}> extends React.Component<CardLinkProps> {}
 export default CardLink;
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index 8e379ceaa1..ee4ef79235 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardSubtitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardSubtitleProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardSubtitle<T = {[key: string]: any}> extends React.Component<CardSubtitleProps<T>> {}
+declare class CardSubtitle<T = {[key: string]: any}> extends React.Component<CardSubtitleProps> {}
 export default CardSubtitle;
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index fd3fb8eba9..5ebf53d828 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardTextProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardText<T = {[key: string]: any}> extends React.Component<CardTextProps<T>> {}
+declare class CardText<T = {[key: string]: any}> extends React.Component<CardTextProps> {}
 export default CardText;
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 0d6bad3c89..758486f1e4 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CardTitleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface CardTitleProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class CardTitle<T = {[key: string]: any}> extends React.Component<CardTitleProps<T>> {}
+declare class CardTitle<T = {[key: string]: any}> extends React.Component<CardTitleProps> {}
 export default CardTitle;
diff --git a/types/reactstrap/lib/Carousel.d.ts b/types/reactstrap/lib/Carousel.d.ts
index 69899eff34..858d128667 100644
--- a/types/reactstrap/lib/Carousel.d.ts
+++ b/types/reactstrap/lib/Carousel.d.ts
@@ -1,39 +1,39 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CarouselProps<T = {}> = React.HTMLProps<HTMLElement> & {
-    activeIndex?: number;
-    next: () => void;
-    previous: () => void;
-    keyboard?: boolean;
-    pause?: 'hover' | false;
-    ride?: 'carousel';
-    interval?: number | string | boolean;
-    mouseEnter?: () => void;
-    mouseExit?: () => void;
-    slide?: boolean;
-    cssModule?: CSSModule
-} & T;
+export interface CarouselProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
+  activeIndex?: number;
+  next: () => void;
+  previous: () => void;
+  keyboard?: boolean;
+  pause?: 'hover' | false;
+  ride?: 'carousel';
+  interval?: number | string | boolean;
+  mouseEnter?: () => void;
+  mouseExit?: () => void;
+  slide?: boolean;
+  cssModule?: CSSModule;
+}
 
-export type UncontrolledProps<T = {}> = React.HTMLProps<HTMLElement> & {
-    items: any[];
-    activeIndex?: number;
-    next?: () => void;
-    previous?: () => void;
-    keyboard?: boolean;
-    pause?: "hover" | false;
-    ride?: "carousel";
-    interval?: number | string | boolean;
-    mouseEnter?: () => void;
-    mouseExit?: () => void;
-    slide?: boolean;
-    cssModule?: CSSModule;
-    controls?: boolean;
-    indicators?: boolean;
-    autoPlay?: boolean;
-} & T;
+export interface UncontrolledCarouselProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
+  items: any[];
+  activeIndex?: number;
+  next?: () => void;
+  previous?: () => void;
+  keyboard?: boolean;
+  pause?: "hover" | false;
+  ride?: "carousel";
+  interval?: number | string | boolean;
+  mouseEnter?: () => void;
+  mouseExit?: () => void;
+  slide?: boolean;
+  cssModule?: CSSModule;
+  controls?: boolean;
+  indicators?: boolean;
+  autoPlay?: boolean;
+}
 
-export type UncontrolledCarouselProps<T = {}> = UncontrolledProps<T>;
-
-declare class Carousel<T = {[key: string]: any}> extends React.Component<CarouselProps<T>> {}
+declare class Carousel<T = {[key: string]: any}> extends React.Component<CarouselProps> {}
 export default Carousel;
diff --git a/types/reactstrap/lib/CarouselCaption.d.ts b/types/reactstrap/lib/CarouselCaption.d.ts
index 047505f318..6e535924f4 100644
--- a/types/reactstrap/lib/CarouselCaption.d.ts
+++ b/types/reactstrap/lib/CarouselCaption.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CarouselCaptionProps<T = {}> = React.HTMLProps<HTMLElement> & {
+export interface CarouselCaptionProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
     captionHeader?: string;
     captionText: string;
     cssModule?: CSSModule;
-} & T;
+}
 
-declare class CarouselCaption<T = {[key: string]: any}> extends React.Component<CarouselCaptionProps<T>> {}
+declare class CarouselCaption<T = {[key: string]: any}> extends React.Component<CarouselCaptionProps> {}
 export default CarouselCaption;
diff --git a/types/reactstrap/lib/CarouselControl.d.ts b/types/reactstrap/lib/CarouselControl.d.ts
index fb309f4cb1..9fd848fd87 100644
--- a/types/reactstrap/lib/CarouselControl.d.ts
+++ b/types/reactstrap/lib/CarouselControl.d.ts
@@ -1,12 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CarouselControlProps<T = {}> = React.HTMLProps<HTMLElement> & {
-    direction: 'prev' | 'next';
-    onClickHandler: () => void;
-    cssModule?: CSSModule;
-    directionText: string;
-} & T;
+export interface CarouselControlProps extends React.HTMLProps<HTMLElement> {
+  [s: string]: any;
+  direction: 'prev' | 'next';
+  onClickHandler: () => void;
+  cssModule?: CSSModule;
+  directionText: string;
+}
 
-declare class CarouselControl<T = {[key: string]: any}> extends React.Component<CarouselControlProps<T>> {}
-export default CarouselControl;
+export default class CarouselControl<T = {}> extends React.Component<CarouselControlProps> { }
diff --git a/types/reactstrap/lib/CarouselIndicators.d.ts b/types/reactstrap/lib/CarouselIndicators.d.ts
index 761ab8d1cf..0964c13a5f 100644
--- a/types/reactstrap/lib/CarouselIndicators.d.ts
+++ b/types/reactstrap/lib/CarouselIndicators.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CarouselIndicatorsProps<T = {}> = React.HTMLProps<HTMLElement> & {
-    items: object[];
-    activeIndex: number;
-    cssModule?: CSSModule;
-    onClickHandler: (idx: number) => void;
-} & T;
+export interface CarouselIndicatorsProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
+  items: object[];
+  activeIndex: number;
+  cssModule?: CSSModule;
+  onClickHandler: (idx: number) => void;
+}
 
-declare class CarouselIndicators<T = {[key: string]: any}> extends React.Component<CarouselIndicatorsProps<T>> {}
+declare class CarouselIndicators<T = {[key: string]: any}> extends React.Component<CarouselIndicatorsProps> {}
 export default CarouselIndicators;
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
index 8eb6bb325d..a6702746e2 100644
--- a/types/reactstrap/lib/CarouselItem.d.ts
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -1,21 +1,19 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface Transition {
-    onEnter?: () => void;
-    onEntering?: () => void;
-    onEntered?: () => void;
-    onExit?: () => void;
-    onExiting?: () => void;
-    onExited?: () => void;
+export interface CarouselItemProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
+  tag?: React.ReactType;
+  in?: boolean;
+  cssModule?: CSSModule;
+  slide?: boolean;
+  onEnter?: () => void;
+  onEntering?: () => void;
+  onEntered?: () => void;
+  onExit?: () => void;
+  onExiting?: () => void;
+  onExited?: () => void;
 }
 
-export type CarouselItemProps<T = {}> = React.HTMLProps<HTMLElement> & Transition & {
-    tag?: React.ReactType;
-    in?: boolean;
-    cssModule?: CSSModule;
-    slide?: boolean;
-} & T;
-
-declare class CarouselItem<T = {[key: string]: any}> extends React.Component<CarouselItemProps<T>> {}
+declare class CarouselItem<T = {[key: string]: any}> extends React.Component<CarouselItemProps> {}
 export default CarouselItem;
diff --git a/types/reactstrap/lib/Col.d.ts b/types/reactstrap/lib/Col.d.ts
index c52e32ec62..24554db9da 100644
--- a/types/reactstrap/lib/Col.d.ts
+++ b/types/reactstrap/lib/Col.d.ts
@@ -12,7 +12,8 @@ export type ColumnProps
     order?: string | number
   };
 
-export type ColProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
+export interface ColProps extends React.HTMLProps<HTMLDivElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   xs?: ColumnProps;
   sm?: ColumnProps;
@@ -22,7 +23,7 @@ export type ColProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
 
   // custom widths
   widths?: string[];
-} & T;
+}
 
-declare class Col<T = {[key: string]: any}> extends React.Component<ColProps<T>> {}
+declare class Col<T = {[key: string]: any}> extends React.Component<ColProps> {}
 export default Col;
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index 12247962aa..82fb603bbf 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type CollapseProps<T = {}> = React.HTMLProps<HTMLElement> & {
+export interface CollapseProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
   isOpen?: boolean;
   classNames?: string;
   cssModule?: CSSModule;
@@ -18,18 +19,17 @@ export type CollapseProps<T = {}> = React.HTMLProps<HTMLElement> & {
   onExit?: () => void;
   onExiting?: () => void;
   onExited?: () => void;
-} & T;
+}
 
-export type UncontrolledProps<T = {}> = React.HTMLProps<HTMLElement> & {
+export interface UncontrolledCollapseProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
   isOpen?: boolean;
   className?: string;
   cssModule?: CSSModule;
   tag?: React.ReactType;
   navbar?: boolean;
   toggle?: () => void;
-} & T;
+}
 
-export type UncontrolledCollapseProps<T = {}> = UncontrolledProps<T>;
-
-declare class Collapse<T = {[key: string]: any}> extends React.Component<CollapseProps<T>> {}
+declare class Collapse<T = {[key: string]: any}> extends React.Component<CollapseProps> {}
 export default Collapse;
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index a39db466bb..9fb41599c0 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ContainerProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ContainerProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Container<T = {[key: string]: any}> extends React.Component<ContainerProps<T>> {}
+declare class Container<T = {[key: string]: any}> extends React.Component<ContainerProps> {}
 export default Container;
diff --git a/types/reactstrap/lib/CustomInput.d.ts b/types/reactstrap/lib/CustomInput.d.ts
index 73f941c9f4..4545f2d126 100644
--- a/types/reactstrap/lib/CustomInput.d.ts
+++ b/types/reactstrap/lib/CustomInput.d.ts
@@ -8,7 +8,8 @@ export type CustomInputType =
   | 'checkbox'
   | 'switch';
 
-export type CustomInputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElement> & {
+export interface CustomInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+  [key: string]: any;
   type: CustomInputType;
   label?: React.ReactNode;
   inline?: boolean;
@@ -18,7 +19,7 @@ export type CustomInputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElemen
   className?: string;
   cssModule?: CSSModule;
   htmlFor?: string;
-} & T;
+}
 
-declare class CustomInput<T = {[key: string]: any}> extends React.Component<CustomInputProps<T>> {}
+declare class CustomInput<T = {[key: string]: any}> extends React.Component<CustomInputProps> {}
 export default CustomInput;
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 585a1e8693..8f7f55abe6 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -7,7 +7,8 @@ export type Direction =
   | "left"
   | "right";
 
-export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface UncontrolledDropdownProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   isOpen?: boolean;
   toggle?: () => void;
   className?: string;
@@ -15,20 +16,16 @@ export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   nav?: boolean;
   inNavbar?: boolean;
   setActiveFromChild?: boolean;
-} & T;
+}
 
-export type UncontrolledDropdownProps<T = {}> = UncontrolledProps<T>;
-
-export type Props<T = {}> = UncontrolledProps<T> & {
+export interface DropdownProps extends UncontrolledDropdownProps {
   disabled?: boolean;
   direction?: Direction;
   group?: boolean;
   size?: string;
   tag?: React.ReactType;
   addonType?: boolean | 'prepend' | 'append';
-};
+}
 
-export type DropdownProps<T = {}> = Props<T>;
-
-declare class Dropdown<T = {[key: string]: any}> extends React.Component<DropdownProps<T>> {}
+declare class Dropdown<T = {[key: string]: any}> extends React.Component<DropdownProps> {}
 export default Dropdown;
diff --git a/types/reactstrap/lib/DropdownItem.d.ts b/types/reactstrap/lib/DropdownItem.d.ts
index d6b4344d59..a8c366cb75 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type DropdownItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   disabled?: boolean;
   divider?: boolean;
   tag?: React.ReactType;
@@ -12,7 +13,7 @@ export type DropdownItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   href?: string;
   toggle?: boolean;
   active?: boolean;
-} & T;
+}
 
-declare class DropdownItem<T> extends React.Component<DropdownItemProps<T>> {}
+declare class DropdownItem<T> extends React.Component<DropdownItemProps> {}
 export default DropdownItem;
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index fedb12f4c3..b7799abedc 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -2,7 +2,8 @@ import * as React from 'react';
 import * as Popper from 'popper.js';
 import { CSSModule } from '../index';
 
-export type DropdownMenuProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface DropdownMenuProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   right?: boolean;
   className?: string;
@@ -10,7 +11,7 @@ export type DropdownMenuProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   flip?: boolean;
   modifiers?: Popper.Modifiers;
   persist?: boolean;
-} & T;
+}
 
-declare class DropdownMenu<T = {[key: string]: any}> extends React.Component<DropdownMenuProps<T>> {}
+declare class DropdownMenu<T = {[key: string]: any}> extends React.Component<DropdownMenuProps> {}
 export default DropdownMenu;
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index cdb665c6ce..93cbb25523 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type DropdownToggleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   caret?: boolean;
   className?: string;
   cssModule?: CSSModule;
@@ -15,7 +16,7 @@ export type DropdownToggleProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   nav?: boolean;
   color?: string;
   size?: string;
-} & T;
+}
 
-declare class DropdownToggle<T> extends React.Component<DropdownToggleProps<T>> {}
+declare class DropdownToggle<T> extends React.Component<DropdownToggleProps> {}
 export default DropdownToggle;
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 97fe421e7d..899fb89e99 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type FadeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   in?: boolean;
   baseClass?: string;
   baseClassIn?: string;
@@ -16,7 +17,7 @@ export type FadeProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   transitionLeave?: boolean;
   onLeave?: () => void;
   onEnter?: () => void;
-} & T;
+}
 
-declare class Fade<T = {[key: string]: any}> extends React.Component<FadeProps<T>> {}
+declare class Fade<T = {[key: string]: any}> extends React.Component<FadeProps> {}
 export default Fade;
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index 2b6668b631..a0e49945ed 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type FormProps<T = {}> = React.HTMLProps<HTMLFormElement> & {
+export interface FormProps extends React.HTMLProps<HTMLFormElement> {
+  [key: string]: any;
   inline?: boolean;
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLFormElement>;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Form<T> extends React.Component<FormProps<T>> {}
+declare class Form<T> extends React.Component<FormProps> {}
 export default Form;
diff --git a/types/reactstrap/lib/FormFeedback.d.ts b/types/reactstrap/lib/FormFeedback.d.ts
index e221c9809b..6b938411f8 100644
--- a/types/reactstrap/lib/FormFeedback.d.ts
+++ b/types/reactstrap/lib/FormFeedback.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type FormFeedbackProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface FormFeedbackProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: string;
   className?: string;
   cssModule?: CSSModule;
   valid?: boolean;
-} & T;
+}
 
-declare class FormFeedback<T = {[key: string]: any}> extends React.Component<FormFeedbackProps<T>> {}
+declare class FormFeedback<T = {[key: string]: any}> extends React.Component<FormFeedbackProps> {}
 export default FormFeedback;
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index f0369ff7d9..fb8423b66c 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type FormGroupProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
+export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
+  [key: string]: any;
   row?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -9,7 +10,7 @@ export type FormGroupProps<T = {}> = React.HTMLProps<HTMLDivElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class FormGroup<T = {[key: string]: any}> extends React.Component<FormGroupProps<T>> {}
+declare class FormGroup<T = {[key: string]: any}> extends React.Component<FormGroupProps> {}
 export default FormGroup;
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index f2fc6f30a6..57f1baef56 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type FormTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface FormTextProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   inline?: boolean;
   tag?: React.ReactType;
   color?: string;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class FormText<T = {[key: string]: any}> extends React.Component<FormTextProps<T>> {}
+declare class FormText<T = {[key: string]: any}> extends React.Component<FormTextProps> {}
 export default FormText;
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 87415b7e10..05f286b191 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -28,7 +28,8 @@ export type InputType =
   | 'time'
   | 'color';
 
-export type InputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElement> & {
+export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+  [key: string]: any;
   type?: InputType;
   bsSize?: 'lg' | 'sm';
   state?: string;
@@ -40,7 +41,7 @@ export type InputProps<T = {}> = React.InputHTMLAttributes<HTMLInputElement> & {
   addon?: boolean;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Input<T> extends React.Component<InputProps<T>> {}
+declare class Input<T> extends React.Component<InputProps> {}
 export default Input;
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index e95b6c5539..0424e42b8b 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type InputGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface InputGroupProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   size?: string;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class InputGroup<T = {[key: string]: any}> extends React.Component<InputGroupProps<T>> {}
+declare class InputGroup<T = {[key: string]: any}> extends React.Component<InputGroupProps> {}
 export default InputGroup;
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index eec8a6727a..ba46a2856d 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type InputGroupAddonProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface InputGroupAddonProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   addonType: 'prepend' | 'append';
-} & T;
+}
 
-declare class InputGroupAddon<T = {[key: string]: any}> extends React.Component<InputGroupAddonProps<T>> {}
+declare class InputGroupAddon<T = {[key: string]: any}> extends React.Component<InputGroupAddonProps> {}
 export default InputGroupAddon;
diff --git a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
index 888364df14..5e7c8570bf 100644
--- a/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
+++ b/types/reactstrap/lib/InputGroupButtonDropdown.d.ts
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { DropdownProps } from './Dropdown';
 
-export type InputGroupButtonDropdownProps<T = {}> = DropdownProps & {
+export interface InputGroupButtonDropdownProps extends DropdownProps {
     addonType: 'prepend' | 'append';
-} & T;
+}
 
-declare class InputGroupButtonDropdown<T = {[key: string]: any}> extends React.Component<InputGroupButtonDropdownProps<T>> {}
+declare class InputGroupButtonDropdown<T = {[key: string]: any}> extends React.Component<InputGroupButtonDropdownProps> {}
 export default InputGroupButtonDropdown;
diff --git a/types/reactstrap/lib/InputGroupText.d.ts b/types/reactstrap/lib/InputGroupText.d.ts
index 9e352ea9d8..358f34d96a 100644
--- a/types/reactstrap/lib/InputGroupText.d.ts
+++ b/types/reactstrap/lib/InputGroupText.d.ts
@@ -1,10 +1,11 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type InputGroupTextProps<T = {}> = React.HTMLAttributes<HTMLElement>  & {
+export interface InputGroupTextProps extends React.HTMLAttributes<HTMLElement>  {
+  [key: string]: any;
   tag?: React.ReactType;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class InputGroupText<T = {[key: string]: any}> extends React.Component<InputGroupTextProps<T>> {}
+declare class InputGroupText<T = {[key: string]: any}> extends React.Component<InputGroupTextProps> {}
 export default InputGroupText;
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index d271b63960..cb0f2b4e6e 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type JumbotronProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface JumbotronProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   fluid?: boolean;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Jumbotron<T = {[key: string]: any}> extends React.Component<JumbotronProps<T>> {}
+declare class Jumbotron<T = {[key: string]: any}> extends React.Component<JumbotronProps> {}
 export default Jumbotron;
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index 89d9a96e48..a2d05c1574 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -2,11 +2,8 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { ColumnProps } from './Col';
 
-type Intermediate = React.LabelHTMLAttributes<HTMLLabelElement> & {
-  size?: any;
-};
-
-export type LabelProps<T = {}> = Intermediate & {
+export interface LabelProps extends React.LabelHTMLAttributes<HTMLLabelElement> {
+  [key: string]: any;
   hidden?: boolean;
   check?: boolean;
   inline?: boolean;
@@ -21,7 +18,7 @@ export type LabelProps<T = {}> = Intermediate & {
   md?: ColumnProps;
   lg?: ColumnProps;
   xl?: ColumnProps;
-} & T;
+}
 
-declare class Label<T = {[key: string]: any}> extends React.Component<LabelProps<T>> {}
+declare class Label<T = {[key: string]: any}> extends React.Component<LabelProps> {}
 export default Label;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index 1c2f6739e6..5378409bf7 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ListGroupProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ListGroupProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   flush?: boolean;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class ListGroup<T = {[key: string]: any}> extends React.Component<ListGroupProps<T>> {}
+declare class ListGroup<T = {[key: string]: any}> extends React.Component<ListGroupProps> {}
 export default ListGroup;
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index 54ae820290..84b7b0379a 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ListGroupItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   active?: boolean;
   disabled?: boolean;
@@ -12,7 +13,7 @@ export type ListGroupItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   href?: string;
 
   onClick?: React.MouseEventHandler<any>;
-} & T;
+}
 
-declare class ListGroupItem<T = {[key: string]: any}> extends React.Component<ListGroupItemProps<T>> {}
+declare class ListGroupItem<T = {[key: string]: any}> extends React.Component<ListGroupItemProps> {}
 export default ListGroupItem;
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index 6748aaa04c..55cbe8ed70 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ListGroupItemHeadingProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ListGroupItemHeadingProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class ListGroupItemHeading<T = {[key: string]: any}> extends React.Component<ListGroupItemHeadingProps<T>> {}
+declare class ListGroupItemHeading<T = {[key: string]: any}> extends React.Component<ListGroupItemHeadingProps> {}
 export default ListGroupItemHeading;
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index 667f2cad70..afeffdc77d 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ListGroupItemTextProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ListGroupItemTextProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class ListGroupItemText<T = {[key: string]: any}> extends React.Component<ListGroupItemTextProps<T>> {}
+declare class ListGroupItemText<T = {[key: string]: any}> extends React.Component<ListGroupItemTextProps> {}
 export default ListGroupItemText;
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index 971df9c22a..782dd8492d 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type MediaProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   body?: boolean;
   bottom?: boolean;
   className?: string;
@@ -17,7 +18,7 @@ export type MediaProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   src?: string;
   href?: string;
   alt?: string;
-} & T;
+}
 
-declare class Media<T = {[key: string]: any}> extends React.Component<MediaProps<T>> {}
+declare class Media<T = {[key: string]: any}> extends React.Component<MediaProps> {}
 export default Media;
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index 42951cf437..f2c901c095 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -2,7 +2,8 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
-export type ModalProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   isOpen?: boolean;
   autoFocus?: boolean;
   size?: string;
@@ -30,7 +31,7 @@ export type ModalProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   role?: string;
   unmountOnClose?: boolean;
   returnFocusAfterClose?: boolean;
-} & T;
+}
 
-declare class Modal<T> extends React.Component<ModalProps<T>> {}
+declare class Modal<T> extends React.Component<ModalProps> {}
 export default Modal;
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index a7c38a1914..9790549041 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ModalBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ModalBodyProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class ModalBody<T = {[key: string]: any}> extends React.Component<ModalBodyProps<T>> {}
+declare class ModalBody<T = {[key: string]: any}> extends React.Component<ModalBodyProps> {}
 export default ModalBody;
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index 8ce9b23cf2..1059ff203d 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ModalFooterProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ModalFooterProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class ModalFooter<T = {[key: string]: any}> extends React.Component<ModalFooterProps<T>> {}
+declare class ModalFooter<T = {[key: string]: any}> extends React.Component<ModalFooterProps> {}
 export default ModalFooter;
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index 4ef33e16ad..7e4ceab480 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ModalHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ModalHeaderProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   wrapTag?: React.ReactType;
   toggle?: () => void;
-} & T;
+}
 
-declare class ModalHeader<T = {[key: string]: any}> extends React.Component<ModalHeaderProps<T>> {}
+declare class ModalHeader<T = {[key: string]: any}> extends React.Component<ModalHeaderProps> {}
 export default ModalHeader;
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index bc5fbdb6b9..deeab330be 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type NavProps<T = {}> = React.HTMLProps<HTMLUListElement> & {
+export interface NavProps extends React.HTMLProps<HTMLUListElement> {
+  [key: string]: any;
   tabs?: boolean;
   pills?: boolean;
   vertical?: boolean | string;
@@ -13,7 +14,7 @@ export type NavProps<T = {}> = React.HTMLProps<HTMLUListElement> & {
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Nav<T = {[key: string]: any}> extends React.Component<NavProps<T>> {}
+declare class Nav<T = {[key: string]: any}> extends React.Component<NavProps> {}
 export default Nav;
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index ff2ad879c3..57c52ffd22 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type NavItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface NavItemProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   active?: boolean;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class NavItem<T = {[key: string]: any}> extends React.Component<NavItemProps<T>> {}
+declare class NavItem<T = {[key: string]: any}> extends React.Component<NavItemProps> {}
 export default NavItem;
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 4e88666c22..6e0b0253e8 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type NavLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
+export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   innerRef?: React.Ref<HTMLAnchorElement>;
   disabled?: boolean;
@@ -10,7 +11,7 @@ export type NavLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   cssModule?: CSSModule;
   onClick?: React.MouseEventHandler<any>;
   href?: string;
-} & T;
+}
 
-declare class NavLink<T> extends React.Component<NavLinkProps<T>> {}
+declare class NavLink<T> extends React.Component<NavLinkProps> {}
 export default NavLink;
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 4dce8fd970..1a86999233 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type NavbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   light?: boolean;
   dark?: boolean;
   full?: boolean;
@@ -13,7 +14,7 @@ export type NavbarProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   expand?: boolean | string;
-} & T;
+}
 
-declare class Navbar<T = {[key: string]: any}> extends React.Component<NavbarProps<T>> {}
+declare class Navbar<T = {[key: string]: any}> extends React.Component<NavbarProps> {}
 export default Navbar;
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index eea7ba15e4..d8b130167f 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type NavbarBrandProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
+export interface NavbarBrandProps extends React.HTMLProps<HTMLAnchorElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class NavbarBrand<T = {[key: string]: any}> extends React.Component<NavbarBrandProps<T>> {}
+declare class NavbarBrand<T = {[key: string]: any}> extends React.Component<NavbarBrandProps> {}
 export default NavbarBrand;
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index f4e1e212e5..02c8204c45 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type NavbarTogglerProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
+export interface NavbarTogglerProps extends React.HTMLProps<HTMLAnchorElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   type?: string;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class NavbarToggler<T = {[key: string]: any}> extends React.Component<NavbarTogglerProps<T>> {}
+declare class NavbarToggler<T = {[key: string]: any}> extends React.Component<NavbarTogglerProps> {}
 export default NavbarToggler;
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 5c614bf208..6458b793f3 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type PaginationProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface PaginationProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   className?: string;
   listClassName?: string;
   cssModule?: CSSModule;
@@ -9,7 +10,7 @@ export type PaginationProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   tag?: React.ReactType;
   listTag?: React.ReactType;
   'aria-label'?: string;
-} & T;
+}
 
-declare class Pagination<T = {[key: string]: any}> extends React.Component<PaginationProps<T>> {}
+declare class Pagination<T = {[key: string]: any}> extends React.Component<PaginationProps> {}
 export default Pagination;
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index b2567f5402..2a9ac142b9 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type PaginationItemProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface PaginationItemProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   className?: string;
   cssModule?: CSSModule;
   active?: boolean;
   disabled?: boolean;
   tag?: React.ReactType;
-} & T;
+}
 
-declare class PaginationItem<T = {[key: string]: any}> extends React.Component<PaginationItemProps<T>> {}
+declare class PaginationItem<T = {[key: string]: any}> extends React.Component<PaginationItemProps> {}
 export default PaginationItem;
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index 6849a37aeb..dd693ea413 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type PaginationLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
+export interface PaginationLinkProps extends React.HTMLProps<HTMLAnchorElement> {
+  [key: string]: any;
   'aria-label'?: string;
   className?: string;
   cssModule?: CSSModule;
@@ -10,7 +11,7 @@ export type PaginationLinkProps<T = {}> = React.HTMLProps<HTMLAnchorElement> & {
   first?: boolean;
   last?: boolean;
   tag?: React.ReactType;
-} & T;
+}
 
-declare class PaginationLink<T = {[key: string]: any}> extends React.Component<PaginationLinkProps<T>> {}
+declare class PaginationLink<T = {[key: string]: any}> extends React.Component<PaginationLinkProps> {}
 export default PaginationLink;
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index 0c23723dc9..88bd22b874 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -2,7 +2,8 @@ import * as React from 'react';
 import * as Popper from 'popper.js';
 import { CSSModule } from '../index';
 
-export type PopoverProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   isOpen?: boolean;
   toggle?: () => void;
   target: string | HTMLElement;
@@ -19,11 +20,11 @@ export type PopoverProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
   fade?: boolean;
   flip?: boolean;
-} & T;
+}
 
-export type UncontrolledPopoverProps<T = {}> = PopoverProps<T> & {
+export interface UncontrolledPopoverProps extends PopoverProps {
     defaultOpen?: boolean;
-};
+}
 
-declare class Popover<T> extends React.Component<PopoverProps<T>> {}
+declare class Popover<T> extends React.Component<PopoverProps> {}
 export default Popover;
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
index ef274a0558..de7567f059 100644
--- a/types/reactstrap/lib/PopoverBody.d.ts
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type PopoverBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface PopoverBodyProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class PopoverBody<T = {[key: string]: any}> extends React.Component<PopoverBodyProps<T>> {}
+declare class PopoverBody<T = {[key: string]: any}> extends React.Component<PopoverBodyProps> {}
 export default PopoverBody;
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
index 2ee7d5665e..a2f3c79b2b 100644
--- a/types/reactstrap/lib/PopoverHeader.d.ts
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type PopoverHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface PopoverHeaderProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class PopoverHeader<T = {[key: string]: any}> extends React.Component<PopoverHeaderProps<T>> {}
+declare class PopoverHeader<T = {[key: string]: any}> extends React.Component<PopoverHeaderProps> {}
 export default PopoverHeader;
diff --git a/types/reactstrap/lib/Progress.d.ts b/types/reactstrap/lib/Progress.d.ts
index 3a6b8178fa..a6ffbcaffd 100644
--- a/types/reactstrap/lib/Progress.d.ts
+++ b/types/reactstrap/lib/Progress.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ProgressProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   bar?: boolean;
   multi?: boolean;
   tag?: string;
@@ -13,7 +14,7 @@ export type ProgressProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   barClassName?: string;
-} & T;
+}
 
-declare class Progress<T = {[key: string]: any}> extends React.Component<ProgressProps<T>> {}
+declare class Progress<T = {[key: string]: any}> extends React.Component<ProgressProps> {}
 export default Progress;
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index c8887e3e12..1f952c6da8 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type RowProps<T = {}> = React.HTMLProps<HTMLElement> & {
+export interface RowProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
   className?: string;
   cssModule?: CSSModule;
   tag?: React.ReactType;
   noGutters?: boolean;
-} & T;
+}
 
-declare class Row<T = {[key: string]: any}> extends React.Component<RowProps<T>> {}
+declare class Row<T = {[key: string]: any}> extends React.Component<RowProps> {}
 export default Row;
diff --git a/types/reactstrap/lib/Spinner.d.ts b/types/reactstrap/lib/Spinner.d.ts
index 3f60d0d77d..aa5542db80 100644
--- a/types/reactstrap/lib/Spinner.d.ts
+++ b/types/reactstrap/lib/Spinner.d.ts
@@ -1,14 +1,15 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type SpinnerProps<T = {}> = React.HTMLProps<HTMLElement> & {
+export interface SpinnerProps extends React.HTMLProps<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   type?: string;
   size?: any;
   color?: string;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Spinner<T = {[key: string]: any}> extends React.Component<SpinnerProps<T>> {}
+declare class Spinner<T = {[key: string]: any}> extends React.Component<SpinnerProps> {}
 export default Spinner;
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index 6597484f9e..ee8b5f7f6f 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type TabContentProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   activeTab?: number | string;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class TabContent<T> extends React.Component<TabContentProps<T>> {}
+declare class TabContent<T> extends React.Component<TabContentProps> {}
 export default TabContent;
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index 7f4624e23a..4c578d9db1 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type TabPaneProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface TabPaneProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   tabId?: number | string;
-} & T;
+}
 
-declare class TabPane<T = {[key: string]: any}> extends React.Component<TabPaneProps<T>> {}
+declare class TabPane<T = {[key: string]: any}> extends React.Component<TabPaneProps> {}
 export default TabPane;
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index 8e59b6a13e..0d671f6097 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type TableProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface TableProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   className?: string;
   cssModule?: CSSModule;
   size?: string;
@@ -14,7 +15,7 @@ export type TableProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   responsive?: boolean;
   tag?: React.ReactType;
   responsiveTag?: React.ReactType;
-} & T;
+}
 
-declare class Table<T = {[key: string]: any}> extends React.Component<TableProps<T>> {}
+declare class Table<T = {[key: string]: any}> extends React.Component<TableProps> {}
 export default Table;
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index dbec4c3516..49ef03fbee 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -1,13 +1,14 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type TagProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface TagProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   color?: string;
   pill?: boolean;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
-} & T;
+}
 
-declare class Tag<T = {[key: string]: any}> extends React.Component<TagProps<T>> {}
+declare class Tag<T = {[key: string]: any}> extends React.Component<TagProps> {}
 export default Tag;
diff --git a/types/reactstrap/lib/Toast.d.ts b/types/reactstrap/lib/Toast.d.ts
index 44824bd155..9828ad8468 100644
--- a/types/reactstrap/lib/Toast.d.ts
+++ b/types/reactstrap/lib/Toast.d.ts
@@ -2,7 +2,8 @@ import * as React from "react";
 import { CSSModule } from "../index";
 import { FadeProps } from "./Fade";
 
-export type ToastProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ToastProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
@@ -10,7 +11,7 @@ export type ToastProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   isOpen?: boolean;
   fade?: boolean;
   transition?: FadeProps;
-} & T;
+}
 
-declare class Toast<T> extends React.Component<ToastProps<T>> {}
+declare class Toast<T> extends React.Component<ToastProps> {}
 export default Toast;
diff --git a/types/reactstrap/lib/ToastBody.d.ts b/types/reactstrap/lib/ToastBody.d.ts
index 55ae7ae502..9b9cc2ea81 100644
--- a/types/reactstrap/lib/ToastBody.d.ts
+++ b/types/reactstrap/lib/ToastBody.d.ts
@@ -1,12 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ToastBodyProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ToastBodyProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   innerRef?: React.Ref<HTMLElement>;
-} & T;
+}
 
-declare class ToastBody<T = {[key: string]: any}> extends React.Component<ToastBodyProps<T>> {}
+declare class ToastBody<T = {[key: string]: any}> extends React.Component<ToastBodyProps> {}
 export default ToastBody;
diff --git a/types/reactstrap/lib/ToastHeader.d.ts b/types/reactstrap/lib/ToastHeader.d.ts
index 3fe589c11e..223a9d21fd 100644
--- a/types/reactstrap/lib/ToastHeader.d.ts
+++ b/types/reactstrap/lib/ToastHeader.d.ts
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ToastHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface ToastHeaderProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   tag?: React.ReactType;
   className?: string;
   cssModule?: CSSModule;
@@ -11,7 +12,7 @@ export type ToastHeaderProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   close?: React.ReactNode;
   charCode?: string | number;
   closeAriaLabel?: string;
-} & T;
+}
 
-declare class ToastHeader<T = {[key: string]: any}> extends React.Component<ToastHeaderProps<T>> {}
+declare class ToastHeader<T = {[key: string]: any}> extends React.Component<ToastHeaderProps> {}
 export default ToastHeader;
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index f7105362a7..f319427a2e 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -2,7 +2,8 @@ import * as React from 'react';
 import * as Popper from 'popper.js';
 import { CSSModule } from '../index';
 
-export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
+export interface UncontrolledTooltipProps extends React.HTMLAttributes<HTMLElement> {
+  [key: string]: any;
   target: string | HTMLElement;
   container?: string | HTMLElement;
   delay?: number | {show: number, hide: number};
@@ -14,13 +15,12 @@ export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   cssModule?: CSSModule;
   fade?: boolean;
   flip?: boolean;
-} & T;
-export type UncontrolledTooltipProps<T = {}> = UncontrolledProps<T>;
+}
 
-export type TooltipProps<T = {}> = UncontrolledTooltipProps<T> & {
+export interface TooltipProps extends UncontrolledTooltipProps {
   toggle?: () => void;
   isOpen?: boolean;
-};
+}
 
-declare class Tooltip<T> extends React.Component<TooltipProps<T>> {}
+declare class Tooltip<T> extends React.Component<TooltipProps> {}
 export default Tooltip;
diff --git a/types/reactstrap/lib/Uncontrolled.d.ts b/types/reactstrap/lib/Uncontrolled.d.ts
index f20db2f896..2a52fdf05d 100644
--- a/types/reactstrap/lib/Uncontrolled.d.ts
+++ b/types/reactstrap/lib/Uncontrolled.d.ts
@@ -8,13 +8,13 @@ import { UncontrolledCollapseProps       } from './Collapse';
 import { UncontrolledCarouselProps       } from './Carousel';
 import { UncontrolledPopoverProps        } from './Popover';
 
-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 class UncontrolledCollapse<T = {}> extends React.Component<UncontrolledCollapseProps<T>> {}
-export class UncontrolledCarousel<T = {}> extends React.Component<UncontrolledCarouselProps<T>> {}
-export class UncontrolledPopover<T = {}> extends React.Component<UncontrolledPopoverProps<T>> {}
+export class UncontrolledAlert<T = {}> extends React.Component<UncontrolledAlertProps> {}
+export class UncontrolledButtonDropdown<T = {}> extends React.Component<UncontrolledButtonDropdownProps> {}
+export class UncontrolledDropdown<T = {}> extends React.Component<UncontrolledDropdownProps> {}
+export class UncontrolledTooltip<T = {}> extends React.Component<UncontrolledTooltipProps> {}
+export class UncontrolledCollapse<T = {}> extends React.Component<UncontrolledCollapseProps> {}
+export class UncontrolledCarousel<T = {}> extends React.Component<UncontrolledCarouselProps> {}
+export class UncontrolledPopover<T = {}> extends React.Component<UncontrolledPopoverProps> {}
 
 export { UncontrolledAlertProps          } from './Alert';
 export { UncontrolledButtonDropdownProps } from './ButtonDropdown';