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

Fix column with calculation when missing

Browse Source 
In specific cases could defining padding for columns without width looked differently in preview.
[MAILPOET-5739]
This commit is contained in:
Jan Lysý
2024-01-03 18:36:21 +01:00
committed by Rostislav Wolný
parent 34b14791aa
commit 28a3d40bda
2 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mailpoet/lib/EmailEditor/Engine/Renderer/Preprocessors/BlocksWidthPreprocessor.php
View File

@@ -66,6 +66,10 @@ class BlocksWidthPreprocessor implements Preprocessor {
if (isset($column['attrs']['width']) && !empty($column['attrs']['width'])) {
$columnsCountWithDefinedWidth++;
$definedColumnWidth += $this->convertWidthToPixels($column['attrs']['width'], $columnsWidth);
} else {
// When width is not set we need to add padding to the defined column width for better ratio accuracy
$definedColumnWidth += $this->parseNumberFromStringWithPixels($column['attrs']['style']['spacing']['padding']['left'] ?? '0px');
$definedColumnWidth += $this->parseNumberFromStringWithPixels($column['attrs']['style']['spacing']['padding']['right'] ?? '0px');
}
}
@@ -73,7 +77,11 @@ class BlocksWidthPreprocessor implements Preprocessor {
$defaultColumnsWidth = round(($columnsWidth - $definedColumnWidth) / ($columnsCount - $columnsCountWithDefinedWidth), 2);
foreach ($columns as $key => $column) {
if (!isset($column['attrs']['width']) || empty($column['attrs']['width'])) {
$columns[$key]['attrs']['width'] = "{$defaultColumnsWidth}px";
// Add padding to the specific column width because it's not included in the default width
$columnWidth = $defaultColumnsWidth;
$columnWidth += $this->parseNumberFromStringWithPixels($column['attrs']['style']['spacing']['padding']['left'] ?? '0px');
$columnWidth += $this->parseNumberFromStringWithPixels($column['attrs']['style']['spacing']['padding']['right'] ?? '0px');
$columns[$key]['attrs']['width'] = "{$columnWidth}px";
}
}
}