From 9e9ba33c5dffd7490b72eaa77f65d565b4ef42ba Mon Sep 17 00:00:00 2001
From: Birk Johansson <birk@dhis2.org>
Date: Mon, 15 Apr 2024 17:43:35 +0200
Subject: [PATCH 1/3] fix(button): fix prop types for button

---
 components/button/types/index.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/button/types/index.d.ts b/components/button/types/index.d.ts
index c6f91fe7d4..d4f0f2752c 100644
--- a/components/button/types/index.d.ts
+++ b/components/button/types/index.d.ts
@@ -16,7 +16,7 @@ type ButtonOpenEventHandler<
     Event extends React.SyntheticEvent = React.MouseEvent<HTMLButtonElement>
 > = (arg0: ButtonEventPayload & { open: boolean }, event: Event) => void
 
-export interface ButtonProps extends HTMLButtonElement {
+export interface ButtonProps {
     /**
      * Component to render inside the button
      */
@@ -102,7 +102,9 @@ export interface ButtonProps extends HTMLButtonElement {
     onKeyDown?: ButtonEventHandler<React.KeyboardEvent<HTMLButtonElement>>
 }
 
-export const Button: React.FC<ButtonProps>
+export const Button: React.FC<
+    ButtonProps & Omit<React.HTMLProps<HTMLButtonElement>, keyof ButtonProps>
+>
 
 export interface ButtonStripProps {
     children?: React.ReactNode

From 9c9ff02bfb2b52b842f7ce0d6050342063fd6d3f Mon Sep 17 00:00:00 2001
From: Birk Johansson <birk@dhis2.org>
Date: Thu, 16 May 2024 13:10:56 +0200
Subject: [PATCH 2/3] fix(types): update button props to follow best practices

---
 components/button/types/index.d.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/components/button/types/index.d.ts b/components/button/types/index.d.ts
index d4f0f2752c..5fd91f069e 100644
--- a/components/button/types/index.d.ts
+++ b/components/button/types/index.d.ts
@@ -16,7 +16,8 @@ type ButtonOpenEventHandler<
     Event extends React.SyntheticEvent = React.MouseEvent<HTMLButtonElement>
 > = (arg0: ButtonEventPayload & { open: boolean }, event: Event) => void
 
-export interface ButtonProps {
+
+export interface BaseButtonProps {
     /**
      * Component to render inside the button
      */
@@ -102,9 +103,9 @@ export interface ButtonProps {
     onKeyDown?: ButtonEventHandler<React.KeyboardEvent<HTMLButtonElement>>
 }
 
-export const Button: React.FC<
-    ButtonProps & Omit<React.HTMLProps<HTMLButtonElement>, keyof ButtonProps>
->
+export type ButtonProps = BaseButtonProps & Omit<React.ComponentPropsWithoutRef<'button'>, keyof BaseButtonProps>
+
+export const Button: React.FC<ButtonProps>
 
 export interface ButtonStripProps {
     children?: React.ReactNode

From 2e290c71b1c4449dad9f8bc59966bb17fcd8967b Mon Sep 17 00:00:00 2001
From: Birk Johansson <birk@dhis2.org>
Date: Wed, 22 May 2024 10:18:13 +0200
Subject: [PATCH 3/3] style(button): run prettier

---
 components/button/types/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/button/types/index.d.ts b/components/button/types/index.d.ts
index 5fd91f069e..1042e52935 100644
--- a/components/button/types/index.d.ts
+++ b/components/button/types/index.d.ts
@@ -16,7 +16,6 @@ type ButtonOpenEventHandler<
     Event extends React.SyntheticEvent = React.MouseEvent<HTMLButtonElement>
 > = (arg0: ButtonEventPayload & { open: boolean }, event: Event) => void
 
-
 export interface BaseButtonProps {
     /**
      * Component to render inside the button
@@ -103,7 +102,8 @@ export interface BaseButtonProps {
     onKeyDown?: ButtonEventHandler<React.KeyboardEvent<HTMLButtonElement>>
 }
 
-export type ButtonProps = BaseButtonProps & Omit<React.ComponentPropsWithoutRef<'button'>, keyof BaseButtonProps>
+export type ButtonProps = BaseButtonProps &
+    Omit<React.ComponentPropsWithoutRef<'button'>, keyof BaseButtonProps>
 
 export const Button: React.FC<ButtonProps>