Changeset 57254 for trunk/src/wp-includes/block-supports/background.php

Timestamp:

01/09/2024 06:10:09 AM (2 years ago)

Author:

isabel_brison

Message:

Editor: add size and repeat to background image support.

Adds background size and background repeat style processing to the background image block support and WP_Style_Engine definitions.

Props andrewserong, mukesh27.
Fixes #60175.

File:

• trunk/src/wp-includes/block-supports/background.php (modified) (4 diffs)

trunk/src/wp-includes/block-supports/background.php

@@ -41 +41 @@
  *
  * @since 6.4.0
+ * @since 6.5.0 Added support for `backgroundPosition` and `backgroundRepeat` output.
  * @access private
  *
@@ -65 +66 @@
         ? $block_attributes['style']['background']['backgroundImage']['url']
         : null;
+
+    if ( ! $background_image_source && ! $background_image_url ) {
+        return $block_content;
+    }
+
     $background_size         = isset( $block_attributes['style']['background']['backgroundSize'] )
         ? $block_attributes['style']['background']['backgroundSize']
         : 'cover';
+    $background_position     = isset( $block_attributes['style']['background']['backgroundPosition'] )
+        ? $block_attributes['style']['background']['backgroundPosition']
+        : null;
+    $background_repeat       = isset( $block_attributes['style']['background']['backgroundRepeat'] )
+        ? $block_attributes['style']['background']['backgroundRepeat']
+        : null;
 
     $background_block_styles = array();
@@ -77 +89 @@
         // Set file based background URL.
         $background_block_styles['backgroundImage']['url'] = $background_image_url;
-        // Only output the background size when an image url is set.
-        $background_block_styles['backgroundSize'] = $background_size;
+        // Only output the background size and repeat when an image url is set.
+        $background_block_styles['backgroundSize']     = $background_size;
+        $background_block_styles['backgroundRepeat']   = $background_repeat;
+        $background_block_styles['backgroundPosition'] = $background_position;
+
+        // If the background size is set to `contain` and no position is set, set the position to `center`.
+        if ( 'contain' === $background_size && ! isset( $background_position ) ) {
+            $background_block_styles['backgroundPosition'] = 'center';
+        }
     }
 
@@ -100 +119 @@
             $updated_style .= $styles['css'];
             $tags->set_attribute( 'style', $updated_style );
+            $tags->add_class( 'has-background' );
         }