Forms: fix styles not loading at CIAB

Author: simison

projects/packages/forms/src/blocks/contact-form/class-contact-form-block.php

@@ -52,6 +52,9 @@ public static function register_block() {
 		add_filter( 'pre_render_block', array( __CLASS__, 'pre_render_contact_form' ), 10, 3 );
 
 		add_filter( 'block_editor_rest_api_preload_paths', array( __CLASS__, 'preload_endpoints' ) );
+
+		// Load scripts for the editing interface
+		add_action( 'enqueue_block_editor_assets', array( __CLASS__, 'load_editor_scripts' ), 9 );
 	}
 	/**
 	 * Register the contact form block feature flag.
@@ -824,26 +827,6 @@ private static function render_synced_form( $ref_id ) {
 		return $output;
 	}
 
-	/**
-	 * Load editor styles for the block.
-	 * These are loaded via enqueue_block_assets to ensure proper loading in the editor iframe context.
-	 */
-	public static function load_editor_styles() {
-
-		$handle = 'jp-forms-blocks';
-
-		Assets::register_script(
-			$handle,
-			'../../../dist/blocks/editor.js',
-			__FILE__,
-			array(
-				'css_path'   => '../../../dist/blocks/editor.css',
-				'textdomain' => 'jetpack-forms',
-			)
-		);
-		wp_enqueue_style( 'jp-forms-blocks' );
-	}
-
 	/**
 	 * Loads scripts
 	 */
@@ -856,6 +839,8 @@ public static function load_editor_scripts() {
 
 		$handle = 'jp-forms-blocks';
 
+		wp_enqueue_style( 'jp-forms-blocks' );
+
 		Assets::register_script(
 			$handle,
 			'../../../dist/blocks/editor.js',
@@ -865,8 +850,7 @@ public static function load_editor_scripts() {
 				'in_footer'    => true,
 				'textdomain'   => 'jetpack-forms',
 				'enqueue'      => true,
-				// Editor styles are loaded separately, see load_editor_styles().
-				'css_path'     => null,
+				'css_path'     => '../../../dist/blocks/editor.css',
 			)
 		);
 

projects/plugins/jetpack/extensions/blocks/contact-form/contact-form.php

@@ -13,11 +13,3 @@
 
 // Register the block
 add_action( 'init', array( Contact_Form_Block::class, 'register_block' ), 9 );
-
-// Load scripts for the editing interface
-add_action( 'enqueue_block_editor_assets', array( Contact_Form_Block::class, 'load_editor_scripts' ), 9 );
-
-// Load styles in the editor iframe context
-if ( is_admin() ) {
-	add_action( 'enqueue_block_assets', array( Contact_Form_Block::class, 'load_editor_styles' ), 9 );
-}