Add zoom-out mode check to showFixedToolbar, remove unnecessary check…

…s from edit headers
WordPress · Feb 14, 2024 · d01277f · d01277f
1 parent d223610
commit d01277f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/packages/block-editor/src/components/block-tools/use-show-block-tools.js b/packages/block-editor/src/components/block-tools/use-show-block-tools.js
@@ -63,7 +63,9 @@ export function useShowBlockTools() {
 					! isEmptyDefaultBlock &&
 					! maybeShowBreadcrumb,
 				showFixedToolbar:
-					hasBlockToolbar && getSettings().hasFixedToolbar,
+					editorMode !== 'zoom-out' &&
+					hasBlockToolbar &&
+					getSettings().hasFixedToolbar,
 			};
 		},
 		[ hasBlockToolbar ]

diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
@@ -65,7 +65,6 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 		isTextEditor,
 		hasBlockSelection,
 		hasActiveMetaboxes,
-		hasFixedToolbar,
 		isPublishSidebarOpened,
 		showIconLabels,
 		hasHistory,
@@ -83,14 +82,12 @@ function Header( { setEntitiesSavedStatesCallback, initialPost } ) {
 					.onNavigateToPreviousEntityRecord,
 			isPublishSidebarOpened:
 				select( editPostStore ).isPublishSidebarOpened(),
-			hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
 			showIconLabels: getPreference( 'core', 'showIconLabels' ),
 		};
 	}, [] );
 
 	const { showFixedToolbar } = useShowBlockTools();
-	const hasTopToolbar =
-		hasFixedToolbar && isLargeViewport && showFixedToolbar;
+	const hasTopToolbar = isLargeViewport && showFixedToolbar;
 
 	const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
 		useState( true );

diff --git a/packages/edit-site/src/components/header-edit-mode/index.js b/packages/edit-site/src/components/header-edit-mode/index.js
@@ -54,8 +54,6 @@ export default function HeaderEditMode() {
 		blockSelectionStart,
 		showIconLabels,
 		editorCanvasView,
-		hasFixedToolbar,
-		isZoomOutMode,
 	} = useSelect( ( select ) => {
 		const { getEditedPostType } = select( editSiteStore );
 		const { getBlockSelectionStart, __unstableGetEditorMode } =
@@ -72,19 +70,13 @@ export default function HeaderEditMode() {
 			editorCanvasView: unlock(
 				select( editSiteStore )
 			).getEditorCanvasContainerView(),
-			hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
 			isDistractionFree: getPreference( 'core', 'distractionFree' ),
-			isZoomOutMode: __unstableGetEditorMode() === 'zoom-out',
 		};
 	}, [] );
 
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const { showFixedToolbar } = useShowBlockTools();
-	const hasTopToolbar =
-		! isZoomOutMode &&
-		hasFixedToolbar &&
-		isLargeViewport &&
-		showFixedToolbar;
+	const hasTopToolbar = isLargeViewport && showFixedToolbar;
 	const blockToolbarRef = useRef();
 	const disableMotion = useReducedMotion();