Changeset 57377 for trunk/src/wp-includes/blocks/file.php

Timestamp:

01/29/2024 09:04:18 PM (17 months ago)

Author:

youknowriad

Message:

Editor: Update the WordPress packages to the Gutenberg 16.7 RC2 version.

This patch, somewhat small brings a lot to WordPress.
This includes features like:

• DataViews.
• Customization tools like box shadow, background size and repeat.
• UI improvements in the site editor.
• Preferences sharing between the post and site editors.
• Unified panels and editors between post and site editors.
• Improved template mode in the post editor.
• Iterations to multiple interactive blocks.
• Preparing the blocks and UI for pattern overrides.
• and a lot more.

Props luisherranz, gziolo, isabel_brison, costdev, jonsurrell, peterwilsoncc, get_dave, antonvlasenko, desrosj.
See #60315.

File:

• trunk/src/wp-includes/blocks/file.php (modified) (4 diffs)

trunk/src/wp-includes/blocks/file.php

@@ -15 +15 @@
  * @return string Returns the block content.
  */
-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 ) );
-        }
-    }
-
+function render_block_core_file( $attributes, $content ) {
     // Update object's aria-label attribute if present in block HTML.
-
     // Match an aria-label attribute from an object tag.
     $pattern = '@<object.+(?<attribute>aria-label="(?<filename>[^"]+)?")@i';
@@ -54 +37 @@
     );
 
-    // If it uses the Interactivity API, add the directives.
-    if ( $should_load_view_script ) {
+    // If it's interactive, enqueue the script module and add the directives.
+    if ( ! empty( $attributes['displayPreview'] ) ) {
+        wp_enqueue_script_module( '@wordpress/block-library/file' );
+
         $processor = new WP_HTML_Tag_Processor( $content );
         $processor->next_tag();
-        $processor->set_attribute( 'data-wp-interactive', '' );
+        $processor->set_attribute( 'data-wp-interactive', '{"namespace":"core/file"}' );
         $processor->next_tag( 'object' );
-        $processor->set_attribute( 'data-wp-bind--hidden', '!selectors.core.file.hasPdfPreview' );
+        $processor->set_attribute( 'data-wp-bind--hidden', '!state.hasPdfPreview' );
         $processor->set_attribute( 'hidden', true );
         return $processor->get_updated_html();
@@ -67 +52 @@
     return $content;
 }
-
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_file_ensure_interactivity_dependency() {
-    global $wp_scripts;
-    if (
-        isset( $wp_scripts->registered['wp-block-file-view'] ) &&
-        ! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-file-view']->deps, true )
-    ) {
-        $wp_scripts->registered['wp-block-file-view']->deps[] = 'wp-interactivity';
-    }
-}
-
-add_action( 'wp_print_scripts', 'block_core_file_ensure_interactivity_dependency' );
 
 /**
@@ -97 +63 @@
         )
     );
+
+    wp_register_script_module(
+        '@wordpress/block-library/file',
+        defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ? gutenberg_url( '/build/interactivity/file.min.js' ) : includes_url( 'blocks/file/view.min.js' ),
+        array( '@wordpress/interactivity' ),
+        defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+    );
 }
 add_action( 'init', 'register_block_core_file' );