Merge pull request #21696 from Yoast/fix-adding-style-to-iframe

Refactor assets enqueing hooks and callbacks

admin/metabox/class-metabox.php

@@ -74,7 +74,8 @@ public function __construct() {
 		}
 
 		add_action( 'add_meta_boxes', [ $this, 'add_meta_box' ] );
-		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue' ] );
+		add_action( 'enqueue_block_assets', [ $this, 'enqueue' ] );
+		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_post_overview_assets' ] );
 		add_action( 'wp_insert_post', [ $this, 'save_postdata' ] );
 		add_action( 'edit_attachment', [ $this, 'save_postdata' ] );
 		add_action( 'add_attachment', [ $this, 'save_postdata' ] );
@@ -798,6 +799,22 @@ public function is_meta_value_disabled( $key ) {
 		return false;
 	}
 
+	/**
+	 * Enqueues assets for the post overview page.
+	 *
+	 * @return void
+	 */
+	public function enqueue_post_overview_assets() {
+		global $pagenow;
+
+		$asset_manager = new WPSEO_Admin_Asset_Manager();
+
+		if ( self::is_post_overview( $pagenow ) ) {
+			$asset_manager->enqueue_style( 'edit-page' );
+			$asset_manager->enqueue_script( 'edit-page' );
+		}
+	}
+
 	/**
 	 * Enqueues all the needed JS and CSS.
 	 *
@@ -812,13 +829,6 @@ public function enqueue() {
 
 		$is_editor = self::is_post_overview( $pagenow ) || self::is_post_edit( $pagenow );
 
-		if ( self::is_post_overview( $pagenow ) ) {
-			$asset_manager->enqueue_style( 'edit-page' );
-			$asset_manager->enqueue_script( 'edit-page' );
-
-			return;
-		}
-
 		/* Filter 'wpseo_always_register_metaboxes_on_admin' documented in wpseo-main.php */
 		if ( ( $is_editor === false && apply_filters( 'wpseo_always_register_metaboxes_on_admin', false ) === false ) || $this->display_metabox() === false ) {
 			return;