rebase on oct-10-2023
This commit is contained in:
@@ -16,67 +16,19 @@
|
||||
function render_block_core_avatar( $attributes, $content, $block ) {
|
||||
$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'] ) ) {
|
||||
$author_id = isset( $attributes['userId'] ) ? $attributes['userId'] : get_post_field( 'post_author', $block->context['postId'] );
|
||||
@@ -89,8 +41,8 @@ function render_block_core_avatar( $attributes, $content, $block ) {
|
||||
'',
|
||||
$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,
|
||||
)
|
||||
);
|
||||
if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
|
||||
@@ -116,8 +68,8 @@ function render_block_core_avatar( $attributes, $content, $block ) {
|
||||
'',
|
||||
$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,
|
||||
)
|
||||
);
|
||||
if ( isset( $attributes['isLink'] ) && $attributes['isLink'] && isset( $comment->comment_author_url ) && '' !== $comment->comment_author_url ) {
|
||||
@@ -132,6 +84,58 @@ function render_block_core_avatar( $attributes, $content, $block ) {
|
||||
return sprintf( '<div %1s>%2s</div>', $wrapper_attributes, $avatar_block );
|
||||
}
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user