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

Respect layout content size set in theme.json in the renderer

Browse Source 
[MAILPOET-6249]
This commit is contained in:
Rostislav Wolny
2024-10-18 16:17:55 +02:00
committed by Jan Lysý
parent 06067b36f6
commit a40eb3e554
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/php/email-editor/src/Engine/Renderer/Renderer.php
View File

@@ -47,6 +47,7 @@ class Renderer {
$emailStyles = $this->themeController->getStyles($post, $template, true); $emailStyles = $this->themeController->getStyles($post, $template, true);
$templateHtml = $this->contentRenderer->render($post, $template); $templateHtml = $this->contentRenderer->render($post, $template);
$layout = $this->themeController->getLayoutSettings();
ob_start(); ob_start();
include self::TEMPLATE_FILE; include self::TEMPLATE_FILE;

9
packages/php/email-editor/src/Engine/Renderer/template-canvas.php
View File

@@ -4,6 +4,13 @@
// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped // phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
/** /**
* Template file to render the current 'wp_template', specifcally for emails. * Template file to render the current 'wp_template', specifcally for emails.
*
* Variables passed to this template:
* @var $subject string
* @var $preHeader string
* @var $templateHtml string
* @var $metaRobots string
* @var $layout array{contentSize: string}
*/ */
?><!DOCTYPE html> ?><!DOCTYPE html>
<html <?php language_attributes(); ?>> <html <?php language_attributes(); ?>>
@@ -18,7 +25,7 @@
<!-- Forced Styles --> <!-- Forced Styles -->
</head> </head>
<body> <body>
<div class="email_layout_wrapper"> <div class="email_layout_wrapper" style="max-width: <?php echo esc_attr($layout['contentSize']); ?>">
<table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation"> <table width="100%" border="0" cellpadding="0" cellspacing="0" role="presentation">
<tbody> <tbody>
<tr> <tr>

1
packages/php/email-editor/tests/integration/Engine/Renderer/RendererTest.php
View File

@@ -40,6 +40,7 @@ class RendererTest extends \MailPoetTest {
$themeControllerMock = $this->createMock(ThemeController::class); $themeControllerMock = $this->createMock(ThemeController::class);
$themeControllerMock->method('getTheme')->willReturn($themeJsonMock); $themeControllerMock->method('getTheme')->willReturn($themeJsonMock);
$themeControllerMock->method('getStyles')->willReturn($styles); $themeControllerMock->method('getStyles')->willReturn($styles);
$themeControllerMock->method('getLayoutSettings')->willReturn(['contentSize' => '660px']);
$this->renderer = $this->getServiceWithOverrides(Renderer::class, [ $this->renderer = $this->getServiceWithOverrides(Renderer::class, [
'settingsController' => $settingsControllerMock, 'settingsController' => $settingsControllerMock,