Retain previous ignoredHookedBlocks

WordPress · Feb 8, 2024 · c257a66 · c257a66
1 parent dfae816
commit c257a66
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 3 deletions.
diff --git a/packages/blocks/src/api/templates.js b/packages/blocks/src/api/templates.js
@@ -122,11 +122,23 @@ export function synchronizeBlocksWithTemplate( blocks = [], template ) {
 			];
 
 			if ( ignoredHookedBlocks.length ) {
-				const { metadata, ...otherAttributes } = blockAttributes;
+				const { metadata = {}, ...otherAttributes } = blockAttributes;
+				const {
+					ignoredHookedBlocks: ignoredHookedBlocksFromTemplate = [],
+					...otherMetadata
+				} = metadata;
+
+				const newIgnoredHookedBlocks = [
+					...new Set( [
+						...ignoredHookedBlocks,
+						...ignoredHookedBlocksFromTemplate,
+					] ),
+				];
+
 				blockAttributes = {
 					metadata: {
-						ignoredHookedBlocks,
-						...metadata,
+						ignoredHookedBlocks: newIgnoredHookedBlocks,
+						...otherMetadata,
 					},
 					...otherAttributes,
 				};

diff --git a/packages/blocks/src/api/test/templates.js b/packages/blocks/src/api/test/templates.js
@@ -168,6 +168,48 @@ describe( 'templates', () => {
 			] );
 		} );
 
+		it( 'retains previously set ignoredHookedBlocks metadata', () => {
+			registerBlockType( 'core/hooked-block', {
+				attributes: {},
+				save: noop,
+				category: 'text',
+				title: 'hooked block',
+				blockHooks: { 'core/test-block': 'after' },
+			} );
+
+			const template = [
+				[
+					'core/test-block',
+					{
+						metadata: {
+							ignoredHookedBlocks: [ 'core/other-hooked-block' ],
+						},
+					},
+				],
+				[ 'core/test-block-2' ],
+				[ 'core/test-block-2' ],
+			];
+			const blockList = [];
+
+			expect(
+				synchronizeBlocksWithTemplate( blockList, template )
+			).toMatchObject( [
+				{
+					name: 'core/test-block',
+					attributes: {
+						metadata: {
+							ignoredHookedBlocks: [
+								'core/hooked-block',
+								'core/other-hooked-block',
+							],
+						},
+					},
+				},
+				{ name: 'core/test-block-2' },
+				{ name: 'core/test-block-2' },
+			] );
+		} );
+
 		it( 'should create nested blocks', () => {
 			const template = [
 				[ 'core/test-block', {}, [ [ 'core/test-block-2' ] ] ],