Remove Interactivity API experimental flag

lib/experiments-page.php

@@ -89,18 +89,6 @@ function gutenberg_initialize_experiments_settings() {
 		)
 	);
 
-	add_settings_field(
-		'gutenberg-interactivity-api-core-blocks',
-		__( 'Core blocks', 'gutenberg' ),
-		'gutenberg_display_experiment_field',
-		'gutenberg-experiments',
-		'gutenberg_experiments_section',
-		array(
-			'label' => __( 'Test the core blocks using the Interactivity API', 'gutenberg' ),
-			'id'    => 'gutenberg-interactivity-api-core-blocks',
-		)
-	);
-
 	add_settings_field(
 		'gutenberg-pattern-enhancements',
 		__( 'Pattern enhancements', 'gutenberg' ),

lib/load.php

@@ -104,10 +104,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/kses.php';
 require __DIR__ . '/experimental/l10n.php';
 require __DIR__ . '/experimental/navigation-fallback.php';
-if ( gutenberg_is_experiment_enabled( 'gutenberg-interactivity-api-core-blocks' ) ) {
-	require __DIR__ . '/experimental/interactivity-api/script-loader.php';
-	require __DIR__ . '/experimental/interactivity-api/blocks.php';
-}
+require __DIR__ . '/experimental/interactivity-api/script-loader.php';
 
 // Fonts API.
 if ( ! class_exists( 'WP_Fonts' ) ) {

packages/block-library/src/file/block.json

@@ -67,7 +67,7 @@
 			}
 		}
 	},
-	"viewScript": "file:./view.min.js",
+	"viewScript": "file:./interactivity.min.js",
 	"editorStyle": "wp-block-file-editor",
 	"style": "wp-block-file"
 }

packages/block-library/src/file/index.php

@@ -8,15 +8,27 @@
 /**
  * When the `core/file` block is rendering, check if we need to enqueue the `'wp-block-file-view` script.
  *
- * @param array  $attributes The block attributes.
- * @param string $content    The block content.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The block content.
+ * @param WP_Block $block      The parsed block.
  *
  * @return string Returns the block content.
  */
-function render_block_core_file( $attributes, $content ) {
-	$should_load_view_script = ! empty( $attributes['displayPreview'] ) && ! wp_script_is( 'wp-block-file-view' );
-	if ( $should_load_view_script ) {
-		wp_enqueue_script( 'wp-block-file-view' );
+function render_block_core_file( $attributes, $content, $block ) {
+	$should_load_view_script = ! empty( $attributes['displayPreview'] );
+	$view_js_file            = 'wp-block-file-view';
+	// If the script already exists, there is no point in removing it from viewScript.
+	if ( ! wp_script_is( $view_js_file ) ) {
+		$script_handles = $block->block_type->view_script_handles;
+
+		// If the script is not needed, and it is still in the `view_script_handles`, remove it.
+		if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
+		}
+		// If the script is needed, but it was previously removed, add it again.
+		if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
+		}
 	}
 
 	// Update object's aria-label attribute if present in block HTML.
@@ -41,6 +53,17 @@ function ( $matches ) {
 		$content
 	);
 
+	// If it uses the Interactivity API, add the directives.
+	if ( $should_load_view_script ) {
+		$processor = new WP_HTML_Tag_Processor( $content );
+		$processor->next_tag();
+		$processor->set_attribute( 'data-wp-island', '' );
+		$processor->next_tag( 'object' );
+		$processor->set_attribute( 'data-wp-bind.hidden', '!selectors.core.file.hasPdfPreview' );
+		$processor->set_attribute( 'hidden', true );
+		return $processor->get_updated_html();
+	}
+
 	return $content;
 }
 

packages/block-library/src/image/block.json

@@ -120,6 +120,7 @@
 		},
 		{ "name": "rounded", "label": "Rounded" }
 	],
+	"viewScript": "file:./interactivity.min.js",
 	"editorStyle": "wp-block-image-editor",
 	"style": "wp-block-image"
 }

packages/block-library/src/image/index.php

@@ -9,11 +9,13 @@
  * Renders the `core/image` block on the server,
  * adding a data-id attribute to the element if core/gallery has added on pre-render.
  *
- * @param  array  $attributes The block attributes.
- * @param  string $content    The block content.
+ * @param array    $attributes The block attributes.
+ * @param string   $content    The block content.
+ * @param WP_Block $block      The parsed block.
+ *
  * @return string Returns the block content with the data-id attribute added.
  */
-function render_block_core_image( $attributes, $content ) {
+function render_block_core_image( $attributes, $content, $block ) {
 
 	$processor = new WP_HTML_Tag_Processor( $content );
 	$processor->next_tag( 'img' );
@@ -45,9 +47,23 @@ function render_block_core_image( $attributes, $content ) {
 		}
 	}
 
-	$experiments = get_option( 'gutenberg-experiments' );
+	$should_load_view_script = 'none' === $link_destination && $lightbox;
+	$view_js_file            = 'wp-block-image-view';
+	// If the script already exists, there is no point in removing it from viewScript.
+	if ( ! wp_script_is( $view_js_file ) ) {
+		$script_handles = $block->block_type->view_script_handles;
+
+		// If the script is not needed, and it is still in the `view_script_handles`, remove it.
+		if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
+		}
+		// If the script is needed, but it was previously removed, add it again.
+		if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
+			$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
+		}
+	}
 
-	if ( ! empty( $experiments['gutenberg-interactivity-api-core-blocks'] ) && 'none' === $link_destination && $lightbox ) {
+	if ( $should_load_view_script ) {
 
 		$aria_label = __( 'Enlarge image' );
 

packages/block-library/src/navigation/block.json

@@ -134,7 +134,7 @@
 			}
 		}
 	},
-	"viewScript": [ "file:./view.min.js", "file:./view-modal.min.js" ],
+	"viewScript": "file:./interactivity.min.js",
 	"editorStyle": "wp-block-navigation-editor",
 	"style": "wp-block-navigation"
 }