Prioritize patterns in the main inserter

WordPress · May 27, 2022 · be88a13 · be88a13
1 parent 02b87d7
commit be88a13
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/packages/block-editor/src/components/inserter/index.js b/packages/block-editor/src/components/inserter/index.js
@@ -169,6 +169,7 @@ class Inserter extends Component {
 				clientId={ clientId }
 				isAppender={ isAppender }
 				showInserterHelpPanel={ showInserterHelpPanel }
+				prioritizePatterns={ prioritizePatterns }
 			/>
 		);
 	}
@@ -213,8 +214,6 @@ export default compose( [
 			hasInserterItems,
 			__experimentalGetAllowedBlocks,
 			__experimentalGetDirectInsertBlock,
-			getBlockIndex,
-			getBlockCount,
 			getSettings,
 		} = select( blockEditorStore );
 
@@ -229,8 +228,6 @@ export default compose( [
 			rootClientId
 		);
 
-		const index = getBlockIndex( clientId );
-		const blockCount = getBlockCount();
 		const settings = getSettings();
 
 		const hasSingleBlockType =
@@ -252,10 +249,7 @@ export default compose( [
 			directInsertBlock,
 			rootClientId,
 			prioritizePatterns:
-				settings.__experimentalPreferPatternsOnRoot &&
-				! rootClientId &&
-				index > 0 &&
-				( index < blockCount || blockCount === 0 ),
+				settings.__experimentalPreferPatternsOnRoot && ! rootClientId,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, { select } ) => {

diff --git a/packages/block-editor/src/components/inserter/library.js b/packages/block-editor/src/components/inserter/library.js
@@ -29,13 +29,19 @@ function InserterLibrary(
 	},
 	ref
 ) {
-	const destinationRootClientId = useSelect(
+	const { destinationRootClientId, prioritizePatterns } = useSelect(
 		( select ) => {
-			const { getBlockRootClientId } = select( blockEditorStore );
-
-			return (
-				rootClientId || getBlockRootClientId( clientId ) || undefined
+			const { getBlockRootClientId, getSettings } = select(
+				blockEditorStore
 			);
+
+			const _rootClientId =
+				rootClientId || getBlockRootClientId( clientId ) || undefined;
+			return {
+				destinationRootClientId: _rootClientId,
+				prioritizePatterns: getSettings()
+					.__experimentalPreferPatternsOnRoot,
+			};
 		},
 		[ clientId, rootClientId ]
 	);
@@ -51,6 +57,7 @@ function InserterLibrary(
 			__experimentalInsertionIndex={ __experimentalInsertionIndex }
 			__experimentalFilterValue={ __experimentalFilterValue }
 			shouldFocusBlock={ shouldFocusBlock }
+			prioritizePatterns={ prioritizePatterns }
 			ref={ ref }
 		/>
 	);

diff --git a/packages/block-editor/src/components/inserter/menu.js b/packages/block-editor/src/components/inserter/menu.js
@@ -37,6 +37,7 @@ function InserterMenu(
 		showMostUsedBlocks,
 		__experimentalFilterValue = '',
 		shouldFocusBlock = true,
+		prioritizePatterns,
 	},
 	ref
 ) {
@@ -220,6 +221,7 @@ function InserterMenu(
 						<InserterTabs
 							showPatterns={ showPatterns }
 							showReusableBlocks={ hasReusableBlocks }
+							prioritizePatterns={ prioritizePatterns }
 						>
 							{ getCurrentTab }
 						</InserterTabs>

diff --git a/packages/block-editor/src/components/inserter/tabs.js b/packages/block-editor/src/components/inserter/tabs.js
@@ -26,20 +26,24 @@ function InserterTabs( {
 	showPatterns = false,
 	showReusableBlocks = false,
 	onSelect,
+	prioritizePatterns,
 } ) {
 	const tabs = useMemo( () => {
-		const tempTabs = [ blocksTab ];
-
-		if ( showPatterns ) {
+		const tempTabs = [];
+		if ( prioritizePatterns && showPatterns ) {
+			tempTabs.push( patternsTab );
+		}
+		tempTabs.push( blocksTab );
+		if ( ! prioritizePatterns && showPatterns ) {
 			tempTabs.push( patternsTab );
 		}
-
 		if ( showReusableBlocks ) {
 			tempTabs.push( reusableBlocksTab );
 		}
 
 		return tempTabs;
 	}, [
+		prioritizePatterns,
 		blocksTab,
 		showPatterns,
 		patternsTab,