Cache createBlock call in isUnmodifiedDefaultBlock (#12521)

* Cache createBlock call in isUnmodifiedDefaultBlock * Invalidate cache when default block name changes * Merge ifs
WordPress · Dec 8, 2018 · 8e772be · 8e772be
1 parent 715af6b
commit 8e772be
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/packages/blocks/src/api/test/utils.js b/packages/blocks/src/api/test/utils.js
@@ -67,5 +67,34 @@ describe( 'block helpers', () => {
 
 			expect( isUnmodifiedDefaultBlock( block ) ).toBe( false );
 		} );
+
+		it( 'should invalidate cache if the default block name changed', () => {
+			registerBlockType( 'core/test-block1', {
+				attributes: {
+					includesDefault1: {
+						type: 'boolean',
+						default: true,
+					},
+				},
+				save: noop,
+				category: 'common',
+				title: 'test block',
+			} );
+			registerBlockType( 'core/test-block2', {
+				attributes: {
+					includesDefault2: {
+						type: 'boolean',
+						default: true,
+					},
+				},
+				save: noop,
+				category: 'common',
+				title: 'test block',
+			} );
+			setDefaultBlockName( 'core/test-block1' );
+			isUnmodifiedDefaultBlock( createBlock( 'core/test-block1' ) );
+			setDefaultBlockName( 'core/test-block2' );
+			expect( isUnmodifiedDefaultBlock( createBlock( 'core/test-block2' ) ) ).toBe( true );
+		} );
 	} );
 } );
diff --git a/packages/blocks/src/api/utils.js b/packages/blocks/src/api/utils.js
@@ -38,7 +38,16 @@ export function isUnmodifiedDefaultBlock( block ) {
 		return false;
 	}
 
-	const newDefaultBlock = createBlock( defaultBlockName );
+	// Cache a created default block if no cache exists or the default block
+	// name changed.
+	if (
+		! isUnmodifiedDefaultBlock.block ||
+		isUnmodifiedDefaultBlock.block.name !== defaultBlockName
+	) {
+		isUnmodifiedDefaultBlock.block = createBlock( defaultBlockName );
+	}
+
+	const newDefaultBlock = isUnmodifiedDefaultBlock.block;
 	const blockType = getBlockType( defaultBlockName );
 
 	return every( blockType.attributes, ( value, key ) =>