From ebae17413fef42f67dde5bee26af99aba461eda8 Mon Sep 17 00:00:00 2001
From: brookewp <brooke.kaminski@automattic.com>
Date: Wed, 13 Sep 2023 19:06:02 -0700
Subject: [PATCH 1/2] Remove workarounds for Icons with Tooltips

---
 .../list-view/block-select-button.js           |  4 +---
 .../src/components/list-view/style.scss        |  3 +--
 .../src/components/page-patterns/grid-item.js  | 18 +++++++++---------
 .../src/components/page-patterns/style.scss    |  6 +-----
 .../style.scss                                 |  3 ---
 .../index.js                                   |  4 +---
 6 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/packages/block-editor/src/components/list-view/block-select-button.js b/packages/block-editor/src/components/list-view/block-select-button.js
index faf9d299bd9352..cec5d4699c7a2f 100644
--- a/packages/block-editor/src/components/list-view/block-select-button.js
+++ b/packages/block-editor/src/components/list-view/block-select-button.js
@@ -233,9 +233,7 @@ function ListViewBlockSelectButton(
 					) }
 					{ positionLabel && isSticky && (
 						<Tooltip text={ positionLabel }>
-							<span className="block-editor-list-view-block-select-button__sticky">
-								<Icon icon={ pinSmall } />
-							</span>
+							<Icon icon={ pinSmall } />
 						</Tooltip>
 					) }
 					{ images.length ? (
diff --git a/packages/block-editor/src/components/list-view/style.scss b/packages/block-editor/src/components/list-view/style.scss
index 49d404cfc817c6..7afa7a1c984318 100644
--- a/packages/block-editor/src/components/list-view/style.scss
+++ b/packages/block-editor/src/components/list-view/style.scss
@@ -335,8 +335,7 @@
 		background: rgba($black, 0.3);
 	}
 
-	.block-editor-list-view-block-select-button__lock,
-	.block-editor-list-view-block-select-button__sticky {
+	.block-editor-list-view-block-select-button__lock {
 		line-height: 0;
 	}
 
diff --git a/packages/edit-site/src/components/page-patterns/grid-item.js b/packages/edit-site/src/components/page-patterns/grid-item.js
index a4797b7af4c7d4..98ddc54f1a0b1c 100644
--- a/packages/edit-site/src/components/page-patterns/grid-item.js
+++ b/packages/edit-site/src/components/page-patterns/grid-item.js
@@ -184,12 +184,10 @@ function GridItem( { categoryId, item, ...props } ) {
 								'Editing this pattern will also update anywhere it is used'
 							) }
 						>
-							<span>
-								<Icon
-									className="edit-site-patterns__pattern-icon"
-									icon={ itemIcon }
-								/>
-							</span>
+							<Icon
+								className="edit-site-patterns__pattern-icon"
+								icon={ itemIcon }
+							/>
 						</Tooltip>
 					) }
 					<Flex as="span" gap={ 0 } justify="left">
@@ -213,9 +211,11 @@ function GridItem( { categoryId, item, ...props } ) {
 								position="top center"
 								text={ __( 'This pattern cannot be edited.' ) }
 							>
-								<span className="edit-site-patterns__pattern-lock-icon">
-									<Icon icon={ lockSmall } size={ 24 } />
-								</span>
+								<Icon
+									className="edit-site-patterns__pattern-lock-icon"
+									icon={ lockSmall }
+									size={ 24 }
+								/>
 							</Tooltip>
 						) }
 					</Flex>
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index f425e08c57878b..4b4d7bb9059d47 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -211,11 +211,7 @@
 	}
 
 	.edit-site-patterns__pattern-lock-icon {
-		display: inline-flex;
-
-		svg {
-			fill: currentcolor;
-		}
+		fill: currentcolor;
 	}
 }
 
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss
index a092ac50935b67..95a27ba5aa5fa5 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pattern/style.scss
@@ -24,6 +24,3 @@
 	margin-right: $grid-unit-10;
 }
 
-.edit-site-sidebar-navigation-screen-pattern__lock-icon {
-	display: inline-flex;
-}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
index 3b6a6a8110f562..41e3068bb89d0d 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-patterns/index.js
@@ -75,9 +75,7 @@ function ThemePatternsGroup( { categories, currentCategory, currentType } ) {
 										category.label
 									) }
 								>
-									<span className="edit-site-sidebar-navigation-screen-pattern__lock-icon">
-										<Icon icon={ lockSmall } size={ 24 } />
-									</span>
+									<Icon icon={ lockSmall } size={ 24 } />
 								</Tooltip>
 							</Flex>
 						}

From 58e7d2e5953ccc9b9b85aeb8a208b8226a6b487a Mon Sep 17 00:00:00 2001
From: brookewp <brooke.kaminski@automattic.com>
Date: Wed, 13 Sep 2023 20:30:53 -0700
Subject: [PATCH 2/2] Remove wrapper around button

---
 .../border-radius-control/linked-button.js    | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/packages/block-editor/src/components/border-radius-control/linked-button.js b/packages/block-editor/src/components/border-radius-control/linked-button.js
index b4142d5286453e..5d8443e57629e2 100644
--- a/packages/block-editor/src/components/border-radius-control/linked-button.js
+++ b/packages/block-editor/src/components/border-radius-control/linked-button.js
@@ -8,19 +8,16 @@ import { __ } from '@wordpress/i18n';
 export default function LinkedButton( { isLinked, ...props } ) {
 	const label = isLinked ? __( 'Unlink radii' ) : __( 'Link radii' );
 
-	// TODO: Remove span after merging https://github.com/WordPress/gutenberg/pull/44198
 	return (
 		<Tooltip text={ label }>
-			<span>
-				<Button
-					{ ...props }
-					className="component-border-radius-control__linked-button"
-					isSmall
-					icon={ isLinked ? link : linkOff }
-					iconSize={ 24 }
-					aria-label={ label }
-				/>
-			</span>
+			<Button
+				{ ...props }
+				className="component-border-radius-control__linked-button"
+				isSmall
+				icon={ isLinked ? link : linkOff }
+				iconSize={ 24 }
+				aria-label={ label }
+			/>
 		</Tooltip>
 	);
 }