From fb89fdac05def1ed8f9fb8621e2f30680a89b964 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:36:05 +0200
Subject: [PATCH 1/4] Zoom-out (contentOnly): show more menu in block toolbar

---
 packages/block-editor/src/components/block-toolbar/index.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js
index a8f75bd1dc875..4c496ad736157 100644
--- a/packages/block-editor/src/components/block-toolbar/index.js
+++ b/packages/block-editor/src/components/block-toolbar/index.js
@@ -255,9 +255,7 @@ export function PrivateBlockToolbar( {
 					</>
 				) }
 				<BlockEditVisuallyButton clientIds={ blockClientIds } />
-				{ isDefaultEditingMode && (
-					<BlockSettingsMenu clientIds={ blockClientIds } />
-				) }
+				<BlockSettingsMenu clientIds={ blockClientIds } />
 			</div>
 		</NavigableToolbar>
 	);

From a72d47b87bd900a149d43b94192611bfbf7f9950 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:49:58 +0200
Subject: [PATCH 2/4] Remove group/ungroup from contentOnly

---
 .../src/components/block-settings-menu-controls/index.js       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-settings-menu-controls/index.js b/packages/block-editor/src/components/block-settings-menu-controls/index.js
index 39063db4f52e0..bdc2502ab7e7d 100644
--- a/packages/block-editor/src/components/block-settings-menu-controls/index.js
+++ b/packages/block-editor/src/components/block-settings-menu-controls/index.js
@@ -58,7 +58,8 @@ const BlockSettingsMenuControlsSlot = ( { fillProps, clientIds = null } ) => {
 	const convertToGroupButtonProps =
 		useConvertToGroupButtonProps( selectedClientIds );
 	const { isGroupable, isUngroupable } = convertToGroupButtonProps;
-	const showConvertToGroupButton = isGroupable || isUngroupable;
+	const showConvertToGroupButton =
+		( isGroupable || isUngroupable ) && ! isContentOnly;
 
 	return (
 		<Slot

From a0e0b9ea49122a0e50cc2b093fa3a738fb4098c1 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Thu, 24 Oct 2024 13:06:00 +0100
Subject: [PATCH 3/4] Avoid special content only settings menu in Zoom Out

---
 packages/editor/src/components/provider/index.js | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 87fea30e31cdb..552b2ca459de1 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -13,6 +13,7 @@ import {
 	BlockEditorProvider,
 	BlockContextProvider,
 	privateApis as blockEditorPrivateApis,
+	store as blockEditorStore,
 } from '@wordpress/block-editor';
 import { store as noticesStore } from '@wordpress/notices';
 import { privateApis as editPatternsPrivateApis } from '@wordpress/patterns';
@@ -188,6 +189,15 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 				},
 				[ post.type ]
 			);
+
+		const isZoomOut = useSelect( ( select ) => {
+			const { __unstableGetEditorMode } = unlock(
+				select( blockEditorStore )
+			);
+
+			return __unstableGetEditorMode() === 'zoom-out';
+		} );
+
 		const shouldRenderTemplate = !! template && mode !== 'post-only';
 		const rootLevelPost = shouldRenderTemplate ? template : post;
 		const defaultBlockContext = useMemo( () => {
@@ -334,7 +344,9 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 								<>
 									<PatternsMenuItems />
 									<TemplatePartMenuItems />
-									<ContentOnlySettingsMenu />
+									{ ! isZoomOut && (
+										<ContentOnlySettingsMenu />
+									) }
 									{ mode === 'template-locked' && (
 										<DisableNonPageContentBlocks />
 									) }

From 0050f8ac5cc8d9e4a40192f72a88333c1062c4b4 Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <andrei.draganescu@automattic.com>
Date: Fri, 25 Oct 2024 16:28:54 +0300
Subject: [PATCH 4/4] add copy back, remove pattern related group of options

---
 .../block-settings-menu/block-settings-dropdown.js    | 11 ++++++++++-
 packages/editor/src/components/provider/index.js      |  8 +++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
index 069bd2c9ff1ee..ffe830cc417ad 100644
--- a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
+++ b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -56,6 +56,15 @@ export function BlockSettingsDropdown( {
 	const currentClientId = block?.clientId;
 	const count = clientIds.length;
 	const firstBlockClientId = clientIds[ 0 ];
+
+	const isZoomOut = useSelect( ( select ) => {
+		const { __unstableGetEditorMode } = unlock(
+			select( blockEditorStore )
+		);
+
+		return __unstableGetEditorMode() === 'zoom-out';
+	} );
+
 	const {
 		firstParentClientId,
 		onlyBlock,
@@ -235,7 +244,7 @@ export function BlockSettingsDropdown( {
 										clientId={ firstBlockClientId }
 									/>
 								) }
-								{ ! isContentOnly && (
+								{ ( ! isContentOnly || isZoomOut ) && (
 									<CopyMenuItem
 										clientIds={ clientIds }
 										onCopy={ onCopy }
diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 552b2ca459de1..e266ac83226da 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -342,10 +342,12 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 							{ children }
 							{ ! settings.__unstableIsPreviewMode && (
 								<>
-									<PatternsMenuItems />
-									<TemplatePartMenuItems />
 									{ ! isZoomOut && (
-										<ContentOnlySettingsMenu />
+										<>
+											<PatternsMenuItems />
+											<TemplatePartMenuItems />
+											<ContentOnlySettingsMenu />
+										</>
 									) }
 									{ mode === 'template-locked' && (
 										<DisableNonPageContentBlocks />