Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix border radius issues in the button

Browse Source 
When only the radius was defined, we set border solid and it caused
that sometimes it was rendered even when the width was not defined.
Overflow hidden ensures that inner link element doesn't break the border radius.
[MAILPOET-5907
This commit is contained in:
Rostislav Wolny
2024-02-29 15:59:34 +01:00
committed by Veljko V
parent 46f94e0901
commit 3bbb7b71a1
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mailpoet/lib/EmailEditor/Integrations/Core/Renderer/Blocks/Button.php
View File

@@ -52,6 +52,7 @@ class Button implements BlockRenderer {
'cursor' => 'auto',
'word-break' => 'break-word',
'box-sizing' => 'border-box',
'overflow' => 'hidden',
];
$linkStyles = [
'background-color' => $bgColor,
@@ -62,18 +63,29 @@ class Button implements BlockRenderer {
];
// Border
if (isset($parsedBlock['attrs']['style']['border']) && !empty($parsedBlock['attrs']['style']['border'])) {
$borderAttrs = $parsedBlock['attrs']['style']['border'] ?? [];
if (!empty($borderAttrs)) {
// Use text color if border color is not set. Check for the value in the custom color text property
// then look also to the text color set from palette
if (!($parsedBlock['attrs']['style']['border']['color'] ?? '')) {
if (!isset($borderAttrs['color'])) {
if (isset($parsedBlock['attrs']['style']['color']['text'])) {
$parsedBlock['attrs']['style']['border']['color'] = $parsedBlock['attrs']['style']['color']['text'];
$borderAttrs['color'] = $parsedBlock['attrs']['style']['color']['text'];
} elseif ($parsedBlock['attrs']['textColor']) {
$buttonClasses .= ' has-' . $parsedBlock['attrs']['textColor'] . '-border-color';
}
}
$wrapperStyles = array_merge($wrapperStyles, wp_style_engine_get_styles(['border' => $parsedBlock['attrs']['style']['border']])['declarations']);
$wrapperStyles['border-style'] = 'solid';
$wrapperStyles = array_merge($wrapperStyles, wp_style_engine_get_styles(['border' => $borderAttrs])['declarations']);
// User might set only the border radius without border color and width so in that case we need to set border:none
// to avoid rendering 1px border. Let's render the border only when width is set or border top is set separately
// which is saved only when there is a side with non-zero width so it is enough to check only top
if (
(isset($borderAttrs['width']) && $borderAttrs['width'] !== '0px')
|| isset($borderAttrs['top'])
) {
$wrapperStyles['border-style'] = 'solid';
} else {
$wrapperStyles['border'] = 'none';
}
} else {
// Some clients render 1px border when not set as none
$wrapperStyles['border'] = 'none';