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

Use user theme in renderer instead of template themes

Browse Source 
We no longer read styles associate with templates when we render an email
but we read the user theme instead
[MAILPOET-6335]
This commit is contained in:
Rostislav Wolny
2024-12-10 17:04:13 +01:00
committed by Aschepikov
parent 15818f37ef
commit 1e1bec4ce0
5 changed files with 73 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/php/email-editor/src/Engine/Renderer/class-renderer.php
View File

@@ -41,13 +41,6 @@ class Renderer {
*/
private Templates $templates;
/**
* Theme data for the template being rendered.
*
* @var WP_Theme_JSON|null
*/
private static $theme = null;
const TEMPLATE_FILE = 'template-canvas.php';
const TEMPLATE_STYLES_FILE = 'template-canvas.css';
@@ -68,15 +61,6 @@ class Renderer {
$this->theme_controller = $theme_controller;
}
/**
* During rendering, this stores the theme data for the template being rendered.
*
* @return ?\WP_Theme_JSON
*/
public static function get_theme() {
return self::$theme;
}
/**
* Renders the email template
*
@@ -91,12 +75,8 @@ class Renderer {
$template_id = 'mailpoet/mailpoet//' . ( get_page_template_slug( $post ) ? get_page_template_slug( $post ) : 'email-general' );
/** @var \WP_Block_Template $template */ // phpcs:ignore Generic.Commenting.DocComment.MissingShort -- used for phpstan
$template = $this->templates->get_block_template( $template_id );
$theme = $this->templates->get_block_template_theme( $template_id, $template->wp_id );
// Set the theme for the template. This is merged with base theme.json and core json before rendering.
self::$theme = new WP_Theme_JSON( $theme, 'default' );
$email_styles = $this->theme_controller->get_styles( $post, $template );
$email_styles = $this->theme_controller->get_styles();
$template_html = $this->content_renderer->render( $post, $template );
$layout = $this->theme_controller->get_layout_settings();