combine filters

WordPress · Oct 3, 2023 · 7c7fdfd · 7c7fdfd
1 parent f7a087b
commit 7c7fdfd
Showing 1 changed file with 30 additions and 28 deletions.
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/template-panel/hooks.js b/packages/edit-site/src/components/sidebar-edit-mode/template-panel/hooks.js
@@ -13,10 +13,6 @@ import { store as editSiteStore } from '../../../store';
 import { PATTERN_CORE_SOURCES, PATTERN_TYPES } from '../../../utils/constants';
 import { unlock } from '../../../lock-unlock';
 
-// This is duplicated.
-const filterOutDuplicatesByName = ( currentItem, index, items ) =>
-	index === items.findIndex( ( item ) => currentItem.name === item.name );
-
 function injectThemeAttributeInBlockTemplateContent(
 	block,
 	currentThemeStylesheet
@@ -38,30 +34,36 @@ function injectThemeAttributeInBlockTemplateContent(
 }
 
 function preparePatterns( patterns, template, currentThemeStylesheet ) {
-	return (
-		patterns
-			.filter(
-				( pattern ) => ! PATTERN_CORE_SOURCES.includes( pattern.source )
-			)
-			.filter( filterOutDuplicatesByName )
-			// Filter only the patterns that are compatible with the current template.
-			.filter( ( pattern ) =>
-				pattern.templateTypes?.includes( template.slug )
-			)
-			.map( ( pattern ) => ( {
-				...pattern,
-				keywords: pattern.keywords || [],
-				type: PATTERN_TYPES.theme,
-				blocks: parse( pattern.content, {
-					__unstableSkipMigrationLogs: true,
-				} ).map( ( block ) =>
-					injectThemeAttributeInBlockTemplateContent(
-						block,
-						currentThemeStylesheet
-					)
-				),
-			} ) )
-	);
+	// This is duplicated.
+	const filterOutDuplicatesByName = ( currentItem, index, items ) =>
+		index === items.findIndex( ( item ) => currentItem.name === item.name );
+
+	const filterOutCorePatterns = ( pattern ) =>
+		! PATTERN_CORE_SOURCES.includes( pattern.source );
+
+	// Filter only the patterns that are compatible with the current template.
+	const filterCompatiblePatterns = ( pattern ) =>
+		pattern.templateTypes?.includes( template.slug );
+
+	return patterns
+		.filter(
+			filterOutCorePatterns &&
+				filterOutDuplicatesByName &&
+				filterCompatiblePatterns
+		)
+		.map( ( pattern ) => ( {
+			...pattern,
+			keywords: pattern.keywords || [],
+			type: PATTERN_TYPES.theme,
+			blocks: parse( pattern.content, {
+				__unstableSkipMigrationLogs: true,
+			} ).map( ( block ) =>
+				injectThemeAttributeInBlockTemplateContent(
+					block,
+					currentThemeStylesheet
+				)
+			),
+		} ) );
 }
 
 export function useAvailablePatterns( template ) {