only send the allowedBlocks arg if needed

WordPress · Jan 9, 2023 · 435536d · 435536d
1 parent 7a12fe7
commit 435536d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/docs/reference-guides/data/data-core-block-editor.md b/docs/reference-guides/data/data-core-block-editor.md
@@ -1170,7 +1170,7 @@ _Parameters_
 
 _Returns_
 
--   `string[]`: Array of allowed core block names or `['true']` if all blocks are allowed.
+-   `string[]|boolean`: Array of allowed core block names or `true` if all blocks are allowed.
 
 <!-- END TOKEN(Autogenerated selectors|../../../packages/block-editor/src/store/selectors.js) -->
 

diff --git a/packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js b/packages/block-editor/src/components/inserter/block-patterns-explorer/patterns-list.js
@@ -67,7 +67,9 @@ function PatternList( { filterValue, selectedCategory } ) {
 		[ destinationRootClientId ]
 	);
 	const options = {
-		allowed_blocks: allowedBlocks.join( ',' ),
+		allowed_blocks: Array.isArray( allowedBlocks )
+			? allowedBlocks.join( ',' )
+			: undefined,
 	};
 	if ( !! filterValue ) {
 		options.search = filterValue;

diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
@@ -2046,7 +2046,7 @@ export const getInserterItems = createSelector(
  * @param {Object}  state        Editor state.
  * @param {?string} rootClientId Optional root client ID of block list.
  *
- * @return {string[]} Array of allowed core block names or `['true']` if all blocks are allowed.
+ * @return {string[]|boolean} Array of allowed core block names or `true` if all blocks are allowed.
  */
 export const __getAllowedCoreBlockNames = createSelector(
 	( state, rootClientId = null ) => {
@@ -2076,7 +2076,7 @@ export const __getAllowedCoreBlockNames = createSelector(
 		// Keep track of the blocks that cannot be inserted based on the provided rootClientId.
 		const allowedBlockNames = allCoreBlockTypes
 			.filter( ( blockType ) =>
-				canInsertBlockTypeUnmemoized( state, blockType, rootClientId )
+				canIncludeBlockTypeInInserter( state, blockType, rootClientId )
 			)
 			.map( ( { name } ) => name );
 		// We need to get all the blocks that cannot be inserted directly, but their parent/ancestor
@@ -2098,7 +2098,7 @@ export const __getAllowedCoreBlockNames = createSelector(
 		if (
 			allowedBlocksWithNestedBlocks.length === allCoreBlockTypes.length
 		) {
-			return [ 'all' ];
+			return true;
 		}
 		allowedBlocksWithNestedBlocks.sort();
 		return allowedBlocksWithNestedBlocks;