From 9719b7826507f0bb9b068f790794ba89a15e64b9 Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 3 Oct 2023 20:39:22 +0900
Subject: [PATCH 1/2] Components: Use `isPressed` prop instead of the
 hard-coded `is-pressed` class

---
 .../src/components/rich-text/format-toolbar/index.js  | 11 ++---------
 packages/block-library/src/search/edit.js             |  6 ++----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/index.js b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
index 2a8a7a753211f8..0e850b591c1bb5 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
 /**
  * WordPress dependencies
  */
@@ -48,10 +43,8 @@ const FormatToolbar = () => {
 									label={ __( 'More' ) }
 									toggleProps={ {
 										...toggleProps,
-										className: classnames(
-											toggleProps.className,
-											{ 'is-pressed': hasActive }
-										),
+										className: toggleProps.className,
+										isPressed: hasActive,
 										describedBy: __(
 											'Displays more block tools'
 										),
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index 616478d8013f72..cdd4a01a46bfe2 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -379,7 +379,7 @@ export default function SearchEdit( {
 								showLabel: ! showLabel,
 							} );
 						} }
-						className={ showLabel ? 'is-pressed' : undefined }
+						isPressed={ showLabel }
 					/>
 					<ToolbarDropdownMenu
 						icon={ getButtonPositionIcon() }
@@ -395,9 +395,7 @@ export default function SearchEdit( {
 									buttonUseIcon: ! buttonUseIcon,
 								} );
 							} }
-							className={
-								buttonUseIcon ? 'is-pressed' : undefined
-							}
+							isPressed={ buttonUseIcon }
 						/>
 					) }
 				</ToolbarGroup>

From cc357b38a3478066de18bd695396cceb71fc806f Mon Sep 17 00:00:00 2001
From: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
Date: Tue, 3 Oct 2023 21:17:23 +0900
Subject: [PATCH 2/2] Use `aria-pressed` attr instead of `isPressed` prop

---
 .../src/components/rich-text/format-toolbar/index.js          | 2 +-
 packages/block-library/src/search/edit.js                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/rich-text/format-toolbar/index.js b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
index 0e850b591c1bb5..b8ad196e3fd13d 100644
--- a/packages/block-editor/src/components/rich-text/format-toolbar/index.js
+++ b/packages/block-editor/src/components/rich-text/format-toolbar/index.js
@@ -44,7 +44,7 @@ const FormatToolbar = () => {
 									toggleProps={ {
 										...toggleProps,
 										className: toggleProps.className,
-										isPressed: hasActive,
+										'aria-pressed': hasActive,
 										describedBy: __(
 											'Displays more block tools'
 										),
diff --git a/packages/block-library/src/search/edit.js b/packages/block-library/src/search/edit.js
index cdd4a01a46bfe2..a199407c927e2f 100644
--- a/packages/block-library/src/search/edit.js
+++ b/packages/block-library/src/search/edit.js
@@ -379,7 +379,7 @@ export default function SearchEdit( {
 								showLabel: ! showLabel,
 							} );
 						} }
-						isPressed={ showLabel }
+						aria-pressed={ buttonUseIcon }
 					/>
 					<ToolbarDropdownMenu
 						icon={ getButtonPositionIcon() }
@@ -395,7 +395,7 @@ export default function SearchEdit( {
 									buttonUseIcon: ! buttonUseIcon,
 								} );
 							} }
-							isPressed={ buttonUseIcon }
+							aria-pressed={ buttonUseIcon }
 						/>
 					) }
 				</ToolbarGroup>