Changeset 56065 for trunk/src/wp-includes/blocks/avatar.php

Timestamp:

06/27/2023 02:20:18 PM (3 years ago)

Author:

Bernhard Reiter

Message:

Editor: update Wordpress npm packages.

Updates the wordpress npm packages and their dependencies to the latest versions, as well as auto-updates to relevant core PHP files.

Props youknowriad, joemcgill, spacedmonkey, ramonopoly, peterwilsoncc, bernhard-reiter, tyxla, dmsnell.
Fixes #58623.

File:

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

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

@@ -17 +17 @@
     $size               = isset( $attributes['size'] ) ? $attributes['size'] : 96;
     $wrapper_attributes = get_block_wrapper_attributes();
+    $border_attributes  = get_block_core_avatar_border_attributes( $attributes );
 
-    $image_styles = array();
+    // Class gets passed through `esc_attr` via `get_avatar`.
+    $image_classes = ! empty( $border_attributes['class'] )
+        ? "wp-block-avatar__image {$border_attributes['class']}"
+        : 'wp-block-avatar__image';
 
-    // Add border width styles.
-    $has_border_width = ! empty( $attributes['style']['border']['width'] );
-
-    if ( $has_border_width ) {
-        $border_width   = $attributes['style']['border']['width'];
-        $image_styles[] = sprintf( 'border-width: %s;', esc_attr( $border_width ) );
-    }
-
-    // Add border radius styles.
-    $has_border_radius = ! empty( $attributes['style']['border']['radius'] );
-
-    if ( $has_border_radius ) {
-        $border_radius = $attributes['style']['border']['radius'];
-
-        if ( is_array( $border_radius ) ) {
-            // Apply styles for individual corner border radii.
-            foreach ( $border_radius as $key => $value ) {
-                if ( null !== $value ) {
-                    $name = _wp_to_kebab_case( $key );
-                    // Add shared styles for individual border radii.
-                    $border_style   = sprintf(
-                        'border-%s-radius: %s;',
-                        esc_attr( $name ),
-                        esc_attr( $value )
-                    );
-                    $image_styles[] = $border_style;
-                }
-            }
-        } else {
-            $border_style   = sprintf( 'border-radius: %s;', esc_attr( $border_radius ) );
-            $image_styles[] = $border_style;
-        }
-    }
-
-    // Add border color styles.
-    $has_border_color = ! empty( $attributes['style']['border']['color'] );
-
-    if ( $has_border_color ) {
-        $border_color   = $attributes['style']['border']['color'];
-        $image_styles[] = sprintf( 'border-color: %s;', esc_attr( $border_color ) );
-    }
-
-    // Add border style (solid, dashed, dotted ).
-    $has_border_style = ! empty( $attributes['style']['border']['style'] );
-
-    if ( $has_border_style ) {
-        $border_style   = $attributes['style']['border']['style'];
-        $image_styles[] = sprintf( 'border-style: %s;', esc_attr( $border_style ) );
-    }
-
-    // Add border classes to the avatar image for both custom colors and palette colors.
-    $image_classes = '';
-    if ( $has_border_color || isset( $attributes['borderColor'] ) ) {
-        $image_classes .= 'has-border-color';
-    }
-    if ( isset( $attributes['borderColor'] ) ) {
-        $image_classes .= ' has-' . $attributes['borderColor'] . '-border-color';
-    }
+    // Unlike class, `get_avatar` doesn't filter the styles via `esc_attr`.
+    // The style engine does pass the border styles through
+    // `safecss_filter_attr` however.
+    $image_styles = ! empty( $border_attributes['style'] )
+        ? sprintf( ' style="%s"', esc_attr( $border_attributes['style'] ) )
+        : '';
 
     if ( ! isset( $block->context['commentId'] ) ) {
@@ -90 +42 @@
             $alt,
             array(
-                'extra_attr' => isset( $image_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $image_styles ) ) ) : '',
-                'class'      => "wp-block-avatar__image $image_classes ",
+                'extra_attr' => $image_styles,
+                'class'      => $image_classes,
             )
         );
@@ -117 +69 @@
         $alt,
         array(
-            'extra_attr' => isset( $image_styles ) ? sprintf( ' style="%s"', safecss_filter_attr( implode( ' ', $image_styles ) ) ) : '',
-            'class'      => "wp-block-avatar__image $image_classes",
+            'extra_attr' => $image_styles,
+            'class'      => $image_classes,
         )
     );
@@ -134 +86 @@
 
 /**
+ * Generates class names and styles to apply the border support styles for
+ * the Avatar block.
+ *
+ * @param array $attributes The block attributes.
+ * @return array The border-related classnames and styles for the block.
+ */
+function get_block_core_avatar_border_attributes( $attributes ) {
+    $border_styles = array();
+    $sides         = array( 'top', 'right', 'bottom', 'left' );
+
+    // Border radius.
+    if ( isset( $attributes['style']['border']['radius'] ) ) {
+        $border_styles['radius'] = $attributes['style']['border']['radius'];
+    }
+
+    // Border style.
+    if ( isset( $attributes['style']['border']['style'] ) ) {
+        $border_styles['style'] = $attributes['style']['border']['style'];
+    }
+
+    // Border width.
+    if ( isset( $attributes['style']['border']['width'] ) ) {
+        $border_styles['width'] = $attributes['style']['border']['width'];
+    }
+
+    // Border color.
+    $preset_color           = array_key_exists( 'borderColor', $attributes ) ? "var:preset|color|{$attributes['borderColor']}" : null;
+    $custom_color           = _wp_array_get( $attributes, array( 'style', 'border', 'color' ), null );
+    $border_styles['color'] = $preset_color ? $preset_color : $custom_color;
+
+    // Individual border styles e.g. top, left etc.
+    foreach ( $sides as $side ) {
+        $border                 = _wp_array_get( $attributes, array( 'style', 'border', $side ), null );
+        $border_styles[ $side ] = array(
+            'color' => isset( $border['color'] ) ? $border['color'] : null,
+            'style' => isset( $border['style'] ) ? $border['style'] : null,
+            'width' => isset( $border['width'] ) ? $border['width'] : null,
+        );
+    }
+
+    $styles     = wp_style_engine_get_styles( array( 'border' => $border_styles ) );
+    $attributes = array();
+    if ( ! empty( $styles['classnames'] ) ) {
+        $attributes['class'] = $styles['classnames'];
+    }
+    if ( ! empty( $styles['css'] ) ) {
+        $attributes['style'] = $styles['css'];
+    }
+    return $attributes;
+}
+
+/**
  * Registers the `core/avatar` block on the server.
  */