From cceede3017c53f356a336b19d99da245607a2a2e Mon Sep 17 00:00:00 2001
From: Pedro Durek <pedro.durek@shopify.com>
Date: Thu, 8 Apr 2021 16:37:44 -0500
Subject: [PATCH 1/2] Fix button types

---
 src/types.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/types.ts b/src/types.ts
index b4d67846585..4f15e0ffc32 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -38,17 +38,17 @@ export interface BaseButton {
   /** Indicates the ID of the element that describes the button */
   ariaDescribedBy?: string;
   /** Callback when clicked */
-  onClick?(): void;
+  onClick?: React.MouseEventHandler<HTMLButtonElement>;
   /** Callback when button becomes focussed */
-  onFocus?(): void;
+  onFocus?: React.FocusEventHandler<HTMLButtonElement>;
   /** Callback when focus leaves button */
-  onBlur?(): void;
+  onBlur?: React.FocusEventHandler<HTMLButtonElement>;
   /** Callback when a keypress event is registered on the button */
-  onKeyPress?(event: React.KeyboardEvent<HTMLButtonElement>): void;
+  onKeyPress?: React.KeyboardEventHandler<HTMLButtonElement>;
   /** Callback when a keyup event is registered on the button */
-  onKeyUp?(event: React.KeyboardEvent<HTMLButtonElement>): void;
+  onKeyUp?: React.KeyboardEventHandler<HTMLButtonElement>;
   /** Callback when a keydown event is registered on the button */
-  onKeyDown?(event: React.KeyboardEvent<HTMLButtonElement>): void;
+  onKeyDown?: React.KeyboardEventHandler<HTMLButtonElement>;
   /** Callback when mouse enter */
   onMouseEnter?(): void;
   /** Callback when element is touched */

From 37b695ab4a77f5e4d8ac4370f1674fe1facf4897 Mon Sep 17 00:00:00 2001
From: Pedro Durek <pedro.durek@shopify.com>
Date: Thu, 8 Apr 2021 16:42:05 -0500
Subject: [PATCH 2/2] Fix remaining callbacks (types)

---
 src/types.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types.ts b/src/types.ts
index 4f15e0ffc32..490d9e881a4 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -50,9 +50,9 @@ export interface BaseButton {
   /** Callback when a keydown event is registered on the button */
   onKeyDown?: React.KeyboardEventHandler<HTMLButtonElement>;
   /** Callback when mouse enter */
-  onMouseEnter?(): void;
+  onMouseEnter?: React.MouseEventHandler<HTMLButtonElement>;
   /** Callback when element is touched */
-  onTouchStart?(): void;
+  onTouchStart?: React.TouchEventHandler<HTMLButtonElement>;
 }
 
 export interface Action {