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

Render form block custom classes on frontend

Browse Source 
[MAILPOET-2746]
This commit is contained in:
Rostislav Wolny
2020-03-12 16:27:59 +01:00
committed by Veljko V
parent 72a0afa75b
commit 060a6839c7
7 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Form/Block/Divider.php
View File

@ -3,7 +3,8 @@
namespace MailPoet\Form\Block;
class Divider {
public function render(): string {
return '<hr class="mailpoet_divider" />';
public function render($block): string {
$classes = isset($block['params']['class_name']) ? " " . $block['params']['class_name'] : '';
return '<hr class="mailpoet_divider' . $classes . '" />';
}
}

3
lib/Form/Block/Html.php
View File

@ -22,7 +22,8 @@ class Html {
$text = nl2br($text);
}
$html .= '<div class="mailpoet_paragraph" ' . $this->rendererHelper->renderFontStyle($formSettings) . '>';
$classes = isset($block['params']['class_name']) ? " " . $block['params']['class_name'] : '';
$html .= '<div class="mailpoet_paragraph' . $classes . '" ' . $this->rendererHelper->renderFontStyle($formSettings) . '>';
$html .= $text;
$html .= '</div>';

5
lib/Form/BlockWrapperRenderer.php
View File

@ -2,10 +2,9 @@
namespace MailPoet\Form;
use MailPoet\Models\Form;
class BlockWrapperRenderer {
public function render(array $block, string $blockContent): string {
return '<div class="mailpoet_paragraph">' . $blockContent . '</div>';
$classes = isset($block['params']['class_name']) ? " " . $block['params']['class_name'] : '';
return '<div class="mailpoet_paragraph' . $classes . '">' . $blockContent . '</div>';
}
}

2
lib/Form/BlocksRenderer.php
View File

@ -98,7 +98,7 @@ class BlocksRenderer {
break;
case 'divider':
$html .= $this->divider->render();
$html .= $this->divider->render($block);
break;
case 'checkbox':

18
tests/unit/Form/Block/DividerTest.php
View File

@ -8,13 +8,29 @@ class DividerTest extends \MailPoetUnitTest {
/** @var Divider */
private $divider;
private $block = [
'type' => 'divider',
'name' => 'Divider',
'id' => 'divider',
'unique' => '1',
'static' => '0',
'params' => [],
'position' => '1',
];
public function _before() {
parent::_before();
$this->divider = new Divider();
}
public function testItShouldRenderDivider() {
$html = $this->divider->render();
$html = $this->divider->render($this->block);
expect($html)->equals('<hr class="mailpoet_divider" />');
}
public function testItShouldRenderCustomClass() {
$this->block['params']['class_name'] = 'my_class';
$html = $this->divider->render($this->block);
expect($html)->equals('<hr class="mailpoet_divider my_class" />');
}
}

13
tests/unit/Form/Block/HtmlTest.php
View File

@ -10,9 +10,9 @@ class HtmlTest extends \MailPoetUnitTest {
private $html;
private $block = [
'type' => 'divider',
'name' => 'Divider',
'id' => 'divider',
'type' => 'html',
'name' => 'Html',
'id' => 'html',
'unique' => '1',
'static' => '0',
'params' => [
@ -32,6 +32,13 @@ class HtmlTest extends \MailPoetUnitTest {
expect($html)->equals("<div class=\"mailpoet_paragraph\" >line1<br />\nline2</div>");
}
public function testItShouldRenderCustomClass() {
$block = $this->block;
$block['params']['class_name'] = 'my_class';
$html = $this->html->render($block, []);
expect($html)->equals("<div class=\"mailpoet_paragraph my_class\" >line1<br />\nline2</div>");
}
public function testItShouldRenderCustomHtmlWithoutAutomaticBrs() {
$block = $this->block;
$block['params']['nl2br'] = '';

8
tests/unit/Form/BlockWrapperRendererTest.php
View File

@ -12,4 +12,12 @@ class BlockWrapperRendererTest extends \MailPoetUnitTest {
$result = $renderer->render($block, 'content');
expect($result)->equals('<div class="mailpoet_paragraph">content</div>');
}
public function testItShouldWrapRenderCustomClasses() {
$renderer = new BlockWrapperRenderer();
$block = Fixtures::get('simple_form_body')[0];
$block['params']['class_name'] = 'class1 class2';
$result = $renderer->render($block, 'content');
expect($result)->equals('<div class="mailpoet_paragraph class1 class2">content</div>');
}
}