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

Fix rendering issues in form blocks

Browse Source 
[MAILPOET-3415]
This commit is contained in:
Rostislav Wolny
2021-02-11 12:45:49 +01:00
committed by Veljko V
parent 6e911ffd1d
commit c1aef842d2
29 changed files with 196 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Form/Block/Checkbox.php
View File

@@ -3,6 +3,7 @@
namespace MailPoet\Form\Block;
use MailPoet\Form\BlockWrapperRenderer;
use MailPoet\WP\Functions as WPFunctions;
class Checkbox {
@@ -12,9 +13,13 @@ class Checkbox {
/** @var BlockWrapperRenderer */
private $wrapper;
public function __construct(BlockRendererHelper $rendererHelper, BlockWrapperRenderer $wrapper) {
/** @var WPFunctions */
private $wp;
public function __construct(BlockRendererHelper $rendererHelper, BlockWrapperRenderer $wrapper, WPFunctions $wp) {
$this->rendererHelper = $rendererHelper;
$this->wrapper = $wrapper;
$this->wp = $wp;
}
public function render(array $block, array $formSettings): string {
@@ -51,12 +56,12 @@ class Checkbox {
$html .= $fieldValidation;
$html .= ' /> ' . $option['value'];
$html .= ' /> ' . $this->wp->escHtml($option['value']);
$html .= '</label>';
}
$html .= '<span class="mailpoet_error_' . $block['id'] . '"></span>';
$html .= '<span class="mailpoet_error_' . $this->wp->escAttr($block['id']) . '"></span>';
return $this->wrapper->render($block, $html);
}