provide rootClientId for pattern fetching

WordPress · Apr 16, 2021 · 6a86ff3 · 6a86ff3
1 parent ba1113a
commit 6a86ff3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/block-editor/src/components/block-pattern-setup/index.js b/packages/block-editor/src/components/block-pattern-setup/index.js
@@ -142,7 +142,7 @@ const BlockPatternSetup = ( {
 	const [ activeSlide, setActiveSlide ] = useState( 0 );
 	const [ showBlank, setShowBlank ] = useState( false );
 	const { replaceBlock } = useDispatch( blockEditorStore );
-	const patterns = usePatternsSetup( blockName, filterPatternsFn );
+	const patterns = usePatternsSetup( clientId, blockName, filterPatternsFn );
 
 	if ( ! patterns?.length || showBlank ) {
 		return startBlankComponent;

diff --git a/packages/block-editor/src/components/block-pattern-setup/use-patterns-setup.js b/packages/block-editor/src/components/block-pattern-setup/use-patterns-setup.js
@@ -8,27 +8,30 @@ import { useSelect } from '@wordpress/data';
  */
 import { store as blockEditorStore } from '../../store';
 
-function usePatternsSetup( blockName, filterPatternsFn ) {
+function usePatternsSetup( clientId, blockName, filterPatternsFn ) {
 	const { patterns } = useSelect(
 		( select ) => {
 			const {
+				getBlockRootClientId,
 				__experimentalGetPatternsByBlockTypes,
 				__experimentalGetAllowedPatterns,
 			} = select( blockEditorStore );
+			const rootClientId = getBlockRootClientId( clientId );
 			let _patterns;
 			// TODO maybe support combination of scoped and provided function??
 			if ( filterPatternsFn ) {
-				// TODO check rootClientId
-				_patterns = __experimentalGetAllowedPatterns().filter(
-					filterPatternsFn
-				);
+				_patterns = __experimentalGetAllowedPatterns(
+					rootClientId
+				).filter( filterPatternsFn );
 			} else {
-				// TODO check and rootClientId
-				_patterns = __experimentalGetPatternsByBlockTypes( blockName );
+				_patterns = __experimentalGetPatternsByBlockTypes(
+					blockName,
+					rootClientId
+				);
 			}
 			return { patterns: _patterns };
 		},
-		[ blockName ]
+		[ clientId, blockName, filterPatternsFn ]
 	);
 
 	return patterns;