Skip to content

Top Toolbar: Show document bar when no block is selected even if block tools are expanded #65839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
talldan merged 2 commits into from
Oct 3, 2024
Merged

Top Toolbar: Show document bar when no block is selected even if block tools are expanded #65839

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7406106
Top Toolbar: Show document bar when no block is selected even if bloc…
talldan Oct 2, 2024
d1975c2
Change variable name to hasBlockSelection
talldan Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/editor/src/components/header/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/**
* WordPress dependencies
*/
import { store as blockEditorStore } from '@wordpress/block-editor';
import { useSelect } from '@wordpress/data';
import { useMediaQuery, useViewportMatch } from '@wordpress/compose';
import { __unstableMotion as motion } from '@wordpress/components';
Expand Down Expand Up @@ -52,12 +53,13 @@ function Header( {
const isLargeViewport = useViewportMatch( 'medium' );
const isTooNarrowForDocumentBar = useMediaQuery( '(max-width: 403px)' );
const {
postType,
isTextEditor,
isPublishSidebarOpened,
showIconLabels,
hasFixedToolbar,
isBlockSelected,
isNestedEntity,
postType,
} = useSelect( ( select ) => {
const { get: getPreference } = select( preferencesStore );
const {
Expand All @@ -73,6 +75,8 @@ function Header( {
isPublishSidebarOpened: _isPublishSidebarOpened(),
showIconLabels: getPreference( 'core', 'showIconLabels' ),
hasFixedToolbar: getPreference( 'core', 'fixedToolbar' ),
isBlockSelected:
!! select( blockEditorStore ).getBlockSelectionStart(),
isNestedEntity:
!! getEditorSettings().onNavigateToPreviousEntityRecord,
};
Expand All @@ -85,7 +89,9 @@ function Header( {
const [ isBlockToolsCollapsed, setIsBlockToolsCollapsed ] =
useState( true );

const hasCenter = isBlockToolsCollapsed && ! isTooNarrowForDocumentBar;
const hasCenter =
( ! isBlockSelected || isBlockToolsCollapsed ) &&
! isTooNarrowForDocumentBar;
const hasBackButton = useHasBackButton();
/*
* The edit-post-header classname is only kept for backward compatability
Expand Down