From bd7819178fe7badc32ea7aec393e598b93fc1e45 Mon Sep 17 00:00:00 2001 From: Ben Dwyer Date: Mon, 11 Mar 2024 12:51:13 +0000 Subject: [PATCH] Revert "Zoomed-Out Mode: Don't show blocks in zoomed out view (#59245)" This reverts commit d727cb45f77cfceb375ec96f57fcdea9af6fee4e. --- .../block-editor/src/components/inserter/menu.js | 14 ++++---------- .../src/components/inserter/search-results.js | 3 +-- .../block-editor/src/components/inserter/tabs.js | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js index f0256d0d35d8f..6a38e52cbffba 100644 --- a/packages/block-editor/src/components/inserter/menu.js +++ b/packages/block-editor/src/components/inserter/menu.js @@ -66,13 +66,10 @@ function InserterMenu( insertionIndex: __experimentalInsertionIndex, shouldFocusBlock, } ); - const { isZoomOutMode, showPatterns } = useSelect( + const { showPatterns } = useSelect( ( select ) => { - const { hasAllowedPatterns, __unstableGetEditorMode } = unlock( - select( blockEditorStore ) - ); + const { hasAllowedPatterns } = unlock( select( blockEditorStore ) ); return { - isZoomOutMode: __unstableGetEditorMode() === 'zoom-out', showPatterns: hasAllowedPatterns( destinationRootClientId ), }; }, @@ -80,8 +77,7 @@ function InserterMenu( ); const mediaCategories = useMediaCategories( destinationRootClientId ); - const showMedia = mediaCategories.length > 0 && ! isZoomOutMode; - const showBlocks = ! isZoomOutMode; + const showMedia = mediaCategories.length > 0; const onInsert = useCallback( ( blocks, meta, shouldForceFocusBlock ) => { @@ -253,21 +249,19 @@ function InserterMenu( __experimentalInsertionIndex } showBlockDirectory - showBlocks={ showBlocks } shouldFocusBlock={ shouldFocusBlock } /> ) } { showAsTabs && ( ) } - { ! delayedFilterValue && ! showAsTabs && showBlocks && ( + { ! delayedFilterValue && ! showAsTabs && (
{ blocksTab }
diff --git a/packages/block-editor/src/components/inserter/search-results.js b/packages/block-editor/src/components/inserter/search-results.js index d213bdd1af227..edd99609ea916 100644 --- a/packages/block-editor/src/components/inserter/search-results.js +++ b/packages/block-editor/src/components/inserter/search-results.js @@ -50,7 +50,6 @@ function InserterSearchResults( { shouldFocusBlock = true, prioritizePatterns, selectBlockOnInsert, - showBlocks = true, } ) { const debouncedSpeak = useDebounce( speak, 500 ); @@ -168,7 +167,7 @@ function InserterSearchResults( { const hasItems = filteredBlockTypes.length > 0 || filteredBlockPatterns.length > 0; - const blocksUI = showBlocks && !! filteredBlockTypes.length && ( + const blocksUI = !! filteredBlockTypes.length && ( { __( 'Blocks' ) } } > diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js index ee920df4ca214..4795c3ce4fdc2 100644 --- a/packages/block-editor/src/components/inserter/tabs.js +++ b/packages/block-editor/src/components/inserter/tabs.js @@ -29,14 +29,13 @@ const mediaTab = { }; function InserterTabs( { - showBlocks = true, showPatterns = false, showMedia = false, onSelect, tabsContents, } ) { const tabs = [ - showBlocks && blocksTab, + blocksTab, showPatterns && patternsTab, showMedia && mediaTab, ].filter( Boolean );