Merge 1c5bd3b into a82ef8e

material-components · May 17, 2022 · e6b5e9b · e6b5e9b
2 parents a82ef8e + 1c5bd3b
commit e6b5e9b
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/theme/inc/block-editor.php b/theme/inc/block-editor.php
@@ -27,6 +27,7 @@
  */
 function setup() {
 	add_action( 'init', __NAMESPACE__ . '\\register_disable_section_meta' );
+	add_action( 'admin_init', __NAMESPACE__ . '\\force_enqueue_block_editor_assets' );
 	add_action( 'enqueue_block_editor_assets', __NAMESPACE__ . '\\enqueue_block_editor_assets' );
 	if ( ! is_fse() ) {
 		add_action( 'body_class', __NAMESPACE__ . '\\filter_body_class' );
@@ -38,6 +39,21 @@ function setup() {
 	$overrides_block = new Override();
 }
 
+/**
+ * Force enqueue block editor assets for FSE.
+ *
+ * @return void
+ */
+function force_enqueue_block_editor_assets() {
+	global $pagenow;
+	if ( $pagenow !== 'site-editor.php' ) {
+		return;
+	}
+	// Force registration of block editor assets early so .
+
+	do_action( 'enqueue_block_editor_assets' );
+}
+
 /**
  * Register disable section meta.
  */