Dynamically opt-in to interactivity support in File and Navigation bl…

…ocks Co-authored-by: Luis Herranz <[email protected]>
WordPress · Jul 12, 2023 · d33578c · d33578c
1 parent abb8410
commit d33578c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
@@ -266,7 +266,7 @@ Add a link to a downloadable file. ([Source](https://github.com/WordPress/gutenb
 
 -	**Name:** core/file
 -	**Category:** media
--	**Supports:** align, anchor, color (background, gradients, link, ~~text~~), interactivity
+-	**Supports:** align, anchor, color (background, gradients, link, ~~text~~)
 -	**Attributes:** displayPreview, downloadButtonText, fileId, fileName, href, id, previewHeight, showDownloadButton, textLinkHref, textLinkTarget
 
 ## Footnotes
@@ -421,7 +421,7 @@ A collection of blocks that allow visitors to get around your site. ([Source](ht
 
 -	**Name:** core/navigation
 -	**Category:** theme
--	**Supports:** align (full, wide), inserter, interactivity, layout (allowSizingOnChildren, default, ~~allowInheriting~~, ~~allowSwitching~~, ~~allowVerticalAlignment~~), spacing (blockGap, units), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align (full, wide), inserter, layout (allowSizingOnChildren, default, ~~allowInheriting~~, ~~allowSwitching~~, ~~allowVerticalAlignment~~), spacing (blockGap, units), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** __unstableLocation, backgroundColor, customBackgroundColor, customOverlayBackgroundColor, customOverlayTextColor, customTextColor, hasIcon, icon, maxNestingLevel, openSubmenusOnClick, overlayBackgroundColor, overlayMenu, overlayTextColor, ref, rgbBackgroundColor, rgbTextColor, showSubmenuIcon, templateLock, textColor
 
 ## Custom Link

diff --git a/lib/experimental/interactivity-api/scripts.php b/lib/experimental/interactivity-api/scripts.php
@@ -18,7 +18,7 @@ function gutenberg_interactivity_move_interactive_scripts_to_the_footer() {
 	// Move all the view scripts of the interactive blocks to the footer.
 	$registered_blocks = \WP_Block_Type_Registry::get_instance()->get_all_registered();
 	foreach ( array_values( $registered_blocks ) as $block ) {
-		if ( isset( $block->supports['interactivity'] ) && $block->supports['interactivity'] && gutenberg_should_block_use_interactivity_api( $block->name ) ) {
+		if ( isset( $block->supports['interactivity'] ) && $block->supports['interactivity'] ) {
 			foreach ( $block->view_script_handles as $handle ) {
 				wp_script_add_data( $handle, 'group', 1 );
 			}

diff --git a/packages/block-library/src/file/block.json b/packages/block-library/src/file/block.json
@@ -65,8 +65,7 @@
 				"background": true,
 				"link": true
 			}
-		},
-		"interactivity": true
+		}
 	},
 	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-file-editor",

diff --git a/packages/block-library/src/file/index.php b/packages/block-library/src/file/index.php
@@ -15,7 +15,8 @@
 	 */
 	function gutenberg_block_core_file_update_interactive_view_script( $metadata ) {
 		if ( 'core/file' === $metadata['name'] ) {
-			$metadata['viewScript'] = array( 'file:./view-interactivity.min.js' );
+			$metadata['viewScript']                = array( 'file:./view-interactivity.min.js' );
+			$metadata['supports']['interactivity'] = true;
 		}
 		return $metadata;
 	}

diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
@@ -131,8 +131,7 @@
 					}
 				}
 			}
-		},
-		"interactivity": true
+		}
 	},
 	"viewScript": [ "file:./view.min.js", "file:./view-modal.min.js" ],
 	"editorStyle": "wp-block-navigation-editor",

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -151,7 +151,8 @@ function block_core_navigation_add_directives_to_submenu( $w, $block_attributes
 	 */
 	function gutenberg_block_core_navigation_update_interactive_view_script( $metadata ) {
 		if ( 'core/navigation' === $metadata['name'] ) {
-			$metadata['viewScript'] = array( 'file:./view-interactivity.min.js' );
+			$metadata['viewScript']                = array( 'file:./view-interactivity.min.js' );
+			$metadata['supports']['interactivity'] = true;
 		}
 		return $metadata;
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -131,8 +131,7 @@ @@
     					}
     				}
     			}
-    		},
-    		"interactivity": true
+    		}
     	},
     	"viewScript": [ "file:./view.min.js", "file:./view-modal.min.js" ],
     	"editorStyle": "wp-block-navigation-editor",
@@ Expand Down @@