Changeset 53157 for trunk/src/wp-includes/blocks/gallery.php

Timestamp:

04/12/2022 03:10:30 PM (3 years ago)

Author:

gziolo

Message:

Editor: Update WordPress packages based based on Gutenberg v13.0 RC3

This is the last step of backports from the Gutenberg plugin for WordPress 6.0 Beta 1 release. It includes all updates WordPress packages published to npm based on the Gutenberg plugin v13.0 RC3 release. This patch also includes all the necessary changes applied to core blocks. New blocks included:

• Avatar
• Comment Author Name
• Comment Content
• Comment Date
• Comment Edit Link
• Comment Rely Link
• Comment Template
• Comments Pagination
• Comments Pagination Next
• Comments Pagination Previous
• Comments Query Loop
• Home Link
• Post Author Biography
• Query No Results
• Read More

See more details in ​https://github.com/WordPress/wordpress-develop/pull/2564.

Props zieladam, ramonopoly, ocean90.
Fixes #55505.

File:

• trunk/src/wp-includes/blocks/gallery.php (modified) (2 diffs)

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

@@ -34 +34 @@
 
 /**
+ * Adds a style tag for the --wp--style--unstable-gallery-gap var.
+ *
+ * The Gallery block needs to recalculate Image block width based on
+ * the current gap setting in order to maintain the number of flex columns
+ * so a css var is added to allow this.
+ *
+ * @param array  $attributes Attributes of the block being rendered.
+ * @param string $content Content of the block being rendered.
+ * @return string The content of the block being rendered.
+ */
+function block_core_gallery_render( $attributes, $content ) {
+    $gap = _wp_array_get( $attributes, array( 'style', 'spacing', 'blockGap' ) );
+    // Skip if gap value contains unsupported characters.
+    // Regex for CSS value borrowed from `safecss_filter_attr`, and used here
+    // because we only want to match against the value, not the CSS attribute.
+    $gap     = preg_match( '%[\\\(&=}]|/\*%', $gap ) ? null : $gap;
+    $class   = wp_unique_id( 'wp-block-gallery-' );
+    $content = preg_replace(
+        '/' . preg_quote( 'class="', '/' ) . '/',
+        'class="' . $class . ' ',
+        $content,
+        1
+    );
+    // --gallery-block--gutter-size is deprecated. --wp--style--gallery-gap-default should be used by themes that want to set a default
+    // gap on the gallery.
+    $gap_value = $gap ? $gap : 'var( --wp--style--gallery-gap-default, var( --gallery-block--gutter-size, var( --wp--style--block-gap, 0.5em ) ) )';
+    $style     = '.' . $class . '{ --wp--style--unstable-gallery-gap: ' . $gap_value . '; gap: ' . $gap_value . '}';
+    // Ideally styles should be loaded in the head, but blocks may be parsed
+    // after that, so loading in the footer for now.
+    // See https://core.trac.wordpress.org/ticket/53494.
+    add_action(
+        'wp_footer',
+        function () use ( $style ) {
+            echo '<style> ' . $style . '</style>';
+        }
+    );
+    return $content;
+}
+/**
  * Registers the `core/gallery` block on server.
- * This render callback needs to be here
- * so that the gallery styles are loaded in block-based themes.
  */
 function register_block_core_gallery() {
@@ -42 +79 @@
         __DIR__ . '/gallery',
         array(
-            'render_callback' => function ( $attributes, $content ) {
-                return $content;
-            },
+            'render_callback' => 'block_core_gallery_render',
         )
     );