From bc2bb6276a6c646031d21b701c6ae1a8354fc614 Mon Sep 17 00:00:00 2001 From: Aki Hamano Date: Tue, 24 Sep 2024 00:13:20 +0900 Subject: [PATCH] Don't show tooltip in zoom out toggle button when showIconLabels is true --- packages/editor/src/components/zoom-out-toggle/index.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/editor/src/components/zoom-out-toggle/index.js b/packages/editor/src/components/zoom-out-toggle/index.js index 214b1c51fd6255..dd4669d04bec18 100644 --- a/packages/editor/src/components/zoom-out-toggle/index.js +++ b/packages/editor/src/components/zoom-out-toggle/index.js @@ -7,6 +7,7 @@ import { __ } from '@wordpress/i18n'; import { useDispatch, useSelect } from '@wordpress/data'; import { store as blockEditorStore } from '@wordpress/block-editor'; import { square as zoomOutIcon } from '@wordpress/icons'; +import { store as preferencesStore } from '@wordpress/preferences'; /** * Internal dependencies @@ -14,8 +15,12 @@ import { square as zoomOutIcon } from '@wordpress/icons'; import { unlock } from '../../lock-unlock'; const ZoomOutToggle = () => { - const { isZoomOut } = useSelect( ( select ) => ( { + const { isZoomOut, showIconLabels } = useSelect( ( select ) => ( { isZoomOut: unlock( select( blockEditorStore ) ).isZoomOut(), + showIconLabels: select( preferencesStore ).get( + 'core', + 'showIconLabels' + ), } ) ); const { resetZoomLevel, setZoomLevel, __unstableSetEditorMode } = unlock( @@ -38,6 +43,7 @@ const ZoomOutToggle = () => { label={ __( 'Toggle Zoom Out' ) } isPressed={ isZoomOut } size="compact" + showTooltip={ ! showIconLabels } /> ); };