From d47cf790161f591816573592eb77cf5179870876 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Sun, 10 Mar 2024 13:37:10 +0900
Subject: [PATCH 1/6] Button : deprecate `isSmall` prop

---
 packages/components/src/button/index.tsx      |  5 +++++
 packages/components/src/button/test/index.tsx |  7 +++++--
 packages/components/src/button/types.ts       | 10 +---------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
index a16f190e44704b..b2671f0139f738 100644
--- a/packages/components/src/button/index.tsx
+++ b/packages/components/src/button/index.tsx
@@ -49,6 +49,11 @@ function useDeprecatedProps( {
 	};
 
 	if ( isSmall ) {
+		deprecated( 'Button isSmall prop', {
+			since: '6.6',
+			alternative: 'size="small"',
+			version: '6.9',
+		} );
 		computedSize ??= 'small';
 	}
 
diff --git a/packages/components/src/button/test/index.tsx b/packages/components/src/button/test/index.tsx
index 699db1b75429f0..492db82c8784ce 100644
--- a/packages/components/src/button/test/index.tsx
+++ b/packages/components/src/button/test/index.tsx
@@ -43,7 +43,7 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should render a button element with is-secondary and is-small class', () => {
-			render( <Button variant="secondary" isSmall /> );
+			render( <Button variant="secondary" size="small" /> );
 			const button = screen.getByRole( 'button' );
 
 			expect( button ).toHaveClass( 'is-secondary' );
@@ -588,9 +588,11 @@ describe( 'Button', () => {
 			expect( console ).toHaveWarned();
 		} );
 
-		it( 'should not break when the legacy isSmall prop is passed', () => {
+		it( 'should warn when the isSmall prop is passed', () => {
+			// @ts-expect-error
 			render( <Button isSmall /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-small' );
+			expect( console ).toHaveWarned();
 		} );
 
 		it( 'should have the is-small class when small class prop is passed', () => {
@@ -599,6 +601,7 @@ describe( 'Button', () => {
 		} );
 
 		it( 'should prioritize the `size` prop over `isSmall`', () => {
+			// @ts-expect-error
 			render( <Button size="compact" isSmall /> );
 			expect( screen.getByRole( 'button' ) ).not.toHaveClass(
 				'is-small'
diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
index e728739806af79..7f28a05fb3fa0a 100644
--- a/packages/components/src/button/types.ts
+++ b/packages/components/src/button/types.ts
@@ -61,15 +61,6 @@ type BaseButtonProps = {
 	 * Renders a pressed button style.
 	 */
 	isPressed?: boolean;
-	// TODO: Deprecate officially (add console warning and move to DeprecatedButtonProps).
-	/**
-	 * Decreases the size of the button.
-	 *
-	 * Deprecated in favor of the `size` prop. If both props are defined, the `size` prop will take precedence.
-	 *
-	 * @deprecated Use the `'small'` value on the `size` prop instead.
-	 */
-	isSmall?: boolean;
 	/**
 	 * Sets the `aria-label` of the component, if none is provided.
 	 * Sets the Tooltip content if `showTooltip` is provided.
@@ -154,6 +145,7 @@ export type DeprecatedButtonProps = {
 	isPrimary?: boolean;
 	isSecondary?: boolean;
 	isTertiary?: boolean;
+	isSmall?: boolean;
 };
 
 export type DeprecatedIconButtonProps = {

From eb5c1779649a21d973f786432275ab025662a1aa Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Sun, 10 Mar 2024 14:01:17 +0900
Subject: [PATCH 2/6] Update changelog

---
 packages/components/CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 12489e26b6f1e0..57168277c8fdf6 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 -   `TextControl`: Add typings for `date`, `time` and `datetime-local` ([#59666](https://github.com/WordPress/gutenberg/pull/59666)).
 
+### Deprecation
+
+-   `isSmall` prop in `Button` component has been deprecated. Use `size="small"` prop instead ([#59734](https://github.com/WordPress/gutenberg/pull/59734)).
+
 ## 27.1.0 (2024-03-06)
 
 ### Bug Fix

From d768c2a1e598dba08194f2a1ab3eaedae0699474 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 18 Mar 2024 23:08:59 +0900
Subject: [PATCH 3/6] Update types

---
 packages/components/src/button/types.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
index b3fc2dbca9c6db..ce6db4b3e914bc 100644
--- a/packages/components/src/button/types.ts
+++ b/packages/components/src/button/types.ts
@@ -175,6 +175,12 @@ export type DeprecatedButtonProps = {
 	 * @ignore
 	 */
 	isTertiary?: boolean;
+	/**
+	 * Decreases the size of the button.
+	 *
+	 * @deprecated Use the `'small'` value on the `size` prop instead.
+	 * @ignore
+	 */
 	isSmall?: boolean;
 };
 

From 63a32ca18f3c1e5b22d2b39541cb9dda523becf4 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 18 Mar 2024 23:13:06 +0900
Subject: [PATCH 4/6] revert unit test changes

---
 packages/components/src/button/test/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/button/test/index.tsx b/packages/components/src/button/test/index.tsx
index 815ac525f806ee..56f7d985934a67 100644
--- a/packages/components/src/button/test/index.tsx
+++ b/packages/components/src/button/test/index.tsx
@@ -583,7 +583,7 @@ describe( 'Button', () => {
 			expect( console ).toHaveWarned();
 		} );
 
-		it( 'should warn when the isSmall prop is passed', () => {
+		it( 'should not break when the legacy isSmall prop is passed', () => {
 			render( <Button isSmall /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-small' );
 			expect( console ).toHaveWarned();

From bf42120784b200d6af339c6f13434cc189ae67af Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Mon, 18 Mar 2024 23:14:01 +0900
Subject: [PATCH 5/6] Remove version prop from deprecated function

---
 packages/components/src/button/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
index 77e184fdf9512f..cc5084ca58c3f0 100644
--- a/packages/components/src/button/index.tsx
+++ b/packages/components/src/button/index.tsx
@@ -52,7 +52,6 @@ function useDeprecatedProps( {
 		deprecated( 'Button isSmall prop', {
 			since: '6.6',
 			alternative: 'size="small"',
-			version: '6.9',
 		} );
 		computedSize ??= 'small';
 	}

From 99cb959bf2c77550cdabdf2913360207a0f161f5 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 19 Mar 2024 13:27:53 +0900
Subject: [PATCH 6/6] Remove `deprecated()` functon

---
 packages/components/src/button/index.tsx      | 4 ----
 packages/components/src/button/test/index.tsx | 1 -
 2 files changed, 5 deletions(-)

diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
index cc5084ca58c3f0..f1dcd86fb59a57 100644
--- a/packages/components/src/button/index.tsx
+++ b/packages/components/src/button/index.tsx
@@ -49,10 +49,6 @@ function useDeprecatedProps( {
 	};
 
 	if ( isSmall ) {
-		deprecated( 'Button isSmall prop', {
-			since: '6.6',
-			alternative: 'size="small"',
-		} );
 		computedSize ??= 'small';
 	}
 
diff --git a/packages/components/src/button/test/index.tsx b/packages/components/src/button/test/index.tsx
index 56f7d985934a67..9d8980e04c9313 100644
--- a/packages/components/src/button/test/index.tsx
+++ b/packages/components/src/button/test/index.tsx
@@ -586,7 +586,6 @@ describe( 'Button', () => {
 		it( 'should not break when the legacy isSmall prop is passed', () => {
 			render( <Button isSmall /> );
 			expect( screen.getByRole( 'button' ) ).toHaveClass( 'is-small' );
-			expect( console ).toHaveWarned();
 		} );
 
 		it( 'should have the is-small class when small class prop is passed', () => {