Address feedback

WordPress · Jan 24, 2024 · f6ec31e · f6ec31e
1 parent 5d3dc07
commit f6ec31e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
@@ -321,13 +321,10 @@ export const getAllPatterns = createRegistrySelector( ( select ) =>
 				};
 			}
 		);
-		return [
-			...userPatterns,
-			...__experimentalBlockPatterns,
-			...unlock( select( store ) ).getFetchedPatterns(
-				__experimentalFetchBlockPatterns
-			),
-		];
+		const blockPatterns = __experimentalFetchBlockPatterns
+			? unlock( select( store ) ).getFetchedPatterns()
+			: __experimentalBlockPatterns;
+		return [ ...userPatterns, ...blockPatterns ];
 	}, getAllPatternsDependants )
 );
 

diff --git a/packages/block-editor/src/store/resolvers.js b/packages/block-editor/src/store/resolvers.js
@@ -1,6 +1,17 @@
 export const getFetchedPatterns =
-	( fetch ) =>
-	async ( { dispatch } ) => {
-		const patterns = await fetch();
+	() =>
+	async ( { dispatch, select } ) => {
+		const { __experimentalFetchBlockPatterns } = select.getSettings();
+		if ( ! __experimentalFetchBlockPatterns ) {
+			return;
+		}
+		const patterns = await __experimentalFetchBlockPatterns();
 		dispatch( { type: 'RECEIVE_BLOCK_PATTERNS', patterns } );
 	};
+
+getFetchedPatterns.shouldInvalidate = ( action ) => {
+	return (
+		action.type === 'UPDATE_SETTINGS' &&
+		!! action.settings.__experimentalFetchBlockPatterns
+	);
+};