From f51705da30ccbb3f5e8b4160feb0938e726527fb Mon Sep 17 00:00:00 2001
From: Jaff Parker <andreykamozin@gmail.com>
Date: Mon, 15 Oct 2018 12:35:03 -0400
Subject: [PATCH] [reactstrap] Fixed the error that was preventing from
 extending the Button component with custom props (#29595)

* Fixed the error that was preventing from extending the Button component with custom props

* Changed from All to more specific ButtonHTMLProps
---
 types/reactstrap/lib/Button.d.ts      | 2 +-
 types/reactstrap/reactstrap-tests.tsx | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/types/reactstrap/lib/Button.d.ts b/types/reactstrap/lib/Button.d.ts
index 326e5f88de..f19ecf4e32 100644
--- a/types/reactstrap/lib/Button.d.ts
+++ b/types/reactstrap/lib/Button.d.ts
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
 
-export type ButtonProps<T = {}> = React.HTMLProps<HTMLButtonElement> & {
+export type ButtonProps<T = {}> = React.ButtonHTMLAttributes<HTMLButtonElement> & {
   outline?: boolean;
   active?: boolean;
   block?: boolean;
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 48afb0ce31..ee8b39ae45 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -278,6 +278,11 @@ const Example13 = (
   </div>
 );
 
+interface CustomButtonProps extends ButtonProps {
+  customProp: string;
+}
+const CustomButton: React.SFC<CustomButtonProps> = props => <Button {...props} />;
+
 class Example14 extends React.Component<any, any> {
   state: any;
   constructor(props: any) {
@@ -3759,7 +3764,7 @@ import { default as Alert_ } from './lib/Alert'; /* tslint:disable-line: no-rela
 import { default as Badge_ } from './lib/Badge'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as Breadcrumb_ } from './lib/Breadcrumb'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as BreadcrumbItem_ } from './lib/BreadcrumbItem'; /* tslint:disable-line: no-relative-import-in-test */
-import { default as Button_ } from './lib/Button'; /* tslint:disable-line: no-relative-import-in-test */
+import { default as Button_, ButtonProps } from './lib/Button'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as ButtonDropdown_ } from './lib/ButtonDropdown'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as ButtonGroup_ } from './lib/ButtonGroup'; /* tslint:disable-line: no-relative-import-in-test */
 import { default as ButtonToolbar_ } from './lib/ButtonToolbar'; /* tslint:disable-line: no-relative-import-in-test */