Bumping minimum revision count until display to two:

- same behaviour as post editor - since revisions includes the current saved post, so we need at least two in order to switch
WordPress · Dec 23, 2022 · fcca8f6 · fcca8f6 · github-actions · Dec 23, 2022
1 parent eb63ba3
commit fcca8f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/edit-site/src/components/global-styles/screen-revisions.js b/packages/edit-site/src/components/global-styles/screen-revisions.js
@@ -21,6 +21,7 @@ import {
 	useEffect,
 	useMemo,
 } from '@wordpress/element';
+import { check } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -31,6 +32,9 @@ import { GlobalStylesContext } from './context';
 import { decodeEntities } from '@wordpress/html-entities';
 import { isGlobalStyleConfigEqual } from './utils';
 
+export const MINIMUM_REVISION_COUNT = 2;
+const SELECTOR_MINIMUM_REVISION_COUNT = 10;
+
 function RevisionsSelect( { userRevisions, currentRevisionId, onChange } ) {
 	const userRevisionsOptions = useMemo( () => {
 		return ( userRevisions ?? [] ).map( ( revision ) => {
@@ -73,6 +77,7 @@ function RevisionsButtons( { userRevisions, currentRevisionId, onChange } ) {
 							) }
 							variant={ isActive ? 'tertiary' : 'secondary' }
 							disabled={ isActive }
+							icon={ isActive ? check : null }
 							onClick={ () => {
 								onChange( revision );
 							} }
@@ -101,7 +106,7 @@ function ScreenRevisions() {
 		[]
 	);
 	const [ currentRevisionId, setCurrentRevisionId ] = useState();
-	const hasRevisions = userRevisions.length > 0;
+	const hasRevisions = userRevisions.length >= MINIMUM_REVISION_COUNT;
 
 	useEffect( () => {
 		if ( ! hasRevisions ) {
@@ -129,7 +134,9 @@ function ScreenRevisions() {
 	);
 
 	const RevisionsComponent =
-		userRevisions.length >= 10 ? RevisionsSelect : RevisionsButtons;
+		userRevisions.length >= SELECTOR_MINIMUM_REVISION_COUNT
+			? RevisionsSelect
+			: RevisionsButtons;
 
 	return (
 		<>

diff --git a/packages/edit-site/src/components/global-styles/screen-root.js b/packages/edit-site/src/components/global-styles/screen-root.js
@@ -26,6 +26,7 @@ import { NavigationButtonAsItem } from './navigation-button';
 import ContextMenu from './context-menu';
 import StylesPreview from './preview';
 import { GlobalStylesContext } from './context';
+import { MINIMUM_REVISION_COUNT } from './screen-revisions';
 
 function ScreenRoot() {
 	const { userConfigRevisionsCount: revisionsCount } =
@@ -135,7 +136,7 @@ function ScreenRoot() {
 				</>
 			) }
 
-			{ revisionsCount > 0 ? (
+			{ revisionsCount >= MINIMUM_REVISION_COUNT ? (
 				<>
 					<CardDivider />
 					<CardBody>