From f3012dfa83cc5e45175a0ccd60402c9a2856eb54 Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Mon, 6 Jan 2025 11:32:55 +0530
Subject: [PATCH 1/5] fix: Removed extra tooltips component in button component

---
 .../spacing-sizes-control/linked-button.js    | 18 +++++++--------
 .../component.tsx                             | 23 ++++++++-----------
 .../src/box-control/linked-button.tsx         | 21 ++++++++---------
 3 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/packages/block-editor/src/components/spacing-sizes-control/linked-button.js b/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
index f6d56be66072ad..413dc88a52e9b9 100644
--- a/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
+++ b/packages/block-editor/src/components/spacing-sizes-control/linked-button.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { Button, Tooltip } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { link, linkOff } from '@wordpress/icons';
 import { __ } from '@wordpress/i18n';
 
@@ -9,14 +9,12 @@ export default function LinkedButton( { isLinked, ...props } ) {
 	const label = isLinked ? __( 'Unlink sides' ) : __( 'Link sides' );
 
 	return (
-		<Tooltip text={ label }>
-			<Button
-				{ ...props }
-				size="small"
-				icon={ isLinked ? link : linkOff }
-				iconSize={ 24 }
-				aria-label={ label }
-			/>
-		</Tooltip>
+		<Button
+			{ ...props }
+			size="small"
+			icon={ isLinked ? link : linkOff }
+			iconSize={ 24 }
+			label={ label }
+		/>
 	);
 }
diff --git a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
index 5388a381deb395..082f1a1e7e4797 100644
--- a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
@@ -8,7 +8,6 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import Button from '../../button';
-import Tooltip from '../../tooltip';
 import { View } from '../../view';
 import type { WordPressComponentProps } from '../../context';
 import { contextConnect } from '../../context';
@@ -25,18 +24,16 @@ const BorderBoxControlLinkedButton = (
 	const label = isLinked ? __( 'Unlink sides' ) : __( 'Link sides' );
 
 	return (
-		<Tooltip text={ label }>
-			<View className={ className }>
-				<Button
-					{ ...buttonProps }
-					size="small"
-					icon={ isLinked ? link : linkOff }
-					iconSize={ 24 }
-					aria-label={ label }
-					ref={ forwardedRef }
-				/>
-			</View>
-		</Tooltip>
+		<View className={ className }>
+			<Button
+				{ ...buttonProps }
+				size="small"
+				icon={ isLinked ? link : linkOff }
+				iconSize={ 24 }
+				label={ label }
+				ref={ forwardedRef }
+			/>
+		</View>
 	);
 };
 
diff --git a/packages/components/src/box-control/linked-button.tsx b/packages/components/src/box-control/linked-button.tsx
index 595a3c03436756..56da47706e2016 100644
--- a/packages/components/src/box-control/linked-button.tsx
+++ b/packages/components/src/box-control/linked-button.tsx
@@ -8,24 +8,21 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import Button from '../button';
-import Tooltip from '../tooltip';
 
 export default function LinkedButton( {
 	isLinked,
 	...props
 }: { isLinked?: boolean } & React.ComponentProps< typeof Button > ) {
-	const label = isLinked ? __( 'Unlink sides' ) : __( 'Link sides' );
+	const label = isLinked ? __( 'Unlink sides44' ) : __( 'Link sides' );
 
 	return (
-		<Tooltip text={ label }>
-			<Button
-				{ ...props }
-				className="component-box-control__linked-button"
-				size="small"
-				icon={ isLinked ? link : linkOff }
-				iconSize={ 24 }
-				aria-label={ label }
-			/>
-		</Tooltip>
+		<Button
+			{ ...props }
+			className="component-box-control__linked-button"
+			size="small"
+			icon={ isLinked ? link : linkOff }
+			iconSize={ 24 }
+			label={ label }
+		/>
 	);
 }

From 9fcf9a8392c2e893861671b5c415c37624b82dcb Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Mon, 6 Jan 2025 11:36:28 +0530
Subject: [PATCH 2/5] fix: label name

---
 packages/components/src/box-control/linked-button.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/components/src/box-control/linked-button.tsx b/packages/components/src/box-control/linked-button.tsx
index 56da47706e2016..985a7745d5c157 100644
--- a/packages/components/src/box-control/linked-button.tsx
+++ b/packages/components/src/box-control/linked-button.tsx
@@ -13,7 +13,7 @@ export default function LinkedButton( {
 	isLinked,
 	...props
 }: { isLinked?: boolean } & React.ComponentProps< typeof Button > ) {
-	const label = isLinked ? __( 'Unlink sides44' ) : __( 'Link sides' );
+	const label = isLinked ? __( 'Unlink sides' ) : __( 'Link sides' );
 
 	return (
 		<Button

From ada34e92151d87c29275c36a6ebd8fdac414b9fc Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Mon, 20 Jan 2025 21:42:10 +0530
Subject: [PATCH 3/5] fix: Removed view component

---
 .../component.tsx                             | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
index 082f1a1e7e4797..561653009a448a 100644
--- a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
@@ -8,7 +8,6 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import Button from '../../button';
-import { View } from '../../view';
 import type { WordPressComponentProps } from '../../context';
 import { contextConnect } from '../../context';
 import { useBorderBoxControlLinkedButton } from './hook';
@@ -24,16 +23,15 @@ const BorderBoxControlLinkedButton = (
 	const label = isLinked ? __( 'Unlink sides' ) : __( 'Link sides' );
 
 	return (
-		<View className={ className }>
-			<Button
-				{ ...buttonProps }
-				size="small"
-				icon={ isLinked ? link : linkOff }
-				iconSize={ 24 }
-				label={ label }
-				ref={ forwardedRef }
-			/>
-		</View>
+		<Button
+			{ ...buttonProps }
+			size="small"
+			icon={ isLinked ? link : linkOff }
+			iconSize={ 24 }
+			label={ label }
+			ref={ forwardedRef }
+			className={ className }
+		/>
 	);
 };
 

From 1d3a578b20157c0d2db260fa8e8119d72c6a8e26 Mon Sep 17 00:00:00 2001
From: im3dabasia <eshaan.dabasiya@rtcamp.com>
Date: Mon, 20 Jan 2025 21:48:44 +0530
Subject: [PATCH 4/5] doc: Update changelog for unreleased section

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

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 9784a651027950..17b3bf330b10ba 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+-   `BorderBoxControl`, `BoxControl`: Remove `Tooltip` component from linked button ([#68498](https://github.com/WordPress/gutenberg/pull/68498)).
+
 ### Enhancements
 
 -   `BoxControl`: Add presets support ([#67688](https://github.com/WordPress/gutenberg/pull/67688)).

From c0f102abc59073b3c1d20dab9b2990357f7bd2b2 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 24 Jan 2025 13:59:06 +0100
Subject: [PATCH 5/5] Add heading before new changelog entry

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

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 42867e16a706ed..bf775a152747d0 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+### Enhancements
+
 -   `BorderBoxControl`, `BoxControl`: Remove `Tooltip` component from linked button ([#68498](https://github.com/WordPress/gutenberg/pull/68498)).
 
 ### Internal