From c35969806bac999549bc65b39dcea3448a073b28 Mon Sep 17 00:00:00 2001
From: Heiko Mamerow <mail@heikomamerow.dev>
Date: Thu, 19 Oct 2023 16:07:47 +0200
Subject: [PATCH 1/3] feature(Revision history): Switch from dropdown to normal
 button and show history

This avoids an unnecessary step to display the revision history.
---
 .../src/components/global-styles/ui.js        | 48 +++----------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
index d2e0d2c302706..7f5535897b5ca 100644
--- a/packages/edit-site/src/components/global-styles/ui.js
+++ b/packages/edit-site/src/components/global-styles/ui.js
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import classnames from 'classnames';
 
 /**
  * WordPress dependencies
@@ -99,18 +98,6 @@ function GlobalStylesActionMenu() {
 	);
 }
 
-function RevisionsCountBadge( { className, children } ) {
-	return (
-		<span
-			className={ classnames(
-				className,
-				'edit-site-global-styles-sidebar__revisions-count-badge'
-			) }
-		>
-			{ children }
-		</span>
-	);
-}
 function GlobalStylesRevisionsMenu() {
 	const { setIsListViewOpened } = useDispatch( editSiteStore );
 	const { revisionsCount } = useSelect( ( select ) => {
@@ -128,7 +115,7 @@ function GlobalStylesRevisionsMenu() {
 		};
 	}, [] );
 	const { useGlobalStylesReset } = unlock( blockEditorPrivateApis );
-	const [ canReset, onReset ] = useGlobalStylesReset();
+	const [ canReset ] = useGlobalStylesReset();
 	const { goTo } = useNavigator();
 	const { setEditorCanvasContainerView } = unlock(
 		useDispatch( editSiteStore )
@@ -143,33 +130,12 @@ function GlobalStylesRevisionsMenu() {
 	return (
 		<GlobalStylesMenuFill>
 			{ canReset || hasRevisions ? (
-				<DropdownMenu icon={ backup } label={ __( 'Revisions' ) }>
-					{ ( { onClose } ) => (
-						<MenuGroup>
-							{ hasRevisions && (
-								<MenuItem
-									onClick={ loadRevisions }
-									icon={
-										<RevisionsCountBadge>
-											{ revisionsCount }
-										</RevisionsCountBadge>
-									}
-								>
-									{ __( 'Revision history' ) }
-								</MenuItem>
-							) }
-							<MenuItem
-								onClick={ () => {
-									onReset();
-									onClose();
-								} }
-								disabled={ ! canReset }
-							>
-								{ __( 'Reset to defaults' ) }
-							</MenuItem>
-						</MenuGroup>
-					) }
-				</DropdownMenu>
+				<Button
+					label={ __( 'Revisions' ) }
+					icon={ backup }
+					onClick={ loadRevisions }
+					__experimentalIsFocusable
+				/>
 			) : (
 				<Button
 					label={ __( 'Revisions' ) }

From dc76e6f94881b6ebd5521256e8239a629060be45 Mon Sep 17 00:00:00 2001
From: Heiko Mamerow <mail@heikomamerow.dev>
Date: Sat, 21 Oct 2023 01:40:02 +0200
Subject: [PATCH 2/3] refactor(comment): removed redundant comment

---
 packages/edit-site/src/components/global-styles/ui.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
index 7f5535897b5ca..ad82f227fed37 100644
--- a/packages/edit-site/src/components/global-styles/ui.js
+++ b/packages/edit-site/src/components/global-styles/ui.js
@@ -1,7 +1,3 @@
-/**
- * External dependencies
- */
-
 /**
  * WordPress dependencies
  */

From c514f9dfd1a11e2db098c88baee02d3ed1eb2b94 Mon Sep 17 00:00:00 2001
From: Heiko Mamerow <mail@heikomamerow.dev>
Date: Sat, 21 Oct 2023 01:43:05 +0200
Subject: [PATCH 3/3] test(e2e): removed redundant check for revision history

---
 .../e2e/specs/site-editor/user-global-styles-revisions.spec.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
index 61fbf7c795a60..2d51b5ac5014b 100644
--- a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
+++ b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
@@ -147,9 +147,6 @@ class UserGlobalStylesRevisions {
 			.getByRole( 'menubar', { name: 'Styles actions' } )
 			.click();
 		await this.page.getByRole( 'button', { name: 'Revisions' } ).click();
-		await this.page
-			.getByRole( 'menuitem', { name: /^Revision history/ } )
-			.click();
 	}
 
 	async openStylesPanel() {