Remove dependency support check when checking for block editor on screen

Co-authored-by: Weston Ruter <[email protected]>

Author: pierlon

includes/admin/class-amp-post-meta-box.php

@@ -217,6 +217,13 @@ public function enqueue_admin_assets() {
 	public function enqueue_block_assets() {
 		$post = get_post();
 
+		// Block validation script uses features only available beginning with WP 5.6.
+		$dependency_support = Services::get( 'dependency_support' );
+		if ( ! $dependency_support->has_support() ) {
+			return; // @codeCoverageIgnore
+		}
+
+		// Only enqueue scripts on the block editor for AMP-enabled posts.
 		$editor_support = Services::get( 'editor.editor_support' );
 		if ( ! $editor_support->is_current_screen_supported_block_editor_for_amp_enabled_post_type() ) {
 			return;

includes/validation/class-amp-validation-manager.php

@@ -2175,13 +2175,18 @@ public static function enqueue_block_validation() {
 			return;
 		}
 
-		$editor_support = Services::get( 'editor.editor_support' );
-
 		// Block validation script uses features only available beginning with WP 5.6.
-		if ( ! $editor_support->is_current_screen_supported_block_editor_for_amp_enabled_post_type() ) {
+		$dependency_support = Services::get( 'dependency_support' );
+		if ( ! $dependency_support->has_support() ) {
 			return; // @codeCoverageIgnore
 		}
 
+		// Only enqueue scripts on the block editor for AMP-enabled posts.
+		$editor_support = Services::get( 'editor.editor_support' );
+		if ( ! $editor_support->is_current_screen_supported_block_editor_for_amp_enabled_post_type() ) {
+			return;
+		}
+
 		$slug = 'amp-block-validation';
 
 		$asset_file   = AMP__DIR__ . '/assets/js/' . $slug . '.asset.php';

src/Editor/EditorSupport.php

@@ -44,7 +44,11 @@ public function register() {
 	 * Shows a notice in the editor if the Gutenberg or WP version prevents plugin features from working.
 	 */
 	public function maybe_show_notice() {
-		if ( $this->is_current_screen_supported_block_editor_for_amp_enabled_post_type() ) {
+		if ( $this->dependency_support->has_support() ) {
+			return;
+		}
+
+		if ( ! $this->is_current_screen_supported_block_editor_for_amp_enabled_post_type() ) {
 			return;
 		}
 
@@ -66,19 +70,18 @@ function () {
 	}
 
 	/**
-	 * Returns whether the current environment is supported by the plugin
-	 * and the current screen is using the block editor.
+	 * Returns whether the current screen is using the block editor and the post being edited supports AMP.
 	 *
 	 * @return bool
 	 */
 	public function is_current_screen_supported_block_editor_for_amp_enabled_post_type() {
 		$screen = get_current_screen();
-		return $this->dependency_support->has_support()
-			&&
+		return (
 			$screen
 			&&
 			! empty( $screen->is_block_editor )
 			&&
-			in_array( get_post_type(), AMP_Post_Type_Support::get_supported_post_types(), true );
+			in_array( get_post_type(), AMP_Post_Type_Support::get_supported_post_types(), true )
+		);
 	}
 }