Fix custom classNames for dynamic blocks (#9995)

WordPress · Sep 18, 2018 · 7c7e764 · 7c7e764
1 parent f874704
commit 7c7e764
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/packages/editor/src/hooks/custom-class-name.js b/packages/editor/src/hooks/custom-class-name.js
@@ -55,7 +55,6 @@ export function addAttribute( settings ) {
 export const withInspectorControl = createHigherOrderComponent( ( BlockEdit ) => {
 	return ( props ) => {
 		const hasCustomClassName = hasBlockSupport( props.name, 'customClassName', true );
-
 		if ( hasCustomClassName && props.isSelected ) {
 			return (
 				<Fragment>
@@ -145,7 +144,7 @@ export function addParsedDifference( blockAttributes, blockType, innerHTML ) {
 
 		if ( customClasses.length ) {
 			blockAttributes.className = customClasses.join( ' ' );
-		} else {
+		} else if ( serialized ) {
 			delete blockAttributes.className;
 		}
 	}

diff --git a/packages/editor/src/hooks/test/custom-class-name.js b/packages/editor/src/hooks/test/custom-class-name.js
@@ -15,6 +15,12 @@ describe( 'custom className', () => {
 		title: 'block title',
 	};
 
+	const dynamicBlockSettings = {
+		save: () => null,
+		category: 'common',
+		title: 'block title',
+	};
+
 	describe( 'addAttribute()', () => {
 		const addAttribute = applyFilters.bind( null, 'blocks.registerBlockType' );
 
@@ -150,5 +156,15 @@ describe( 'custom className', () => {
 
 			expect( attributes.className ).toBe( 'custom1 custom3' );
 		} );
+
+		it( 'should not remove the custom classes for dynamic blocks', () => {
+			const attributes = addParsedDifference(
+				{ className: 'custom1' },
+				dynamicBlockSettings,
+				null,
+			);
+
+			expect( attributes.className ).toBe( 'custom1' );
+		} );
 	} );
 } );