diff --git a/packages/components/src/dropdown-menu/index.js b/packages/components/src/dropdown-menu/index.js index 30abf70c80d61..6bd3ff8c44f78 100644 --- a/packages/components/src/dropdown-menu/index.js +++ b/packages/components/src/dropdown-menu/index.js @@ -129,7 +129,7 @@ function DropdownMenu( { aria-haspopup="true" aria-expanded={ isOpen } label={ label } - showTooltip + showTooltip={ toggleProps?.showTooltip || true } > { mergedToggleProps.children } diff --git a/packages/edit-post/src/components/header/fullscreen-mode-close/index.js b/packages/edit-post/src/components/header/fullscreen-mode-close/index.js index 79659134f4296..d7da08c758470 100644 --- a/packages/edit-post/src/components/header/fullscreen-mode-close/index.js +++ b/packages/edit-post/src/components/header/fullscreen-mode-close/index.js @@ -12,7 +12,7 @@ import { __ } from '@wordpress/i18n'; import { addQueryArgs } from '@wordpress/url'; import { wordpress } from '@wordpress/icons'; -function FullscreenModeClose() { +function FullscreenModeClose( { showTooltip } ) { const { isActive, isRequestingSiteIcon, postType, siteIconUrl } = useSelect( ( select ) => { const { getCurrentPostType } = select( 'core/editor' ); @@ -61,7 +61,7 @@ function FullscreenModeClose() { post_type: postType.slug, } ) } label={ get( postType, [ 'labels', 'view_items' ], __( 'Back' ) ) } - showTooltip + showTooltip={ showTooltip } > { buttonIcon } diff --git a/packages/edit-post/src/components/header/header-toolbar/index.js b/packages/edit-post/src/components/header/header-toolbar/index.js index 6c178f193ba16..760e6255f8439 100644 --- a/packages/edit-post/src/components/header/header-toolbar/index.js +++ b/packages/edit-post/src/components/header/header-toolbar/index.js @@ -17,9 +17,10 @@ import { } from '@wordpress/editor'; import { Button, + Dropdown, __experimentalToolbarItem as ToolbarItem, } from '@wordpress/components'; -import { plus } from '@wordpress/icons'; +import { plus, chevronDown } from '@wordpress/icons'; function HeaderToolbar() { const { setIsInserterOpened } = useDispatch( 'core/edit-post' ); @@ -29,6 +30,7 @@ function HeaderToolbar() { isInserterOpened, isTextModeEnabled, previewDeviceType, + showIconLabels, } = useSelect( ( select ) => { const { hasInserterItems, @@ -53,9 +55,14 @@ function HeaderToolbar() { previewDeviceType: select( 'core/edit-post' ).__experimentalGetPreviewDeviceType(), + showIconLabels: select( 'core/edit-post' ).isFeatureActive( + 'showIconLabels' + ), }; }, [] ); const isLargeViewport = useViewportMatch( 'medium' ); + const isWideViewport = useViewportMatch( 'wide' ); + const isSmallViewport = useViewportMatch( 'small', '<' ); const displayBlockToolbar = ! isLargeViewport || previewDeviceType !== 'Desktop' || hasFixedToolbar; @@ -66,6 +73,35 @@ function HeaderToolbar() { : /* translators: accessibility text for the editor toolbar when Top Toolbar is off */ __( 'Document tools' ); + const overflowItems = ( + <> + { isLargeViewport && ( + + ) } + + + + + + ); + return ( - { isLargeViewport && } - - - - + { ( isWideViewport || ! showIconLabels ) && overflowItems } + { ! isWideViewport && ! isSmallViewport && showIconLabels && ( + ( +