Render font size

[MAILPOET-2600]

lib/Form/Block/BlockRendererHelper.php

@@ -82,7 +82,7 @@ class BlockRendererHelper {
     return join(' ', $validation);
   }
 
-  public function renderLabel(array $block): string {
+  public function renderLabel(array $block, array $formSettings): string {
     $html = '';
     if (
       isset($block['params']['hide_label'])
@@ -98,7 +98,10 @@ class BlockRendererHelper {
     }
     if (isset($block['params']['label'])
       && strlen(trim($block['params']['label'])) > 0) {
-      $html .= '<label class="mailpoet_' . $block['type'] . '_label">';
+      $html .= '<label '
+        . 'class="mailpoet_' . $block['type'] . '_label" '
+        . $this->renderFontStyle($formSettings)
+        . '>';
       $html .= htmlspecialchars($block['params']['label']);
 
       if (isset($block['params']['required']) && $block['params']['required']) {
@@ -110,6 +113,13 @@ class BlockRendererHelper {
     return $html;
   }
 
+  public function renderFontStyle(array $formSettings) {
+    if (isset($formSettings['fontSize'])) {
+      return 'style="font-size: ' . trim($formSettings['fontSize']) . 'px"';
+    }
+    return '';
+  }
+
   public function renderInputPlaceholder(array $block): string {
     $html = '';
     // if the label is displayed as a placeholder,

lib/Form/Block/Checkbox.php

@@ -17,7 +17,7 @@ class Checkbox {
     $this->wp = $wp;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $html = '';
 
     $fieldName = 'data[' . $this->rendererHelper->getFieldName($block) . ']';
@@ -25,7 +25,7 @@ class Checkbox {
 
     $html .= '<p class="mailpoet_paragraph">';
 
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
 
     $options = (!empty($block['params']['values'])
       ? $block['params']['values']
@@ -35,7 +35,8 @@ class Checkbox {
     $selectedValue = $this->rendererHelper->getFieldValue($block);
 
     foreach ($options as $option) {
-      $html .= '<label class="mailpoet_checkbox_label">';
+      $html .= '<label class="mailpoet_checkbox_label" '
+        . $this->rendererHelper->renderFontStyle($formSettings) . '>';
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
 
       $html .= 'name="' . $fieldName . '" ';

lib/Form/Block/Date.php

@@ -11,10 +11,10 @@ class Date {
     $this->rendererHelper = $rendererHelper;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $html = '';
     $html .= '<p class="mailpoet_paragraph">';
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
     $html .= $this->renderDateSelect($block);
     $html .= '</p>';
 

lib/Form/Block/Html.php

@@ -3,7 +3,14 @@
 namespace MailPoet\Form\Block;
 
 class Html {
-  public function render(array $block): string {
+  /** @var BlockRendererHelper */
+  private $rendererHelper;
+
+  public function __construct(BlockRendererHelper $rendererHelper) {
+    $this->rendererHelper = $rendererHelper;
+  }
+
+  public function render(array $block, array $formSettings): string {
     $html = '';
     $text = '';
 
@@ -15,7 +22,7 @@ class Html {
       $text = nl2br($text);
     }
 
-    $html .= '<p class="mailpoet_paragraph">';
+    $html .= '<p class="mailpoet_paragraph" ' . $this->rendererHelper->renderFontStyle($formSettings) . '>';
     $html .= $text;
     $html .= '</p>';
 

lib/Form/Block/Radio.php

@@ -17,7 +17,7 @@ class Radio {
     $this->wp = $wp;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $html = '';
 
     $fieldName = 'data[' . $this->rendererHelper->getFieldName($block) . ']';
@@ -25,7 +25,7 @@ class Radio {
 
     $html .= '<p class="mailpoet_paragraph">';
 
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
 
     $options = (!empty($block['params']['values'])
       ? $block['params']['values']
@@ -35,7 +35,9 @@ class Radio {
     $selectedValue = $this->rendererHelper->getFieldValue($block);
 
     foreach ($options as $option) {
-      $html .= '<label class="mailpoet_radio_label">';
+      $html .= '<label class="mailpoet_radio_label" '
+        . $this->rendererHelper->renderFontStyle($formSettings)
+        . '>';
 
       $html .= '<input type="radio" class="mailpoet_radio" ';
 

lib/Form/Block/Segment.php

@@ -17,7 +17,7 @@ class Segment {
     $this->wp = $wp;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $html = '';
 
     $fieldName = 'data[' . $this->rendererHelper->getFieldName($block) . ']';
@@ -25,7 +25,7 @@ class Segment {
 
     $html .= '<p class="mailpoet_paragraph">';
 
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
 
     $options = (!empty($block['params']['values'])
       ? $block['params']['values']
@@ -37,7 +37,9 @@ class Segment {
 
       $isChecked = (isset($option['is_checked']) && $option['is_checked']) ? 'checked="checked"' : '';
 
-      $html .= '<label class="mailpoet_checkbox_label">';
+      $html .= '<label class="mailpoet_checkbox_label" '
+        . $this->rendererHelper->renderFontStyle($formSettings)
+        . '>';
       $html .= '<input type="checkbox" class="mailpoet_checkbox" ';
       $html .= 'name="' . $fieldName . '[]" ';
       $html .= 'value="' . $option['id'] . '" ' . $isChecked . ' ';

lib/Form/Block/Select.php

@@ -17,13 +17,13 @@ class Select {
     $this->wp = $wp;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $html = '';
 
     $fieldName = 'data[' . $this->rendererHelper->getFieldName($block) . ']';
     $automationId = ($block['id'] == 'status') ? 'data-automation-id="form_status"' : '';
     $html .= '<p class="mailpoet_paragraph">';
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
     $html .= '<select class="mailpoet_select" name="' . $fieldName . '" ' . $automationId . '>';
 
     if (isset($block['params']['label_within']) && $block['params']['label_within']) {

lib/Form/Block/Text.php

@@ -11,7 +11,7 @@ class Text {
     $this->rendererHelper = $rendererHelper;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $type = 'text';
     $automationId = ' ';
     if ($block['id'] === 'email') {
@@ -21,7 +21,7 @@ class Text {
 
     $html = '<p class="mailpoet_paragraph">';
 
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
 
     $html .= '<input type="' . $type . '" class="mailpoet_text" ';
 

lib/Form/Block/Textarea.php

@@ -10,12 +10,12 @@ class Textarea {
     $this->rendererHelper = $rendererHelper;
   }
 
-  public function render(array $block): string {
+  public function render(array $block, array $formSettings): string {
     $html = '';
 
     $html .= '<p class="mailpoet_paragraph">';
 
-    $html .= $this->rendererHelper->renderLabel($block);
+    $html .= $this->rendererHelper->renderLabel($block, $formSettings);
 
     $lines = (isset($block['params']['lines']) ? (int)$block['params']['lines'] : 1);
 

lib/Form/BlocksRenderer.php

@@ -68,11 +68,11 @@ class BlocksRenderer {
     $this->textarea = $textarea;
   }
 
-  public function renderBlock(array $block = []): string {
+  public function renderBlock(array $block = [], array $formSettings): string {
     $html = '';
     switch ($block['type']) {
       case 'html':
-        $html .= $this->html->render($block);
+        $html .= $this->html->render($block, $formSettings);
         break;
 
       case 'divider':
@@ -80,31 +80,31 @@ class BlocksRenderer {
         break;
 
       case 'checkbox':
-        $html .= $this->checkbox->render($block);
+        $html .= $this->checkbox->render($block, $formSettings);
         break;
 
       case 'radio':
-        $html .= $this->radio->render($block);
+        $html .= $this->radio->render($block, $formSettings);
         break;
 
       case 'segment':
-        $html .= $this->segment->render($block);
+        $html .= $this->segment->render($block, $formSettings);
         break;
 
       case 'date':
-        $html .= $this->date->render($block);
+        $html .= $this->date->render($block, $formSettings);
         break;
 
       case 'select':
-        $html .= $this->select->render($block);
+        $html .= $this->select->render($block, $formSettings);
         break;
 
       case 'text':
-        $html .= $this->text->render($block);
+        $html .= $this->text->render($block, $formSettings);
         break;
 
       case 'textarea':
-        $html .= $this->textarea->render($block);
+        $html .= $this->textarea->render($block, $formSettings);
         break;
 
       case 'submit':

lib/Form/Renderer.php

@@ -38,7 +38,7 @@ class Renderer {
   public function renderHTML(array $form = []): string {
     if (isset($form['body']) && !empty($form['body'])) {
       return $this->wrapForm(
-        $this->renderBlocks($form['body']),
+        $this->renderBlocks($form['body'], $form['settings']),
         $form['settings']
       );
     }
@@ -54,14 +54,14 @@ class Renderer {
     }
   }
 
-  public function renderBlocks(array $blocks = [], bool $honeypotEnabled = true): string {
+  public function renderBlocks(array $blocks = [], array $formSettings = [], bool $honeypotEnabled = true): string {
     // add honeypot for spambots
     $html = ($honeypotEnabled) ? $this->renderHoneypot() : '';
     foreach ($blocks as $key => $block) {
       if ($block['type'] == 'submit' && $this->settings->get('captcha.type') === Captcha::TYPE_RECAPTCHA) {
         $html .= $this->renderReCaptcha();
       }
-      $html .= $this->blocksRenderer->renderBlock($block) . PHP_EOL;
+      $html .= $this->blocksRenderer->renderBlock($block, $formSettings) . PHP_EOL;
     }
     return $html;
   }
@@ -103,10 +103,6 @@ class Renderer {
       $styles[] = 'color: ' . trim($formSettings['fontColor']);
     }
 
-    if (isset($formSettings['fontSize'])) {
-      $styles[] = 'font-size: ' . trim($formSettings['fontSize']) . 'px';
-    }
-
     if (empty($styles)) return $formBody;
     return '<div style="' . join(';', $styles) . '">' . $formBody . '</div>';
   }

lib/Subscription/CaptchaRenderer.php

@@ -115,7 +115,7 @@ class CaptchaRenderer {
     $formHtml .= '</p>';
 
     // subscription form
-    $formHtml .= $this->formRenderer->renderBlocks($form, $honeypot = false);
+    $formHtml .= $this->formRenderer->renderBlocks($form, [], $honeypot = false);
     $formHtml .= '</div>';
     $formHtml .= $this->renderFormMessages($formModel, $showSuccessMessage, $showErrorMessage);
     $formHtml .= '</form>';

lib/Subscription/Pages.php

@@ -497,7 +497,7 @@ class Pages {
     $formHtml .= '</p>';
 
     // subscription form
-    $formHtml .= $this->formRenderer->renderBlocks($form, $honeypot = false);
+    $formHtml .= $this->formRenderer->renderBlocks($form, [], $honeypot = false);
     $formHtml .= '</form>';
     return $formHtml;
   }

tests/unit/Form/Block/BlockRendererHelperTest.php

@@ -42,15 +42,15 @@ class BlockRendererHelperTest extends \MailPoetUnitTest {
 
   public function testItShouldRenderLabel() {
     $block = $this->block;
-    $label = $this->rendererHelper->renderLabel($block);
-    expect($label)->equals('<label class="mailpoet_text_label">Input label</label>');
+    $label = $this->rendererHelper->renderLabel($block, []);
+    expect($label)->regExp('#<label.*class="mailpoet_text_label".*>Input label</label>#m');
 
     $block['params']['required'] = '1';
-    $label = $this->rendererHelper->renderLabel($block);
-    expect($label)->equals('<label class="mailpoet_text_label">Input label <span class="mailpoet_required">*</span></label>');
+    $label = $this->rendererHelper->renderLabel($block, []);
+    expect($label)->equals('<label class="mailpoet_text_label" >Input label <span class="mailpoet_required">*</span></label>');
 
     $block['params']['hide_label'] = '1';
-    $label = $this->rendererHelper->renderLabel($block);
+    $label = $this->rendererHelper->renderLabel($block, []);
     expect($label)->equals('');
   }
 

tests/unit/Form/Block/CheckboxTest.php

@@ -55,7 +55,7 @@ class CheckboxTest extends \MailPoetUnitTest {
     $this->rendererHelperMock->expects($this->once())->method('getFieldName')->willReturn('Field name');
     $this->rendererHelperMock->expects($this->once())->method('getInputValidation')->willReturn('validation="1"');
     $this->rendererHelperMock->expects($this->once())->method('getFieldValue')->willReturn('1');
-    $html = $this->checkbox->render($this->block);
+    $html = $this->checkbox->render($this->block, []);
     $checkboxLabel = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_checkbox_label']");
     expect($checkboxLabel->nodeValue)->equals(' Checkbox label');
     $checkbox = $this->htmlParser->getChildElement($checkboxLabel, 'input');

tests/unit/Form/Block/DateTest.php

@@ -48,7 +48,7 @@ class DateTest extends \MailPoetUnitTest {
     $this->baseMock->expects($this->once())->method('getFieldName')->willReturn('Field name');
     $this->baseMock->expects($this->any())->method('getInputValidation')->willReturn(' validation="1" ');
 
-    $html = $this->date->render($this->block);
+    $html = $this->date->render($this->block, []);
     $mothsSelect = $this->htmlParser->getElementByXpath($html, "//select", 0);
     $yearsSelect = $this->htmlParser->getElementByXpath($html, "//select", 1);
     expect($mothsSelect->childNodes->length)->equals(13); // Months + placeholder
@@ -73,7 +73,7 @@ class DateTest extends \MailPoetUnitTest {
     $block['params']['date_type'] = 'year_month_day';
     $block['params']['date_format'] = 'MM/DD/YYYY';
 
-    $html = $this->date->render($block);
+    $html = $this->date->render($block, []);
     $mothsSelect = $this->htmlParser->getElementByXpath($html, "//select", 0);
     $daysSelect = $this->htmlParser->getElementByXpath($html, "//select", 1);
     $yearsSelect = $this->htmlParser->getElementByXpath($html, "//select", 2);

tests/unit/Form/Block/HtmlTest.php

@@ -2,6 +2,7 @@
 
 namespace MailPoet\Test\Form\Block;
 
+use MailPoet\Form\Block\BlockRendererHelper;
 use MailPoet\Form\Block\Html;
 
 class HtmlTest extends \MailPoetUnitTest {
@@ -23,25 +24,25 @@ class HtmlTest extends \MailPoetUnitTest {
 
   public function _before() {
     parent::_before();
-    $this->html = new Html();
+    $this->html = new Html($this->createMock(BlockRendererHelper::class));
   }
 
   public function testItShouldRenderCustomHtml() {
-    $html = $this->html->render($this->block);
-    expect($html)->equals("<p class=\"mailpoet_paragraph\">line1<br />\nline2</p>");
+    $html = $this->html->render($this->block, []);
+    expect($html)->equals("<p class=\"mailpoet_paragraph\" >line1<br />\nline2</p>");
   }
 
   public function testItShouldRenderCustomHtmlWithoutAutomaticBrs() {
     $block = $this->block;
     $block['params']['nl2br'] = '';
-    $html = $this->html->render($block);
-    expect($html)->equals("<p class=\"mailpoet_paragraph\">line1\nline2</p>");
+    $html = $this->html->render($block, []);
+    expect($html)->equals("<p class=\"mailpoet_paragraph\" >line1\nline2</p>");
   }
 
   public function testItShouldNotEscapeHtml() {
     $block = $this->block;
     $block['params']['text'] = '<p class="my-p">Hello</p>';
-    $html = $this->html->render($block);
-    expect($html)->equals("<p class=\"mailpoet_paragraph\"><p class=\"my-p\">Hello</p></p>");
+    $html = $this->html->render($block, []);
+    expect($html)->equals("<p class=\"mailpoet_paragraph\" ><p class=\"my-p\">Hello</p></p>");
   }
 }

tests/unit/Form/Block/RadioTest.php

@@ -59,7 +59,7 @@ class RadioTest extends \MailPoetUnitTest {
     $this->baseMock->expects($this->once())->method('getInputValidation')->willReturn(' validation="1" ');
     $this->baseMock->expects($this->once())->method('getFieldValue')->willReturn('Radio 2');
 
-    $html = $this->radio->render($this->block);
+    $html = $this->radio->render($this->block, []);
 
     $radio1 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_radio_label']", 0);
     $radio2 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_radio_label']", 1);

tests/unit/Form/Block/SegmentTest.php

@@ -57,7 +57,7 @@ class SegmentTest extends \MailPoetUnitTest {
     $this->rendererHelperMock->expects($this->once())->method('getInputValidation')->willReturn('validation="1"');
     $this->rendererHelperMock->expects($this->once())->method('getFieldName')->willReturn('Segments');
 
-    $html = $this->segment->render($this->block);
+    $html = $this->segment->render($this->block, []);
 
     $checkbox1 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_checkbox_label']", 0);
     $checkbox2 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_checkbox_label']", 1);

tests/unit/Form/Block/SelectTest.php

@@ -56,7 +56,7 @@ class SelectTest extends \MailPoetUnitTest {
             ],
             'is_checked' => false,
             'is_disabled' => false,
-            'is_hidden' => false,
+
           ],
         ],
       ],
@@ -64,7 +64,7 @@ class SelectTest extends \MailPoetUnitTest {
   }
 
   public function testItRendersSelectBlock() {
-    $rendered = $this->selectBlock->render($this->block);
+    $rendered = $this->selectBlock->render($this->block, []);
     expect($rendered)->contains(Subscriber::STATUS_SUBSCRIBED);
     expect($rendered)->contains(Subscriber::STATUS_UNSUBSCRIBED);
     expect($rendered)->contains(Subscriber::STATUS_BOUNCED);
@@ -72,19 +72,19 @@ class SelectTest extends \MailPoetUnitTest {
 
   public function testItRendersSelectedOption() {
     $this->block['params']['values'][0]['is_checked'] = true;
-    $rendered = $this->selectBlock->render($this->block);
+    $rendered = $this->selectBlock->render($this->block, []);
     expect($rendered)->contains('selected="selected"');
   }
 
   public function testItRendersDisabledOptions() {
     $this->block['params']['values'][2]['is_disabled'] = true;
-    $rendered = $this->selectBlock->render($this->block);
+    $rendered = $this->selectBlock->render($this->block, []);
     expect($rendered)->contains('disabled="disabled"');
   }
 
   public function testItDoesNotRenderHiddenOptions() {
     $this->block['params']['values'][2]['is_hidden'] = true;
-    $rendered = $this->selectBlock->render($this->block);
+    $rendered = $this->selectBlock->render($this->block, []);
     expect($rendered)->notContains(Subscriber::STATUS_BOUNCED);
   }
 }

tests/unit/Form/Block/TextTest.php

@@ -49,7 +49,7 @@ class TextTest extends \MailPoetUnitTest {
     $this->rendererHelperMock->expects($this->once())->method('renderInputPlaceholder')->willReturn('');
     $this->rendererHelperMock->expects($this->once())->method('getInputModifiers')->willReturn(' modifiers="mod" ');
 
-    $html = $this->text->render($this->block);
+    $html = $this->text->render($this->block, []);
     $input = $this->htmlParser->getElementByXpath($html, '//input');
     $name = $this->htmlParser->getAttribute($input, 'name');
     $type = $this->htmlParser->getAttribute($input, 'type');

tests/unit/Form/Block/TextareaTest.php

@@ -49,7 +49,7 @@ class TextareaTest extends \MailPoetUnitTest {
     $this->rendererHelperMock->expects($this->once())->method('getInputModifiers')->willReturn(' modifiers="mod" ');
     $this->rendererHelperMock->expects($this->once())->method('getFieldValue')->willReturn('val');
 
-    $html = $this->textarea->render($this->block);
+    $html = $this->textarea->render($this->block, []);
     $textarea = $this->htmlParser->getElementByXpath($html, '//textarea');
     $name = $this->htmlParser->getAttribute($textarea, 'name');
     $validation = $this->htmlParser->getAttribute($textarea, 'validation');

tests/unit/Form/RendererTest.php

@@ -91,7 +91,7 @@ class RendererTest extends \MailPoetUnitTest {
       ->method('get')
       ->with('captcha.type')
       ->willReturn(Captcha::TYPE_DISABLED);
-    $html = $this->renderer->renderBlocks(Fixtures::get('simple_form_body'), false);
+    $html = $this->renderer->renderBlocks(Fixtures::get('simple_form_body'), [], false);
     $hpLabel = $this->htmlParser->findByXpath($html, "//label[@class='mailpoet_hp_email_label']");
     expect($hpLabel->length)->equals(0);
     $recaptcha = $this->htmlParser->findByXpath($html, "//div[@class='mailpoet_recaptcha']");
@@ -143,27 +143,4 @@ class RendererTest extends \MailPoetUnitTest {
     assert($source instanceof \DOMAttr);
     expect($source->value)->equals("color: red");
   }
-
-  public function testItShouldRenderFontSize() {
-    $this->blocksRendererMock
-      ->expects($this->exactly(2))
-      ->method('renderBlock')
-      ->willReturn('<span class="block">Dummy</span>');
-    $this->settingsMock
-      ->method('get')
-      ->with('captcha.type')
-      ->willReturn(Captcha::TYPE_DISABLED);
-    $formBody = Fixtures::get('simple_form_body');
-    $html = $this->renderer->renderHTML([
-      'body' => $formBody,
-      'settings' => ['fontSize' => '20'],
-    ]);
-    $found = $this->htmlParser->findByXpath($html, "//div");
-    expect($found->length)->equals(1);
-    $div = $found->item(0);
-    assert($div instanceof \DOMNode);
-    $source = $div->attributes->getNamedItem('style');
-    assert($source instanceof \DOMAttr);
-    expect($source->value)->equals("font-size: 20px");
-  }
 }