diff --git a/samples/Table/01_Table.php b/samples/Table/01_Table.php
index 0c250675c..6ea5e1c42 100644
--- a/samples/Table/01_Table.php
+++ b/samples/Table/01_Table.php
@@ -4,6 +4,7 @@ use PhpOffice\PhpSpreadsheet\Spreadsheet;
use PhpOffice\PhpSpreadsheet\Worksheet\AutoFilter;
use PhpOffice\PhpSpreadsheet\Worksheet\Table;
use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
+use PhpOffice\PhpSpreadsheet\Writer\IWriter;
require __DIR__ . '/../Header.php';
/** @var PhpOffice\PhpSpreadsheet\Helper\Sample $helper */
@@ -96,5 +97,12 @@ $spreadsheet->getActiveSheet()->addTable($table);
$helper->displayGrid($spreadsheet->getActiveSheet()->toArray(null, true, true, true));
+function writerCallbackForHtml(IWriter $writer): void
+{
+ if (method_exists($writer, 'setTableFormats')) {
+ $writer->setTableFormats(true);
+ }
+}
+
// Save
-$helper->write($spreadsheet, __FILE__, ['Xlsx']);
+$helper->write($spreadsheet, __FILE__, ['Xlsx', 'Html'], writerCallback: writerCallbackForHtml(...));
diff --git a/src/PhpSpreadsheet/Style/ConditionalFormatting/MergedCellStyle.php b/src/PhpSpreadsheet/Style/ConditionalFormatting/MergedCellStyle.php
index 2015d8784..6664d074e 100644
--- a/src/PhpSpreadsheet/Style/ConditionalFormatting/MergedCellStyle.php
+++ b/src/PhpSpreadsheet/Style/ConditionalFormatting/MergedCellStyle.php
@@ -2,6 +2,7 @@
namespace PhpOffice\PhpSpreadsheet\Style\ConditionalFormatting;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
use PhpOffice\PhpSpreadsheet\Style\Style;
use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
@@ -28,13 +29,17 @@ class MergedCellStyle
* @param bool $conditionals True/false to indicate whether
* conditional styles should be considered.
*/
- public function getMergedStyle(Worksheet $worksheet, string $coordinate, bool $tableFormats = true, bool $conditionals = true): Style
+ public function getMergedStyle(Worksheet $worksheet, string $coordinate, bool $tableFormats = true, bool $conditionals = true, ?bool $builtInTableStyles = null): Style
{
+ $builtInTableStyles ??= $tableFormats;
$this->matched = false;
$styleMerger = new StyleMerger($worksheet->getStyle($coordinate));
if ($tableFormats) {
$this->assessTables($worksheet, $coordinate, $styleMerger);
}
+ if ($builtInTableStyles) {
+ $this->assessBuiltinTables($worksheet, $coordinate, $styleMerger);
+ }
if ($conditionals) {
$this->assessConditionals($worksheet, $coordinate, $styleMerger);
}
@@ -69,6 +74,45 @@ class MergedCellStyle
}
}
+ private static ?Style $headerStyle = null;
+
+ private static ?Style $firstRowStyle = null;
+
+ private function assessBuiltinTables(Worksheet $worksheet, string $coordinate, StyleMerger $styleMerger): void
+ {
+ if (self::$headerStyle === null) {
+ self::$headerStyle = new Style();
+ self::$headerStyle->getFill()
+ ->setFillType(Fill::FILL_SOLID)
+ ->getEndColor()
+ ->setArgb('FF000000');
+ self::$headerStyle->getFill()->getStartColor()
+ ->setArgb('FF000000');
+ self::$headerStyle->getFont()
+ ->getColor()->setRgb('FFFFFF');
+ }
+ if (self::$firstRowStyle === null) {
+ self::$firstRowStyle = new Style();
+ self::$firstRowStyle->getFill()
+ ->setFillType(Fill::FILL_SOLID)
+ ->getEndColor()
+ ->setArgb('FFD9D9D9');
+ self::$firstRowStyle->getFill()->getStartColor()
+ ->setArgb('FFD9D9D9');
+ }
+ $tables = $worksheet->getTablesWithoutStylesForCell($worksheet->getCell($coordinate));
+ foreach ($tables as $table) {
+ $tableRow = $table->getRowNumber($coordinate);
+ if ($tableRow === 0 && $table->getShowHeaderRow()) {
+ $styleMerger->mergeStyle(self::$headerStyle);
+ $this->matched = true;
+ } elseif ($tableRow % 2 === 1) {
+ $styleMerger->mergeStyle(self::$firstRowStyle);
+ $this->matched = true;
+ }
+ }
+ }
+
private function assessConditionals(Worksheet $worksheet, string $coordinate, StyleMerger $styleMerger): void
{
if ($worksheet->getConditionalRange($coordinate) !== null) {
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
index befc7b2e4..47361c0d7 100644
--- a/src/PhpSpreadsheet/Worksheet/Worksheet.php
+++ b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -1441,6 +1441,31 @@ class Worksheet
return $retVal;
}
+ /**
+ * Get tables without styles set for the for given cell.
+ *
+ * @param Cell $cell
+ * The Cell for which the tables are retrieved
+ *
+ * @return Table[]
+ */
+ public function getTablesWithoutStylesForCell(Cell $cell): array
+ {
+ $retVal = [];
+
+ foreach ($this->tableCollection as $table) {
+ $range = $table->getRange();
+ if ($cell->isInRange($range)) {
+ $dxfsTableStyle = $table->getStyle()->getTableDxfsStyle();
+ if ($dxfsTableStyle === null || ($dxfsTableStyle->getHeaderRowStyle() === null && $dxfsTableStyle->getFirstRowStripeStyle() === null && $dxfsTableStyle->getSecondRowStripeStyle() === null)) {
+ $retVal[] = $table;
+ }
+ }
+ }
+
+ return $retVal;
+ }
+
/**
* Get conditional styles for a cell.
*
diff --git a/src/PhpSpreadsheet/Writer/Html.php b/src/PhpSpreadsheet/Writer/Html.php
index 6072366c3..e27dfd237 100644
--- a/src/PhpSpreadsheet/Writer/Html.php
+++ b/src/PhpSpreadsheet/Writer/Html.php
@@ -166,6 +166,13 @@ class Html extends BaseWriter
*/
protected bool $tableFormats = false;
+ /**
+ * Table formats for unstyled tables.
+ * Enables default style for builtin table formats.
+ * If null, it takes on the same value as $tableFormats.
+ */
+ protected ?bool $tableFormatsBuiltin = null;
+
/**
* Conditional Formatting
* Enables conditional formatting in writer, disabled here, must be enabled in writer via a setter.
@@ -1748,7 +1755,8 @@ class Html extends BaseWriter
$worksheet,
$coordinate,
$this->tableFormats,
- $this->conditionalFormatting
+ $this->conditionalFormatting,
+ $this->tableFormatsBuiltin
);
if ($mergedCellStyle->getMatched()) {
$styles = $this->createCSSStyle($mergedStyle, true);
@@ -1970,9 +1978,10 @@ class Html extends BaseWriter
return $this->tableFormats;
}
- public function setTableFormats(bool $tableFormats): self
+ public function setTableFormats(bool $tableFormats, ?bool $tableFormatsBuiltin = null): self
{
$this->tableFormats = $tableFormats;
+ $this->tableFormatsBuiltin = $tableFormatsBuiltin;
return $this;
}
diff --git a/tests/PhpSpreadsheetTests/Writer/Html/HtmlTableFormatTest.php b/tests/PhpSpreadsheetTests/Writer/Html/HtmlTableFormatTest.php
index ce94266ba..d4f809fa6 100644
--- a/tests/PhpSpreadsheetTests/Writer/Html/HtmlTableFormatTest.php
+++ b/tests/PhpSpreadsheetTests/Writer/Html/HtmlTableFormatTest.php
@@ -6,6 +6,9 @@ namespace PhpOffice\PhpSpreadsheetTests\Writer\Html;
use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table;
+use PhpOffice\PhpSpreadsheet\Worksheet\Table\TableStyle;
use PhpOffice\PhpSpreadsheet\Writer\Html as HtmlWriter;
use PHPUnit\Framework\TestCase;
@@ -33,7 +36,7 @@ class HtmlTableFormatTest extends TestCase
return $matches[0];
}
- public function testHtmlTableFormatOutput(): void
+ public function xtestHtmlTableFormatOutput(): void
{
$file = 'samples/templates/TableFormat.xlsx';
$reader = new XlsxReader();
@@ -57,5 +60,80 @@ class HtmlTableFormatTest extends TestCase
$string = $this->extractCell($coordinate);
self::assertStringContainsString($expectedString, $string, $message);
}
+ $spreadsheet->disconnectWorksheets();
+ }
+
+ public function testBuiltinApplied(): void
+ {
+ $spreadsheet = new Spreadsheet();
+ $sheet = $spreadsheet->getActiveSheet();
+ $dataArray = [
+ ['Year', 'Quarter', 'Country', 'Sales'],
+ ['2010', 'Q1', 'United States', 790],
+ ['2010', 'Q2', 'United States', 730],
+ ['2010', 'Q3', 'United States', 860],
+ ['2010', 'Q4', 'United States', 850],
+ ];
+ $sheet->fromArray($dataArray);
+ $table = new Table('A1:D5', 'Sales_Data');
+ $tableStyle = new TableStyle();
+ $tableStyle->setTheme(TableStyle::TABLE_STYLE_MEDIUM2);
+ $tableStyle->setShowRowStripes(true);
+ $tableStyle->setShowColumnStripes(true);
+ $tableStyle->setShowFirstColumn(true);
+ $tableStyle->setShowLastColumn(true);
+ $table->setStyle($tableStyle);
+ $sheet->addTable($table);
+ $writer = new HtmlWriter($spreadsheet);
+ $writer->setTableFormats(true); // format all tables using a default style for unstyled
+ $this->data = $writer->generateHtmlAll();
+ $expectedMatches = [
+ ['A1', '| Year | ', 'table style for header row cell A1'],
+ ['B2', 'Q1 | ', 'table style for cell B2'],
+ ['C3', 'United States | ', 'table style for cell C3'],
+ ];
+ foreach ($expectedMatches as $expected) {
+ [$coordinate, $expectedString, $message] = $expected;
+ $string = $this->extractCell($coordinate);
+ self::assertStringContainsString($expectedString, $string, $message);
+ }
+ $spreadsheet->disconnectWorksheets();
+ }
+
+ public function testBuiltinNotApplied(): void
+ {
+ $spreadsheet = new Spreadsheet();
+ $sheet = $spreadsheet->getActiveSheet();
+ $dataArray = [
+ ['Year', 'Quarter', 'Country', 'Sales'],
+ ['2010', 'Q1', 'United States', 790],
+ ['2010', 'Q2', 'United States', 730],
+ ['2010', 'Q3', 'United States', 860],
+ ['2010', 'Q4', 'United States', 850],
+ ];
+ $sheet->fromArray($dataArray);
+ $table = new Table('A1:D5', 'Sales_Data');
+ $tableStyle = new TableStyle();
+ $tableStyle->setTheme(TableStyle::TABLE_STYLE_MEDIUM2);
+ $tableStyle->setShowRowStripes(true);
+ $tableStyle->setShowColumnStripes(true);
+ $tableStyle->setShowFirstColumn(true);
+ $tableStyle->setShowLastColumn(true);
+ $table->setStyle($tableStyle);
+ $sheet->addTable($table);
+ $writer = new HtmlWriter($spreadsheet);
+ $writer->setTableFormats(true, false); // format styled tables but not unstyled
+ $this->data = $writer->generateHtmlAll();
+ $expectedMatches = [
+ ['A1', 'Year | ', 'table style for header row cell A1'],
+ ['B2', 'Q1 | ', 'table style for cell B2'],
+ ['C3', 'United States | ', 'table style for cell C3'],
+ ];
+ foreach ($expectedMatches as $expected) {
+ [$coordinate, $expectedString, $message] = $expected;
+ $string = $this->extractCell($coordinate);
+ self::assertStringContainsString($expectedString, $string, $message);
+ }
+ $spreadsheet->disconnectWorksheets();
}
}