feedback

WordPress · Feb 14, 2022 · 460be3c · 460be3c
1 parent ff1f5d3
commit 460be3c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/packages/block-editor/src/components/inserter/quick-inserter.js b/packages/block-editor/src/components/inserter/quick-inserter.js
@@ -64,10 +64,10 @@ export default function QuickInserter( {
 			return {
 				setInserterIsOpened: settings.__experimentalSetIsInserterOpened,
 				prioritizePatterns:
-					settings.__experimentalPrioritizePatternsOnQuickInserterRoot &&
+					settings.__experimentalPreferPatternsOnRoot &&
 					! rootClientId &&
 					index > 0 &&
-					index < blockCount,
+					( index < blockCount || blockCount === 0 ),
 				insertionIndex: index === -1 ? blockCount : index,
 			};
 		},
@@ -128,7 +128,7 @@ export default function QuickInserter( {
 					maxBlockPatterns={ maxBlockPatterns }
 					maxBlockTypes={ SHOWN_BLOCK_TYPES }
 					isDraggable={ false }
-					__experimentalPrioritizePatterns={ prioritizePatterns }
+					prioritizePatterns={ prioritizePatterns }
 				/>
 			</div>
 

diff --git a/packages/block-editor/src/components/inserter/search-results.js b/packages/block-editor/src/components/inserter/search-results.js
@@ -48,7 +48,7 @@ function InserterSearchResults( {
 	showBlockDirectory = false,
 	isDraggable = true,
 	shouldFocusBlock = true,
-	__experimentalPrioritizePatterns,
+	prioritizePatterns,
 } ) {
 	const debouncedSpeak = useDebounce( speak, 500 );
 
@@ -72,21 +72,24 @@ function InserterSearchResults( {
 	);
 
 	const filteredBlockPatterns = useMemo( () => {
+		if ( maxBlockPatterns === 0 ) {
+			return [];
+		}
 		const results = searchItems( patterns, filterValue );
 		return maxBlockPatterns !== undefined
 			? results.slice( 0, maxBlockPatterns )
 			: results;
 	}, [ filterValue, patterns, maxBlockPatterns ] );
 
 	let maxBlockTypesToShow = maxBlockTypes;
-	if (
-		__experimentalPrioritizePatterns &&
-		filteredBlockPatterns.length > 2
-	) {
+	if ( prioritizePatterns && filteredBlockPatterns.length > 2 ) {
 		maxBlockTypesToShow = 0;
 	}
 
 	const filteredBlockTypes = useMemo( () => {
+		if ( maxBlockTypesToShow === 0 ) {
+			return [];
+		}
 		const results = searchBlockItems(
 			orderBy( blockTypes, [ 'frecency' ], [ 'desc' ] ),
 			blockTypeCategories,
@@ -166,14 +169,14 @@ function InserterSearchResults( {
 		<InserterListbox>
 			{ ! showBlockDirectory && ! hasItems && <InserterNoResults /> }
 
-			{ __experimentalPrioritizePatterns ? patternsUI : blocksUI }
+			{ prioritizePatterns ? patternsUI : blocksUI }
 
 			{ !! filteredBlockTypes.length &&
 				!! filteredBlockPatterns.length && (
 					<div className="block-editor-inserter__quick-inserter-separator" />
 				) }
 
-			{ __experimentalPrioritizePatterns ? blocksUI : patternsUI }
+			{ prioritizePatterns ? blocksUI : patternsUI }
 
 			{ showBlockDirectory && (
 				<__unstableInserterMenuExtension.Slot

diff --git a/packages/edit-site/src/store/selectors.js b/packages/edit-site/src/store/selectors.js
@@ -98,7 +98,7 @@ export const getSettings = createSelector(
 			hasFixedToolbar: isFeatureActive( state, 'fixedToolbar' ),
 			__experimentalSetIsInserterOpened: setIsInserterOpen,
 			__experimentalReusableBlocks: getReusableBlocks( state ),
-			__experimentalPrioritizePatternsOnQuickInserterRoot:
+			__experimentalPreferPatternsOnRoot:
 				'wp_template' === getEditedPostType( state ),
 		};
 

diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -148,7 +148,7 @@ function useBlockEditorSettings( settings, hasTemplate ) {
 			__experimentalCreatePageEntity: createPageEntity,
 			__experimentalUserCanCreatePages: userCanCreatePages,
 			pageOnFront,
-			__experimentalPrioritizePatternsOnQuickInserterRoot: hasTemplate,
+			__experimentalPreferPatternsOnRoot: hasTemplate,
 		} ),
 		[
 			settings,