Merge 3fb56b7 into 0e6e204

theme/assets/src/block-editor/hooks.js

@@ -19,32 +19,39 @@
  */
 import { addFilter } from '@wordpress/hooks';
 import { createHigherOrderComponent } from '@wordpress/compose';
+import { useEffect } from '@wordpress/element';
 
 /**
- * External dependencies
+ * Trigger a class change when component is rendered.
+ *
+ * @param {*} BlockEdit Original component.
+ *
+ * @return {WPComponent} Original component.
  */
-import classnames from 'classnames';
-
-const withTitleClassNames = createHigherOrderComponent( BlockListBlock => {
+const withAttributeChange = createHigherOrderComponent( BlockEdit => {
 	return props => {
-		if ( 'core/site-title' === props.name ) {
-			return (
-				<BlockListBlock
-					{ ...props }
-					className={ classnames(
+		const {
+			attributes: { className },
+			name,
+		} = props;
+
+		useEffect( () => {
+			if ( 'core/site-title' === name && ! className ) {
+				props.setAttributes( {
+					className:
 						'site-title mdc-typography mdc-typography--headline6',
-						props.className
-					) }
-				/>
-			);
-		}
+				} );
+			}
+			// Use empty array to make sure this runs only once.
+			// eslint-disable-next-line react-hooks/exhaustive-deps
+		}, [] );
 
-		return <BlockListBlock { ...props } />;
+		return <BlockEdit { ...props } />;
 	};
-}, 'withTitleClassNames' );
+}, 'withAttributeChange' );
 
 addFilter(
-	'editor.BlockListBlock',
-	'material/title-class-name',
-	withTitleClassNames
+	'editor.BlockEdit',
+	'material/title-class-name/block-edit',
+	withAttributeChange
 );

theme/inc/blocks/class-blocks.php

@@ -45,7 +45,6 @@ class Blocks {
 	 */
 	public function init() {
 		$this->action_register_blocks();
-		$this->add_filter_render_block();
 	}
 
 	/**
@@ -156,28 +155,4 @@ public static function render( $attributes, $content, $block ) {
 
 		return ob_get_clean();
 	}
-
-	/**
-	 * Add filter to modify core dynamic blocks markup.
-	 */
-	public function add_filter_render_block() {
-		add_filter( 'render_block', [ $this, 'filter_render_block' ], 10, 2 );
-	}
-
-	/**
-	 * Filter render_block to add specific classes to site title.
-	 *
-	 * @param string $block_content Block content.
-	 * @param array  $block         Block object.
-	 *
-	 * @return string
-	 */
-	public function filter_render_block( $block_content, $block ) {
-		if ( 'core/site-title' === $block['blockName'] ) {
-			// Add additional classes to markup.
-			$block_content = str_replace( '<h1 class="', '<h1 class="site-title mdc-typography mdc-typography--headline6 ', $block_content );
-		}
-
-		return $block_content;
-	}
 }