From 58170767f2282c7aaa44a5d8bf13807eae7eee60 Mon Sep 17 00:00:00 2001
From: yogeshbhutkar <yogesh.bhutkar@rtcamp.com>
Date: Fri, 10 Jan 2025 16:00:09 +0530
Subject: [PATCH 1/2] Refactor Tooltip component usage in BoxInputControls for
 improved readability

---
 .../border-radius-control/input-controls.js   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/packages/block-editor/src/components/border-radius-control/input-controls.js b/packages/block-editor/src/components/border-radius-control/input-controls.js
index 4529c00b997ac7..139ab7b5a4f905 100644
--- a/packages/block-editor/src/components/border-radius-control/input-controls.js
+++ b/packages/block-editor/src/components/border-radius-control/input-controls.js
@@ -68,21 +68,22 @@ export default function BoxInputControls( {
 					: selectedUnits[ corner ] || selectedUnits.flat;
 
 				return (
-					<Tooltip text={ label } placement="top" key={ corner }>
-						<div className="components-border-radius-control__tooltip-wrapper">
-							<UnitControl
-								{ ...props }
-								aria-label={ label }
-								value={ [ parsedQuantity, computedUnit ].join(
-									''
-								) }
-								onChange={ createHandleOnChange( corner ) }
-								onUnitChange={ createHandleOnUnitChange(
-									corner
-								) }
-								size="__unstable-large"
-							/>
-						</div>
+					<Tooltip
+						text={ label }
+						placement="top"
+						key={ corner }
+						className="components-border-radius-control__tooltip-wrapper"
+					>
+						<UnitControl
+							{ ...props }
+							aria-label={ label }
+							value={ [ parsedQuantity, computedUnit ].join(
+								''
+							) }
+							onChange={ createHandleOnChange( corner ) }
+							onUnitChange={ createHandleOnUnitChange( corner ) }
+							size="__unstable-large"
+						/>
 					</Tooltip>
 				);
 			} ) }

From 641649e9b3c8e5189da67c6a03097ca947a54540 Mon Sep 17 00:00:00 2001
From: yogeshbhutkar <yogesh.bhutkar@rtcamp.com>
Date: Fri, 10 Jan 2025 16:23:40 +0530
Subject: [PATCH 2/2] Refactor: Remove Tooltip component for better a11y

---
 .../border-radius-control/input-controls.js           | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/block-editor/src/components/border-radius-control/input-controls.js b/packages/block-editor/src/components/border-radius-control/input-controls.js
index 139ab7b5a4f905..c22f8437dfd9df 100644
--- a/packages/block-editor/src/components/border-radius-control/input-controls.js
+++ b/packages/block-editor/src/components/border-radius-control/input-controls.js
@@ -4,7 +4,6 @@
 import {
 	__experimentalParseQuantityAndUnitFromRawValue as parseQuantityAndUnitFromRawValue,
 	__experimentalUnitControl as UnitControl,
-	Tooltip,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -68,15 +67,13 @@ export default function BoxInputControls( {
 					: selectedUnits[ corner ] || selectedUnits.flat;
 
 				return (
-					<Tooltip
-						text={ label }
-						placement="top"
-						key={ corner }
+					<div
 						className="components-border-radius-control__tooltip-wrapper"
+						key={ corner }
 					>
 						<UnitControl
 							{ ...props }
-							aria-label={ label }
+							label={ label }
 							value={ [ parsedQuantity, computedUnit ].join(
 								''
 							) }
@@ -84,7 +81,7 @@ export default function BoxInputControls( {
 							onUnitChange={ createHandleOnUnitChange( corner ) }
 							size="__unstable-large"
 						/>
-					</Tooltip>
+					</div>
 				);
 			} ) }
 		</div>