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

Timestamp:

09/26/2023 02:20:18 PM (3 years ago)

Author:

karmatosed

Message:

Update editor related npm packages

The npm packages needed updating for 6.4 to the latest.

Props mikachan, mukesdpanchal27, luisherranz, youknowriad, tellthemachines, gziolo, ockham, michalczaplinski

Fixes #59411

File:

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

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

@@ -6 +6 @@
  */
 
-if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-        /**
-         * Replaces view script for the File block with version using Interactivity API.
-         *
-         * @param array $metadata Block metadata as read in via block.json.
-         *
-         * @return array Filtered block type metadata.
-         */
-        function gutenberg_block_core_file_update_interactive_view_script( $metadata ) {
-                if ( 'core/file' === $metadata['name'] ) {
-                        $metadata['viewScript'] = array( 'file:./interactivity.min.js' );
-                }
-                return $metadata;
-        }
-        add_filter( 'block_type_metadata', 'gutenberg_block_core_file_update_interactive_view_script', 10, 1 );
-}
-
 /**
- * When the `core/file` block is rendering, check if we need to enqueue the `'wp-block-file-view` script.
+ * 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.
@@ -72 +55 @@
 
         // If it uses the Interactivity API, add the directives.
-        if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN && $should_load_view_script ) {
+        if ( $should_load_view_script ) {
                 $processor = new WP_HTML_Tag_Processor( $content );
                 $processor->next_tag();
                 $processor->set_attribute( 'data-wp-interactive', '' );
                 $processor->next_tag( 'object' );
-                $processor->set_attribute( 'data-wp-bind--hidden', '!selectors.core.file.hasPdfPreview' );
-                $processor->set_attribute( 'hidden', true );
+                $processor->set_attribute( 'data-wp-style--display', 'selectors.core.file.hasPdfPreview' );
                 return $processor->get_updated_html();
         }
@@ -84 +66 @@
         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' );
 
 /**