diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 75343e4b64..126957eed5 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -10,6 +10,7 @@
 //                 Georg Steinmetz <https://github.com/georg94>
 //                 Kyle Tsang <https://github.com/kyletsang>
 //                 Hayato Shimokawa <https://github.com/ichiwa>
+//                 Bill Parrott <https://github.com/chimericdream>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.9
 
diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index 61ce1e85bc..68f29d11de 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -3,16 +3,16 @@ import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
 export interface UncontrolledAlertProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  className?: string;
-  cssModule?: CSSModule;
-  color?: string;
-  tag?: React.ReactType;
-  transition?: FadeProps;
+    [key: string]: any;
+    className?: string;
+    cssModule?: CSSModule;
+    color?: string;
+    tag?: string | React.ReactType;
+    transition?: FadeProps;
 }
 export interface AlertProps extends UncontrolledAlertProps {
-  isOpen?: boolean;
-  toggle?: () => void;
+    isOpen?: boolean;
+    toggle?: React.MouseEventHandler<any>;
 }
 
 declare class Alert<T = {[key: string]: any}> extends React.Component<AlertProps> {}
diff --git a/types/reactstrap/lib/Badge.d.ts b/types/reactstrap/lib/Badge.d.ts
index b64ec53441..223b9ee427 100644
--- a/types/reactstrap/lib/Badge.d.ts
+++ b/types/reactstrap/lib/Badge.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface BadgeProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  color?: string;
-  pill?: boolean;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    color?: string;
+    pill?: boolean;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Badge<T = {[key: string]: any}> extends React.Component<BadgeProps> {}
diff --git a/types/reactstrap/lib/BreadcrumbItem.d.ts b/types/reactstrap/lib/BreadcrumbItem.d.ts
index 6ecd81b079..09f77f37b3 100644
--- a/types/reactstrap/lib/BreadcrumbItem.d.ts
+++ b/types/reactstrap/lib/BreadcrumbItem.d.ts
@@ -2,13 +2,13 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface BreadcrumbItemProps extends React.HTMLAttributes<HTMLElement> {
-  tag?: React.ReactType;
-  active?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  // if a is passed as a string
-  // this could be href
-  [others: string]: any;
+    tag?: string | React.ReactType;
+    active?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    // if a is passed as a string
+    // this could be href
+    [others: string]: any;
 }
 
 declare class BreadcrumbItem<T = {[key: string]: any}> extends React.Component<BreadcrumbItemProps> {}
diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index 8460a46035..afd4217e89 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -2,21 +2,19 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
-  [key: string]: any;
-  outline?: boolean;
-  active?: boolean;
-  block?: boolean;
-  color?: string;
-  disabled?: boolean;
-  tag?: React.ReactType;
-  innerRef?: React.Ref<HTMLButtonElement>;
-
-  onClick?: React.MouseEventHandler<any>;
-  size?: any;
-  id?: string;
-  style?: React.CSSProperties;
-
-  cssModule?: CSSModule;
+    [key: string]: any;
+    outline?: boolean;
+    active?: boolean;
+    block?: boolean;
+    color?: string;
+    disabled?: boolean;
+    tag?: string | React.ReactType;
+    innerRef?: React.Ref<HTMLButtonElement>;
+    onClick?: React.MouseEventHandler<any>;
+    size?: any;
+    id?: string;
+    style?: React.CSSProperties;
+    cssModule?: CSSModule;
 }
 
 declare class Button<T = {[key: string]: any}> extends React.Component<ButtonProps> {}
diff --git a/types/reactstrap/lib/ButtonGroup.d.ts b/types/reactstrap/lib/ButtonGroup.d.ts
index fab9dfb712..110fc44b29 100644
--- a/types/reactstrap/lib/ButtonGroup.d.ts
+++ b/types/reactstrap/lib/ButtonGroup.d.ts
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ButtonGroupProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  'aria-label'?: string;
-  className?: string;
-  cssModule?: CSSModule;
-  role?: string;
-  size?: string;
-  vertical?: boolean;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    'aria-label'?: string;
+    className?: string;
+    cssModule?: CSSModule;
+    role?: string;
+    size?: string;
+    vertical?: boolean;
 }
 
 declare class ButtonGroup<T = {[key: string]: any}> extends React.Component<ButtonGroupProps> {}
diff --git a/types/reactstrap/lib/ButtonToolbar.d.ts b/types/reactstrap/lib/ButtonToolbar.d.ts
index 1396b2433e..c53654267a 100644
--- a/types/reactstrap/lib/ButtonToolbar.d.ts
+++ b/types/reactstrap/lib/ButtonToolbar.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ButtonToolbarProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  'aria-label'?: string;
-  className?: string;
-  cssModule?: CSSModule;
-  role?: string;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    'aria-label'?: string;
+    className?: string;
+    cssModule?: CSSModule;
+    role?: string;
 }
 
 declare class ButtonToolbar<T = {[key: string]: any}> extends React.Component<ButtonToolbarProps> {}
diff --git a/types/reactstrap/lib/Card.d.ts b/types/reactstrap/lib/Card.d.ts
index 3de8b2dc1d..e1504b64b9 100644
--- a/types/reactstrap/lib/Card.d.ts
+++ b/types/reactstrap/lib/Card.d.ts
@@ -2,15 +2,15 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  inverse?: boolean;
-  color?: string;
-  body?: boolean;
-  outline?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  style?: React.CSSProperties;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    inverse?: boolean;
+    color?: string;
+    body?: boolean;
+    outline?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    style?: React.CSSProperties;
 }
 
 declare class Card<T = {[key: string]: any}> extends React.Component<CardProps> {}
diff --git a/types/reactstrap/lib/CardBody.d.ts b/types/reactstrap/lib/CardBody.d.ts
index 59c61bfadb..3155f8affe 100644
--- a/types/reactstrap/lib/CardBody.d.ts
+++ b/types/reactstrap/lib/CardBody.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardBodyProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardBody<T = {[key: string]: any}> extends React.Component<CardBodyProps> {}
diff --git a/types/reactstrap/lib/CardColumns.d.ts b/types/reactstrap/lib/CardColumns.d.ts
index 139b53a5a3..c19f87ec14 100644
--- a/types/reactstrap/lib/CardColumns.d.ts
+++ b/types/reactstrap/lib/CardColumns.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardColumnsProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardColumns<T = {[key: string]: any}> extends React.Component<CardColumnsProps> {}
diff --git a/types/reactstrap/lib/CardDeck.d.ts b/types/reactstrap/lib/CardDeck.d.ts
index e8632747f3..38997e8389 100644
--- a/types/reactstrap/lib/CardDeck.d.ts
+++ b/types/reactstrap/lib/CardDeck.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardDeckProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardDeck<T = {[key: string]: any}> extends React.Component<CardDeckProps> {}
diff --git a/types/reactstrap/lib/CardFooter.d.ts b/types/reactstrap/lib/CardFooter.d.ts
index 61c80dc756..694826b37f 100644
--- a/types/reactstrap/lib/CardFooter.d.ts
+++ b/types/reactstrap/lib/CardFooter.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardFooterProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardFooter<T = {[key: string]: any}> extends React.Component<CardFooterProps> {}
diff --git a/types/reactstrap/lib/CardGroup.d.ts b/types/reactstrap/lib/CardGroup.d.ts
index 69dde4198c..e200ba6ff0 100644
--- a/types/reactstrap/lib/CardGroup.d.ts
+++ b/types/reactstrap/lib/CardGroup.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardGroupProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardGroup<T = {[key: string]: any}> extends React.Component<CardGroupProps> {}
diff --git a/types/reactstrap/lib/CardHeader.d.ts b/types/reactstrap/lib/CardHeader.d.ts
index be946f21bc..4e9480bea4 100644
--- a/types/reactstrap/lib/CardHeader.d.ts
+++ b/types/reactstrap/lib/CardHeader.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardHeaderProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardHeader<T = {[key: string]: any}> extends React.Component<CardHeaderProps> {}
diff --git a/types/reactstrap/lib/CardImg.d.ts b/types/reactstrap/lib/CardImg.d.ts
index fc86aaeb37..1e9811c845 100644
--- a/types/reactstrap/lib/CardImg.d.ts
+++ b/types/reactstrap/lib/CardImg.d.ts
@@ -2,16 +2,16 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardImgProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  top?: boolean;
-  bottom?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  src?: string;
-  width?: string;
-  height?: string;
-  alt?: string;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    top?: boolean;
+    bottom?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    src?: string;
+    width?: string;
+    height?: string;
+    alt?: string;
 }
 
 declare class CardImg<T = {[key: string]: any}> extends React.Component<CardImgProps> {}
diff --git a/types/reactstrap/lib/CardImgOverlay.d.ts b/types/reactstrap/lib/CardImgOverlay.d.ts
index d20a83dbb5..cee7f1ee7a 100644
--- a/types/reactstrap/lib/CardImgOverlay.d.ts
+++ b/types/reactstrap/lib/CardImgOverlay.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardImgOverlayProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardImgOverlay<T = {[key: string]: any}> extends React.Component<CardImgOverlayProps> {}
diff --git a/types/reactstrap/lib/CardLink.d.ts b/types/reactstrap/lib/CardLink.d.ts
index 2ad18a9eda..3b91ddd801 100644
--- a/types/reactstrap/lib/CardLink.d.ts
+++ b/types/reactstrap/lib/CardLink.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardLinkProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  innerRef?: React.Ref<HTMLAnchorElement>;
-  className?: string;
-  cssModule?: CSSModule;
-  href?: string;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    innerRef?: React.Ref<HTMLAnchorElement>;
+    className?: string;
+    cssModule?: CSSModule;
+    href?: string;
 }
 
 declare class CardLink<T = {[key: string]: any}> extends React.Component<CardLinkProps> {}
diff --git a/types/reactstrap/lib/CardSubtitle.d.ts b/types/reactstrap/lib/CardSubtitle.d.ts
index ee4ef79235..dd57d11034 100644
--- a/types/reactstrap/lib/CardSubtitle.d.ts
+++ b/types/reactstrap/lib/CardSubtitle.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardSubtitleProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardSubtitle<T = {[key: string]: any}> extends React.Component<CardSubtitleProps> {}
diff --git a/types/reactstrap/lib/CardText.d.ts b/types/reactstrap/lib/CardText.d.ts
index 5ebf53d828..f00fc3fe42 100644
--- a/types/reactstrap/lib/CardText.d.ts
+++ b/types/reactstrap/lib/CardText.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardTextProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardText<T = {[key: string]: any}> extends React.Component<CardTextProps> {}
diff --git a/types/reactstrap/lib/CardTitle.d.ts b/types/reactstrap/lib/CardTitle.d.ts
index 758486f1e4..db09ce81c3 100644
--- a/types/reactstrap/lib/CardTitle.d.ts
+++ b/types/reactstrap/lib/CardTitle.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CardTitleProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class CardTitle<T = {[key: string]: any}> extends React.Component<CardTitleProps> {}
diff --git a/types/reactstrap/lib/CarouselItem.d.ts b/types/reactstrap/lib/CarouselItem.d.ts
index a6702746e2..2bf2066d22 100644
--- a/types/reactstrap/lib/CarouselItem.d.ts
+++ b/types/reactstrap/lib/CarouselItem.d.ts
@@ -2,17 +2,17 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 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;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    in?: boolean;
+    cssModule?: CSSModule;
+    slide?: boolean;
+    onEnter?: () => void;
+    onEntering?: () => void;
+    onEntered?: () => void;
+    onExit?: () => void;
+    onExiting?: () => void;
+    onExited?: () => void;
 }
 
 declare class CarouselItem<T = {[key: string]: any}> extends React.Component<CarouselItemProps> {}
diff --git a/types/reactstrap/lib/Col.d.ts b/types/reactstrap/lib/Col.d.ts
index 24554db9da..f70f66a8c3 100644
--- a/types/reactstrap/lib/Col.d.ts
+++ b/types/reactstrap/lib/Col.d.ts
@@ -13,16 +13,16 @@ export type ColumnProps
   };
 
 export interface ColProps extends React.HTMLProps<HTMLDivElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  xs?: ColumnProps;
-  sm?: ColumnProps;
-  md?: ColumnProps;
-  lg?: ColumnProps;
-  xl?: ColumnProps;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    xs?: ColumnProps;
+    sm?: ColumnProps;
+    md?: ColumnProps;
+    lg?: ColumnProps;
+    xl?: ColumnProps;
 
-  // custom widths
-  widths?: string[];
+    // custom widths
+    widths?: string[];
 }
 
 declare class Col<T = {[key: string]: any}> extends React.Component<ColProps> {}
diff --git a/types/reactstrap/lib/Collapse.d.ts b/types/reactstrap/lib/Collapse.d.ts
index 82fb603bbf..90d7d0c945 100644
--- a/types/reactstrap/lib/Collapse.d.ts
+++ b/types/reactstrap/lib/Collapse.d.ts
@@ -2,33 +2,29 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface CollapseProps extends React.HTMLProps<HTMLElement> {
-  [key: string]: any;
-  isOpen?: boolean;
-  classNames?: string;
-  cssModule?: CSSModule;
-  tag?: React.ReactType;
-  navbar?: boolean;
-  delay?: {
-    show: number
-    hide: number
-  };
-  onOpened?: () => void;
-  onClosed?: () => void;
-  onEntering?: () => void;
-  onEntered?: () => void;
-  onExit?: () => void;
-  onExiting?: () => void;
-  onExited?: () => void;
+    [key: string]: any;
+    isOpen?: boolean;
+    classNames?: string;
+    cssModule?: CSSModule;
+    tag?: string | React.ReactType;
+    navbar?: boolean;
+    delay?: {
+        show: number;
+        hide: number;
+    };
+    onOpened?: () => void;
+    onClosed?: () => void;
+    onEntering?: () => void;
+    onEntered?: () => void;
+    onExit?: () => void;
+    onExiting?: () => void;
+    onExited?: () => void;
 }
 
-export interface UncontrolledCollapseProps extends React.HTMLProps<HTMLElement> {
-  [key: string]: any;
-  isOpen?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  tag?: React.ReactType;
-  navbar?: boolean;
-  toggle?: () => void;
+export interface UncontrolledCollapseProps extends CollapseProps {
+    defaultOpen?: boolean;
+    toggler: string;
+    toggleEvents?: string[];
 }
 
 declare class Collapse<T = {[key: string]: any}> extends React.Component<CollapseProps> {}
diff --git a/types/reactstrap/lib/Container.d.ts b/types/reactstrap/lib/Container.d.ts
index 9fb41599c0..cfce37bcf5 100644
--- a/types/reactstrap/lib/Container.d.ts
+++ b/types/reactstrap/lib/Container.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ContainerProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  fluid?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    fluid?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Container<T = {[key: string]: any}> extends React.Component<ContainerProps> {}
diff --git a/types/reactstrap/lib/Dropdown.d.ts b/types/reactstrap/lib/Dropdown.d.ts
index 8f7f55abe6..b5823a0843 100644
--- a/types/reactstrap/lib/Dropdown.d.ts
+++ b/types/reactstrap/lib/Dropdown.d.ts
@@ -7,25 +7,29 @@ export type Direction =
   | "left"
   | "right";
 
-export interface UncontrolledDropdownProps extends React.HTMLAttributes<HTMLElement> {
+export interface DropdownProps extends React.HTMLAttributes<HTMLElement> {
   [key: string]: any;
+  disabled?: boolean;
+  direction?: Direction;
+  group?: boolean;
   isOpen?: boolean;
-  toggle?: () => void;
+  nav?: boolean;
+  active?: boolean;
+  addonType?: boolean | 'prepend' | 'append';
+  size?: string;
+  tag?: string | React.ReactType;
+  toggle?: React.KeyboardEventHandler<any> | React.MouseEventHandler<any>;
+  children?: React.ReactNode;
   className?: string;
   cssModule?: CSSModule;
-  nav?: boolean;
   inNavbar?: boolean;
   setActiveFromChild?: boolean;
 }
 
-export interface DropdownProps extends UncontrolledDropdownProps {
-  disabled?: boolean;
-  direction?: Direction;
-  group?: boolean;
-  size?: string;
-  tag?: React.ReactType;
-  addonType?: boolean | 'prepend' | 'append';
+export interface UncontrolledDropdownProps extends DropdownProps {
+  defaultOpen?: boolean;
 }
 
 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 a8c366cb75..74a5057278 100644
--- a/types/reactstrap/lib/DropdownItem.d.ts
+++ b/types/reactstrap/lib/DropdownItem.d.ts
@@ -2,17 +2,17 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface DropdownItemProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  disabled?: boolean;
-  divider?: boolean;
-  tag?: React.ReactType;
-  header?: boolean;
-  onClick?: (event: React.MouseEvent<any>) => void;
-  className?: string;
-  cssModule?: CSSModule;
-  href?: string;
-  toggle?: boolean;
-  active?: boolean;
+    [key: string]: any;
+    disabled?: boolean;
+    divider?: boolean;
+    tag?: string | React.ReactType;
+    header?: boolean;
+    onClick?: React.MouseEventHandler<any>;
+    className?: string;
+    cssModule?: CSSModule;
+    href?: string;
+    toggle?: boolean;
+    active?: boolean;
 }
 
 declare class DropdownItem<T> extends React.Component<DropdownItemProps> {}
diff --git a/types/reactstrap/lib/DropdownMenu.d.ts b/types/reactstrap/lib/DropdownMenu.d.ts
index 163232f5ab..2c2400e256 100644
--- a/types/reactstrap/lib/DropdownMenu.d.ts
+++ b/types/reactstrap/lib/DropdownMenu.d.ts
@@ -3,15 +3,15 @@ import * as Popper from 'popper.js';
 import { CSSModule } from '../index';
 
 export interface DropdownMenuProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  right?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  flip?: boolean;
-  modifiers?: Popper.Modifiers;
-  persist?: boolean;
-  positionFixed?: boolean;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    right?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    flip?: boolean;
+    modifiers?: Popper.Modifiers;
+    persist?: boolean;
+    positionFixed?: boolean;
 }
 
 declare class DropdownMenu<T = {[key: string]: any}> extends React.Component<DropdownMenuProps> {}
diff --git a/types/reactstrap/lib/DropdownToggle.d.ts b/types/reactstrap/lib/DropdownToggle.d.ts
index 93cbb25523..24657698b8 100644
--- a/types/reactstrap/lib/DropdownToggle.d.ts
+++ b/types/reactstrap/lib/DropdownToggle.d.ts
@@ -2,20 +2,20 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface DropdownToggleProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  caret?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  disabled?: boolean;
-  onClick?: React.MouseEventHandler<any>;
-  outline?: boolean;
-  'data-toggle'?: string;
-  'aria-haspopup'?: boolean;
-  split?: boolean;
-  tag?: React.ReactType;
-  nav?: boolean;
-  color?: string;
-  size?: string;
+    [key: string]: any;
+    caret?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    disabled?: boolean;
+    onClick?: React.MouseEventHandler<any>;
+    outline?: boolean;
+    'data-toggle'?: string;
+    'aria-haspopup'?: boolean;
+    split?: boolean;
+    tag?: string | React.ReactType;
+    nav?: boolean;
+    color?: string;
+    size?: string;
 }
 
 declare class DropdownToggle<T> extends React.Component<DropdownToggleProps> {}
diff --git a/types/reactstrap/lib/Fade.d.ts b/types/reactstrap/lib/Fade.d.ts
index 899fb89e99..e04fc93e48 100644
--- a/types/reactstrap/lib/Fade.d.ts
+++ b/types/reactstrap/lib/Fade.d.ts
@@ -2,21 +2,21 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface FadeProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  in?: boolean;
-  baseClass?: string;
-  baseClassIn?: string;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  transitionAppearTimeout?: number;
-  transitionEnterTimeout?: number;
-  transitionLeaveTimeout?: number;
-  transitionAppear?: boolean;
-  transitionEnter?: boolean;
-  transitionLeave?: boolean;
-  onLeave?: () => void;
-  onEnter?: () => void;
+    [key: string]: any;
+    in?: boolean;
+    baseClass?: string;
+    baseClassIn?: string;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    transitionAppearTimeout?: number;
+    transitionEnterTimeout?: number;
+    transitionLeaveTimeout?: number;
+    transitionAppear?: boolean;
+    transitionEnter?: boolean;
+    transitionLeave?: boolean;
+    onLeave?: () => void;
+    onEnter?: () => void;
 }
 
 declare class Fade<T = {[key: string]: any}> extends React.Component<FadeProps> {}
diff --git a/types/reactstrap/lib/Form.d.ts b/types/reactstrap/lib/Form.d.ts
index a0e49945ed..9f52c185c6 100644
--- a/types/reactstrap/lib/Form.d.ts
+++ b/types/reactstrap/lib/Form.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface FormProps extends React.HTMLProps<HTMLFormElement> {
-  [key: string]: any;
-  inline?: boolean;
-  tag?: React.ReactType;
-  innerRef?: React.Ref<HTMLFormElement>;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    inline?: boolean;
+    tag?: string | React.ReactType;
+    innerRef?: React.Ref<HTMLFormElement>;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Form<T> extends React.Component<FormProps> {}
diff --git a/types/reactstrap/lib/FormGroup.d.ts b/types/reactstrap/lib/FormGroup.d.ts
index fb8423b66c..8d8cd42a96 100644
--- a/types/reactstrap/lib/FormGroup.d.ts
+++ b/types/reactstrap/lib/FormGroup.d.ts
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface FormGroupProps extends React.HTMLProps<HTMLDivElement> {
-  [key: string]: any;
-  row?: boolean;
-  check?: boolean;
-  inline?: boolean;
-  disabled?: boolean;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    row?: boolean;
+    check?: boolean;
+    inline?: boolean;
+    disabled?: boolean;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class FormGroup<T = {[key: string]: any}> extends React.Component<FormGroupProps> {}
diff --git a/types/reactstrap/lib/FormText.d.ts b/types/reactstrap/lib/FormText.d.ts
index 57f1baef56..2e0a4168b9 100644
--- a/types/reactstrap/lib/FormText.d.ts
+++ b/types/reactstrap/lib/FormText.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface FormTextProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  inline?: boolean;
-  tag?: React.ReactType;
-  color?: string;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    inline?: boolean;
+    tag?: string | React.ReactType;
+    color?: string;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class FormText<T = {[key: string]: any}> extends React.Component<FormTextProps> {}
diff --git a/types/reactstrap/lib/Input.d.ts b/types/reactstrap/lib/Input.d.ts
index 05f286b191..c736c2ebcc 100644
--- a/types/reactstrap/lib/Input.d.ts
+++ b/types/reactstrap/lib/Input.d.ts
@@ -29,18 +29,18 @@ export type InputType =
   | 'color';
 
 export interface InputProps extends React.InputHTMLAttributes<HTMLInputElement> {
-  [key: string]: any;
-  type?: InputType;
-  bsSize?: 'lg' | 'sm';
-  state?: string;
-  valid?: boolean;
-  invalid?: boolean;
-  tag?: React.ReactType;
-  innerRef?: React.Ref<HTMLInputElement>;
-  plaintext?: boolean;
-  addon?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    type?: InputType;
+    bsSize?: 'lg' | 'sm';
+    state?: string;
+    valid?: boolean;
+    invalid?: boolean;
+    tag?: string | React.ReactType;
+    innerRef?: React.Ref<HTMLInputElement>;
+    plaintext?: boolean;
+    addon?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Input<T> extends React.Component<InputProps> {}
diff --git a/types/reactstrap/lib/InputGroup.d.ts b/types/reactstrap/lib/InputGroup.d.ts
index 0424e42b8b..757a62a1f8 100644
--- a/types/reactstrap/lib/InputGroup.d.ts
+++ b/types/reactstrap/lib/InputGroup.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface InputGroupProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  size?: string;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    size?: string;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class InputGroup<T = {[key: string]: any}> extends React.Component<InputGroupProps> {}
diff --git a/types/reactstrap/lib/InputGroupAddon.d.ts b/types/reactstrap/lib/InputGroupAddon.d.ts
index ba46a2856d..ad500cb18d 100644
--- a/types/reactstrap/lib/InputGroupAddon.d.ts
+++ b/types/reactstrap/lib/InputGroupAddon.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface InputGroupAddonProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  addonType: 'prepend' | 'append';
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    addonType: 'prepend' | 'append';
 }
 
 declare class InputGroupAddon<T = {[key: string]: any}> extends React.Component<InputGroupAddonProps> {}
diff --git a/types/reactstrap/lib/InputGroupText.d.ts b/types/reactstrap/lib/InputGroupText.d.ts
index 358f34d96a..bf3763ff10 100644
--- a/types/reactstrap/lib/InputGroupText.d.ts
+++ b/types/reactstrap/lib/InputGroupText.d.ts
@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export interface InputGroupTextProps extends React.HTMLAttributes<HTMLElement>  {
-  [key: string]: any;
-  tag?: React.ReactType;
-  cssModule?: CSSModule;
+export interface InputGroupTextProps extends React.HTMLAttributes<HTMLElement> {
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    cssModule?: CSSModule;
 }
 
 declare class InputGroupText<T = {[key: string]: any}> extends React.Component<InputGroupTextProps> {}
diff --git a/types/reactstrap/lib/Jumbotron.d.ts b/types/reactstrap/lib/Jumbotron.d.ts
index cb0f2b4e6e..f6ff1de915 100644
--- a/types/reactstrap/lib/Jumbotron.d.ts
+++ b/types/reactstrap/lib/Jumbotron.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface JumbotronProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  fluid?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    fluid?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Jumbotron<T = {[key: string]: any}> extends React.Component<JumbotronProps> {}
diff --git a/types/reactstrap/lib/Label.d.ts b/types/reactstrap/lib/Label.d.ts
index a2d05c1574..18591dd075 100644
--- a/types/reactstrap/lib/Label.d.ts
+++ b/types/reactstrap/lib/Label.d.ts
@@ -10,7 +10,7 @@ export interface LabelProps extends React.LabelHTMLAttributes<HTMLLabelElement>
   disabled?: boolean;
   size?: string;
   for?: string;
-  tag?: string;
+  tag?: string | React.ReactType;
   className?: string;
   cssModule?: CSSModule;
   xs?: ColumnProps;
diff --git a/types/reactstrap/lib/ListGroup.d.ts b/types/reactstrap/lib/ListGroup.d.ts
index 5378409bf7..65d85eb5f2 100644
--- a/types/reactstrap/lib/ListGroup.d.ts
+++ b/types/reactstrap/lib/ListGroup.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ListGroupProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  flush?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    flush?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class ListGroup<T = {[key: string]: any}> extends React.Component<ListGroupProps> {}
diff --git a/types/reactstrap/lib/ListGroupItem.d.ts b/types/reactstrap/lib/ListGroupItem.d.ts
index 84b7b0379a..d2c5a639c5 100644
--- a/types/reactstrap/lib/ListGroupItem.d.ts
+++ b/types/reactstrap/lib/ListGroupItem.d.ts
@@ -2,17 +2,16 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ListGroupItemProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  active?: boolean;
-  disabled?: boolean;
-  color?: string;
-  action?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  href?: string;
-
-  onClick?: React.MouseEventHandler<any>;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    active?: boolean;
+    disabled?: boolean;
+    color?: string;
+    action?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    href?: string;
+    onClick?: React.MouseEventHandler<any>;
 }
 
 declare class ListGroupItem<T = {[key: string]: any}> extends React.Component<ListGroupItemProps> {}
diff --git a/types/reactstrap/lib/ListGroupItemHeading.d.ts b/types/reactstrap/lib/ListGroupItemHeading.d.ts
index 55cbe8ed70..9894025999 100644
--- a/types/reactstrap/lib/ListGroupItemHeading.d.ts
+++ b/types/reactstrap/lib/ListGroupItemHeading.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ListGroupItemHeadingProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class ListGroupItemHeading<T = {[key: string]: any}> extends React.Component<ListGroupItemHeadingProps> {}
diff --git a/types/reactstrap/lib/ListGroupItemText.d.ts b/types/reactstrap/lib/ListGroupItemText.d.ts
index afeffdc77d..707138dccc 100644
--- a/types/reactstrap/lib/ListGroupItemText.d.ts
+++ b/types/reactstrap/lib/ListGroupItemText.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ListGroupItemTextProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class ListGroupItemText<T = {[key: string]: any}> extends React.Component<ListGroupItemTextProps> {}
diff --git a/types/reactstrap/lib/Media.d.ts b/types/reactstrap/lib/Media.d.ts
index 782dd8492d..269ba1aa5b 100644
--- a/types/reactstrap/lib/Media.d.ts
+++ b/types/reactstrap/lib/Media.d.ts
@@ -2,22 +2,22 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface MediaProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  body?: boolean;
-  bottom?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  heading?: boolean;
-  left?: boolean;
-  list?: boolean;
-  middle?: boolean;
-  object?: boolean;
-  right?: boolean;
-  tag?: React.ReactType;
-  top?: boolean;
-  src?: string;
-  href?: string;
-  alt?: string;
+    [key: string]: any;
+    body?: boolean;
+    bottom?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    heading?: boolean;
+    left?: boolean;
+    list?: boolean;
+    middle?: boolean;
+    object?: boolean;
+    right?: boolean;
+    tag?: string | React.ReactType;
+    top?: boolean;
+    src?: string;
+    href?: string;
+    alt?: string;
 }
 
 declare class Media<T = {[key: string]: any}> extends React.Component<MediaProps> {}
diff --git a/types/reactstrap/lib/Modal.d.ts b/types/reactstrap/lib/Modal.d.ts
index f2c901c095..5eb24988f6 100644
--- a/types/reactstrap/lib/Modal.d.ts
+++ b/types/reactstrap/lib/Modal.d.ts
@@ -3,34 +3,34 @@ import { CSSModule } from '../index';
 import { FadeProps } from './Fade';
 
 export interface ModalProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  isOpen?: boolean;
-  autoFocus?: boolean;
-  size?: string;
-  toggle?: () => void;
-  keyboard?: boolean;
-  backdrop?: boolean | 'static';
-  scrollable?: boolean;
-  onEnter?: () => void;
-  onExit?: () => void;
-  onOpened?: () => void;
-  onClosed?: () => void;
-  className?: string;
-  cssModule?: CSSModule;
-  wrapClassName?: string;
-  modalClassName?: string;
-  backdropClassName?: string;
-  contentClassName?: string;
-  zIndex?: number | string;
-  fade?: boolean;
-  backdropTransition?: FadeProps;
-  modalTransition?: FadeProps;
-  centered?: boolean;
-  external?: React.ReactNode;
-  labelledBy?: string;
-  role?: string;
-  unmountOnClose?: boolean;
-  returnFocusAfterClose?: boolean;
+    [key: string]: any;
+    isOpen?: boolean;
+    autoFocus?: boolean;
+    size?: string;
+    toggle?: React.KeyboardEventHandler<any> | React.MouseEventHandler<any>;
+    keyboard?: boolean;
+    backdrop?: boolean | 'static';
+    scrollable?: boolean;
+    onEnter?: () => void;
+    onExit?: () => void;
+    onOpened?: () => void;
+    onClosed?: () => void;
+    className?: string;
+    cssModule?: CSSModule;
+    wrapClassName?: string;
+    modalClassName?: string;
+    backdropClassName?: string;
+    contentClassName?: string;
+    zIndex?: number | string;
+    fade?: boolean;
+    backdropTransition?: FadeProps;
+    modalTransition?: FadeProps;
+    centered?: boolean;
+    external?: React.ReactNode;
+    labelledBy?: string;
+    role?: string;
+    unmountOnClose?: boolean;
+    returnFocusAfterClose?: boolean;
 }
 
 declare class Modal<T> extends React.Component<ModalProps> {}
diff --git a/types/reactstrap/lib/ModalBody.d.ts b/types/reactstrap/lib/ModalBody.d.ts
index 9790549041..f7fca28b56 100644
--- a/types/reactstrap/lib/ModalBody.d.ts
+++ b/types/reactstrap/lib/ModalBody.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ModalBodyProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class ModalBody<T = {[key: string]: any}> extends React.Component<ModalBodyProps> {}
diff --git a/types/reactstrap/lib/ModalFooter.d.ts b/types/reactstrap/lib/ModalFooter.d.ts
index 1059ff203d..20920c5d17 100644
--- a/types/reactstrap/lib/ModalFooter.d.ts
+++ b/types/reactstrap/lib/ModalFooter.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ModalFooterProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class ModalFooter<T = {[key: string]: any}> extends React.Component<ModalFooterProps> {}
diff --git a/types/reactstrap/lib/ModalHeader.d.ts b/types/reactstrap/lib/ModalHeader.d.ts
index 7e4ceab480..dbe7706a3a 100644
--- a/types/reactstrap/lib/ModalHeader.d.ts
+++ b/types/reactstrap/lib/ModalHeader.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ModalHeaderProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  wrapTag?: React.ReactType;
-  toggle?: () => void;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    wrapTag?: string | React.ReactType;
+    toggle?: React.MouseEventHandler<any>;
 }
 
 declare class ModalHeader<T = {[key: string]: any}> extends React.Component<ModalHeaderProps> {}
diff --git a/types/reactstrap/lib/Nav.d.ts b/types/reactstrap/lib/Nav.d.ts
index deeab330be..88e9700047 100644
--- a/types/reactstrap/lib/Nav.d.ts
+++ b/types/reactstrap/lib/Nav.d.ts
@@ -2,18 +2,18 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavProps extends React.HTMLProps<HTMLUListElement> {
-  [key: string]: any;
-  tabs?: boolean;
-  pills?: boolean;
-  vertical?: boolean | string;
-  horizontal?: string;
-  justified?: boolean;
-  fill?: boolean;
-  navbar?: boolean;
-  card?: boolean;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tabs?: boolean;
+    pills?: boolean;
+    vertical?: boolean | string;
+    horizontal?: string;
+    justified?: boolean;
+    fill?: boolean;
+    navbar?: boolean;
+    card?: boolean;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Nav<T = {[key: string]: any}> extends React.Component<NavProps> {}
diff --git a/types/reactstrap/lib/NavItem.d.ts b/types/reactstrap/lib/NavItem.d.ts
index 57c52ffd22..f01620b64c 100644
--- a/types/reactstrap/lib/NavItem.d.ts
+++ b/types/reactstrap/lib/NavItem.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavItemProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  active?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    active?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class NavItem<T = {[key: string]: any}> extends React.Component<NavItemProps> {}
diff --git a/types/reactstrap/lib/NavLink.d.ts b/types/reactstrap/lib/NavLink.d.ts
index 6e0b0253e8..9e3bfa4482 100644
--- a/types/reactstrap/lib/NavLink.d.ts
+++ b/types/reactstrap/lib/NavLink.d.ts
@@ -2,15 +2,15 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavLinkProps extends React.HTMLProps<HTMLAnchorElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  innerRef?: React.Ref<HTMLAnchorElement>;
-  disabled?: boolean;
-  active?: boolean;
-  className?: string;
-  cssModule?: CSSModule;
-  onClick?: React.MouseEventHandler<any>;
-  href?: string;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    innerRef?: React.Ref<HTMLAnchorElement>;
+    disabled?: boolean;
+    active?: boolean;
+    className?: string;
+    cssModule?: CSSModule;
+    onClick?: React.MouseEventHandler<any>;
+    href?: string;
 }
 
 declare class NavLink<T> extends React.Component<NavLinkProps> {}
diff --git a/types/reactstrap/lib/Navbar.d.ts b/types/reactstrap/lib/Navbar.d.ts
index 1a86999233..469c8f9df2 100644
--- a/types/reactstrap/lib/Navbar.d.ts
+++ b/types/reactstrap/lib/Navbar.d.ts
@@ -2,18 +2,18 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavbarProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  light?: boolean;
-  dark?: boolean;
-  full?: boolean;
-  fixed?: string;
-  sticky?: string;
-  color?: string;
-  role?: string;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  expand?: boolean | string;
+    [key: string]: any;
+    light?: boolean;
+    dark?: boolean;
+    full?: boolean;
+    fixed?: string;
+    sticky?: string;
+    color?: string;
+    role?: string;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    expand?: boolean | string;
 }
 
 declare class Navbar<T = {[key: string]: any}> extends React.Component<NavbarProps> {}
diff --git a/types/reactstrap/lib/NavbarBrand.d.ts b/types/reactstrap/lib/NavbarBrand.d.ts
index d8b130167f..cb6b3e2401 100644
--- a/types/reactstrap/lib/NavbarBrand.d.ts
+++ b/types/reactstrap/lib/NavbarBrand.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavbarBrandProps extends React.HTMLProps<HTMLAnchorElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class NavbarBrand<T = {[key: string]: any}> extends React.Component<NavbarBrandProps> {}
diff --git a/types/reactstrap/lib/NavbarToggler.d.ts b/types/reactstrap/lib/NavbarToggler.d.ts
index 02c8204c45..7f59fbfcd9 100644
--- a/types/reactstrap/lib/NavbarToggler.d.ts
+++ b/types/reactstrap/lib/NavbarToggler.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface NavbarTogglerProps extends React.HTMLProps<HTMLAnchorElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  type?: string;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    type?: string;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class NavbarToggler<T = {[key: string]: any}> extends React.Component<NavbarTogglerProps> {}
diff --git a/types/reactstrap/lib/Pagination.d.ts b/types/reactstrap/lib/Pagination.d.ts
index 6458b793f3..6498549033 100644
--- a/types/reactstrap/lib/Pagination.d.ts
+++ b/types/reactstrap/lib/Pagination.d.ts
@@ -2,14 +2,14 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface PaginationProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  className?: string;
-  listClassName?: string;
-  cssModule?: CSSModule;
-  size?: string;
-  tag?: React.ReactType;
-  listTag?: React.ReactType;
-  'aria-label'?: string;
+    [key: string]: any;
+    className?: string;
+    listClassName?: string;
+    cssModule?: CSSModule;
+    size?: string;
+    tag?: string | React.ReactType;
+    listTag?: React.ReactType;
+    'aria-label'?: string;
 }
 
 declare class Pagination<T = {[key: string]: any}> extends React.Component<PaginationProps> {}
diff --git a/types/reactstrap/lib/PaginationItem.d.ts b/types/reactstrap/lib/PaginationItem.d.ts
index 2a9ac142b9..ace4fa4f16 100644
--- a/types/reactstrap/lib/PaginationItem.d.ts
+++ b/types/reactstrap/lib/PaginationItem.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface PaginationItemProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  className?: string;
-  cssModule?: CSSModule;
-  active?: boolean;
-  disabled?: boolean;
-  tag?: React.ReactType;
+    [key: string]: any;
+    className?: string;
+    cssModule?: CSSModule;
+    active?: boolean;
+    disabled?: boolean;
+    tag?: string | React.ReactType;
 }
 
 declare class PaginationItem<T = {[key: string]: any}> extends React.Component<PaginationItemProps> {}
diff --git a/types/reactstrap/lib/PaginationLink.d.ts b/types/reactstrap/lib/PaginationLink.d.ts
index dd693ea413..17791cf671 100644
--- a/types/reactstrap/lib/PaginationLink.d.ts
+++ b/types/reactstrap/lib/PaginationLink.d.ts
@@ -2,15 +2,15 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface PaginationLinkProps extends React.HTMLProps<HTMLAnchorElement> {
-  [key: string]: any;
-  'aria-label'?: string;
-  className?: string;
-  cssModule?: CSSModule;
-  next?: boolean;
-  previous?: boolean;
-  first?: boolean;
-  last?: boolean;
-  tag?: React.ReactType;
+    [key: string]: any;
+    'aria-label'?: string;
+    className?: string;
+    cssModule?: CSSModule;
+    next?: boolean;
+    previous?: boolean;
+    first?: boolean;
+    last?: boolean;
+    tag?: string | React.ReactType;
 }
 
 declare class PaginationLink<T = {[key: string]: any}> extends React.Component<PaginationLinkProps> {}
diff --git a/types/reactstrap/lib/Popover.d.ts b/types/reactstrap/lib/Popover.d.ts
index 88bd22b874..f0b5231105 100644
--- a/types/reactstrap/lib/Popover.d.ts
+++ b/types/reactstrap/lib/Popover.d.ts
@@ -3,23 +3,23 @@ import * as Popper from 'popper.js';
 import { CSSModule } from '../index';
 
 export interface PopoverProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  isOpen?: boolean;
-  toggle?: () => void;
-  target: string | HTMLElement;
-  container?: string | HTMLElement;
-  boundariesElement?: Popper.Boundary | Element;
-  className?: string;
-  placement?: Popper.Placement;
-  innerClassName?: string;
-  disabled?: boolean;
-  hideArrow?: boolean;
-  placementPrefix?: string;
-  delay?: number | {show: number, hide: number};
-  modifiers?: Popper.Modifiers;
-  cssModule?: CSSModule;
-  fade?: boolean;
-  flip?: boolean;
+    [key: string]: any;
+    isOpen?: boolean;
+    toggle?: React.MouseEventHandler<any> | (() => void);
+    target: string | HTMLElement;
+    container?: string | HTMLElement;
+    boundariesElement?: Popper.Boundary | Element;
+    className?: string;
+    placement?: Popper.Placement;
+    innerClassName?: string;
+    disabled?: boolean;
+    hideArrow?: boolean;
+    placementPrefix?: string;
+    delay?: number | { show: number; hide: number };
+    modifiers?: Popper.Modifiers;
+    cssModule?: CSSModule;
+    fade?: boolean;
+    flip?: boolean;
 }
 
 export interface UncontrolledPopoverProps extends PopoverProps {
diff --git a/types/reactstrap/lib/PopoverBody.d.ts b/types/reactstrap/lib/PopoverBody.d.ts
index de7567f059..9b4984ad0f 100644
--- a/types/reactstrap/lib/PopoverBody.d.ts
+++ b/types/reactstrap/lib/PopoverBody.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface PopoverBodyProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class PopoverBody<T = {[key: string]: any}> extends React.Component<PopoverBodyProps> {}
diff --git a/types/reactstrap/lib/PopoverHeader.d.ts b/types/reactstrap/lib/PopoverHeader.d.ts
index a2f3c79b2b..39adf7dcf6 100644
--- a/types/reactstrap/lib/PopoverHeader.d.ts
+++ b/types/reactstrap/lib/PopoverHeader.d.ts
@@ -2,10 +2,10 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface PopoverHeaderProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class PopoverHeader<T = {[key: string]: any}> extends React.Component<PopoverHeaderProps> {}
diff --git a/types/reactstrap/lib/Row.d.ts b/types/reactstrap/lib/Row.d.ts
index 3e619a4f10..8c1bcc704c 100644
--- a/types/reactstrap/lib/Row.d.ts
+++ b/types/reactstrap/lib/Row.d.ts
@@ -4,12 +4,12 @@ import { CSSModule } from '../index';
 type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
 
 export interface RowProps extends Omit<React.HTMLProps<HTMLElement>, 'form'> {
-  [key: string]: any;
-  className?: string;
-  cssModule?: CSSModule;
-  tag?: React.ReactType;
-  noGutters?: boolean;
-  form?: boolean;
+    [key: string]: any;
+    className?: string;
+    cssModule?: CSSModule;
+    tag?: string | React.ReactType;
+    noGutters?: boolean;
+    form?: boolean;
 }
 
 declare class Row<T = {[key: string]: any}> extends React.Component<RowProps> {}
diff --git a/types/reactstrap/lib/Spinner.d.ts b/types/reactstrap/lib/Spinner.d.ts
index aa5542db80..64ae91690d 100644
--- a/types/reactstrap/lib/Spinner.d.ts
+++ b/types/reactstrap/lib/Spinner.d.ts
@@ -2,13 +2,13 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface SpinnerProps extends React.HTMLProps<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  type?: string;
-  size?: any;
-  color?: string;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    type?: string;
+    size?: any;
+    color?: string;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Spinner<T = {[key: string]: any}> extends React.Component<SpinnerProps> {}
diff --git a/types/reactstrap/lib/TabContent.d.ts b/types/reactstrap/lib/TabContent.d.ts
index ee8b5f7f6f..16f478e8dc 100644
--- a/types/reactstrap/lib/TabContent.d.ts
+++ b/types/reactstrap/lib/TabContent.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface TabContentProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  activeTab?: number | string;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    activeTab?: number | string;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class TabContent<T> extends React.Component<TabContentProps> {}
diff --git a/types/reactstrap/lib/TabPane.d.ts b/types/reactstrap/lib/TabPane.d.ts
index 4c578d9db1..bbe2051ad6 100644
--- a/types/reactstrap/lib/TabPane.d.ts
+++ b/types/reactstrap/lib/TabPane.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface TabPaneProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  tabId?: number | string;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    tabId?: number | string;
 }
 
 declare class TabPane<T = {[key: string]: any}> extends React.Component<TabPaneProps> {}
diff --git a/types/reactstrap/lib/Table.d.ts b/types/reactstrap/lib/Table.d.ts
index 0d671f6097..f7a8d20417 100644
--- a/types/reactstrap/lib/Table.d.ts
+++ b/types/reactstrap/lib/Table.d.ts
@@ -2,19 +2,19 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface TableProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  className?: string;
-  cssModule?: CSSModule;
-  size?: string;
-  bordered?: boolean;
-  borderless?: boolean;
-  striped?: boolean;
-  inverse?: boolean;
-  hover?: boolean;
-  reflow?: boolean;
-  responsive?: boolean;
-  tag?: React.ReactType;
-  responsiveTag?: React.ReactType;
+    [key: string]: any;
+    className?: string;
+    cssModule?: CSSModule;
+    size?: string;
+    bordered?: boolean;
+    borderless?: boolean;
+    striped?: boolean;
+    inverse?: boolean;
+    hover?: boolean;
+    reflow?: boolean;
+    responsive?: boolean;
+    tag?: string | React.ReactType;
+    responsiveTag?: React.ReactType;
 }
 
 declare class Table<T = {[key: string]: any}> extends React.Component<TableProps> {}
diff --git a/types/reactstrap/lib/Tag.d.ts b/types/reactstrap/lib/Tag.d.ts
index 49ef03fbee..406f9eb0de 100644
--- a/types/reactstrap/lib/Tag.d.ts
+++ b/types/reactstrap/lib/Tag.d.ts
@@ -2,12 +2,12 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface TagProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  color?: string;
-  pill?: boolean;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
+    [key: string]: any;
+    color?: string;
+    pill?: boolean;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
 }
 
 declare class Tag<T = {[key: string]: any}> extends React.Component<TagProps> {}
diff --git a/types/reactstrap/lib/Toast.d.ts b/types/reactstrap/lib/Toast.d.ts
index 9828ad8468..98fd64dcbc 100644
--- a/types/reactstrap/lib/Toast.d.ts
+++ b/types/reactstrap/lib/Toast.d.ts
@@ -3,14 +3,14 @@ import { CSSModule } from "../index";
 import { FadeProps } from "./Fade";
 
 export interface ToastProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  innerRef?: React.Ref<HTMLElement>;
-  isOpen?: boolean;
-  fade?: boolean;
-  transition?: FadeProps;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    innerRef?: React.Ref<HTMLElement>;
+    isOpen?: boolean;
+    fade?: boolean;
+    transition?: FadeProps;
 }
 
 declare class Toast<T> extends React.Component<ToastProps> {}
diff --git a/types/reactstrap/lib/ToastBody.d.ts b/types/reactstrap/lib/ToastBody.d.ts
index 9b9cc2ea81..bc9d317332 100644
--- a/types/reactstrap/lib/ToastBody.d.ts
+++ b/types/reactstrap/lib/ToastBody.d.ts
@@ -2,11 +2,11 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ToastBodyProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  innerRef?: React.Ref<HTMLElement>;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    innerRef?: React.Ref<HTMLElement>;
 }
 
 declare class ToastBody<T = {[key: string]: any}> extends React.Component<ToastBodyProps> {}
diff --git a/types/reactstrap/lib/ToastHeader.d.ts b/types/reactstrap/lib/ToastHeader.d.ts
index 223a9d21fd..42c297afa8 100644
--- a/types/reactstrap/lib/ToastHeader.d.ts
+++ b/types/reactstrap/lib/ToastHeader.d.ts
@@ -2,16 +2,16 @@ import * as React from 'react';
 import { CSSModule } from '../index';
 
 export interface ToastHeaderProps extends React.HTMLAttributes<HTMLElement> {
-  [key: string]: any;
-  tag?: React.ReactType;
-  className?: string;
-  cssModule?: CSSModule;
-  wrapTag?: React.ReactType;
-  toggle?: () => void;
-  icon?: string | React.ReactNode;
-  close?: React.ReactNode;
-  charCode?: string | number;
-  closeAriaLabel?: string;
+    [key: string]: any;
+    tag?: string | React.ReactType;
+    className?: string;
+    cssModule?: CSSModule;
+    wrapTag?: string | React.ReactType;
+    toggle?: React.MouseEventHandler<any>;
+    icon?: string | React.ReactNode;
+    close?: React.ReactNode;
+    charCode?: string | number;
+    closeAriaLabel?: string;
 }
 
 declare class ToastHeader<T = {[key: string]: any}> extends React.Component<ToastHeaderProps> {}
diff --git a/types/reactstrap/lib/Tooltip.d.ts b/types/reactstrap/lib/Tooltip.d.ts
index f319427a2e..7ed3201bce 100644
--- a/types/reactstrap/lib/Tooltip.d.ts
+++ b/types/reactstrap/lib/Tooltip.d.ts
@@ -18,7 +18,7 @@ export interface UncontrolledTooltipProps extends React.HTMLAttributes<HTMLEleme
 }
 
 export interface TooltipProps extends UncontrolledTooltipProps {
-  toggle?: () => void;
+  toggle?: React.MouseEventHandler<any> | (() => void);
   isOpen?: boolean;
 }
 
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index ae208fdda1..d469a90fad 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -3898,7 +3898,7 @@ function Example117() {
     <UncontrolledButtonDropdown ref={ref}/>;
     <UncontrolledDropdown ref={ref}/>;
     <UncontrolledTooltip ref={ref} target={null as any}/>;
-    <UncontrolledCollapse ref={ref} target={null as any}/>;
+    <UncontrolledCollapse ref={ref} target={null as any} toggler="#foobar"/>;
 }
 
 function Example118() {
@@ -4072,7 +4072,7 @@ function AnyPropExample() {
       <UncontrolledButtonDropdown_ foo={1} bar={false} foobar="example" />
       <UncontrolledDropdown_ foo={1} bar={false} foobar="example" />
       <UncontrolledTooltip_ foo={1} bar={false} foobar="example" target="" />
-      <UncontrolledCollapse_ foo={1} bar={false} foobar="example" target="" />
+      <UncontrolledCollapse_ foo={1} bar={false} foobar="example" target="" toggler="#foobar" />
     </React.Fragment >
   );
 }
@@ -4243,7 +4243,7 @@ function GenericPropExample() {
       <UncontrolledButtonDropdownGeneric foo={1} bar={false} foobar="example" />
       <UncontrolledDropdownGeneric foo={1} bar={false} foobar="example" />
       <UncontrolledTooltipGeneric foo={1} bar={false} foobar="example" target="" />
-      <UncontrolledCollapseGeneric foo={1} bar={false} foobar="example" target="" />
+      <UncontrolledCollapseGeneric foo={1} bar={false} foobar="example" target="" toggler="#foobar" />
     </React.Fragment >
   );
 }