Use Column Style When Row Dimension Exists Without Style (#3688)

* Use Column Style When Row Dimension Exists Without Style

Fix #3534. For new cells, style is set to Row Dimension Style when Row Dimension exists (even if Row Dimension Style does not exist), else Column Dimension Style when Column Dimension exists. However it should be set to Row Dimension Style when Row Dimension exists *and* Row Dimension Style exists, else ...

* Address Issue 3533

If cell is defined in xml, it uses neither row nor column style. If style is omitted in cell definition, default style is used.

* Update CHANGELOG.md

Author: oleibman

CHANGELOG.md

@@ -45,6 +45,7 @@ and this project adheres to [Semantic Versioning](https://semver.org).
 - Inconsistent String Handling for Sum Functions. [Issue #3652](https://github.com/PHPOffice/PhpSpreadsheet/issues/3652) [PR #3653](https://github.com/PHPOffice/PhpSpreadsheet/pull/3653)
 - Recomputation of Relative Addresses in Defined Names. [Issue #3661](https://github.com/PHPOffice/PhpSpreadsheet/issues/3661) [PR #3673](https://github.com/PHPOffice/PhpSpreadsheet/pull/3673)
 - Writer Xls Characters Outside BMP (emojis). [Issue #642](https://github.com/PHPOffice/PhpSpreadsheet/issues/642) [PR #3696](https://github.com/PHPOffice/PhpSpreadsheet/pull/3696)
+- Xlsx Reader Improve Handling of Row and Column Styles. [Issue #3533](https://github.com/PHPOffice/PhpSpreadsheet/issues/3533) [Issue #3534](https://github.com/PHPOffice/PhpSpreadsheet/issues/3534) [PR #3688](https://github.com/PHPOffice/PhpSpreadsheet/pull/3688)
 
 ## 1.29.0 - 2023-06-15
 

src/PhpSpreadsheet/Reader/Xlsx.php

@@ -955,14 +955,17 @@ protected function loadSpreadsheetFromFile(string $filename): Spreadsheet
                                             }
 
                                             // Style information?
-                                            if ($cAttr['s'] && !$this->readDataOnly) {
+                                            if (!$this->readDataOnly) {
+                                                $holdSelected = $docSheet->getSelectedCells();
+                                                $cAttrS = (int) ($cAttr['s'] ?? 0);
                                                 // no style index means 0, it seems
-                                                $cell->setXfIndex(isset($styles[(int) ($cAttr['s'])]) ?
-                                                    (int) ($cAttr['s']) : 0);
+                                                $cell->setXfIndex(isset($styles[$cAttrS]) ?
+                                                    $cAttrS : 0);
                                                 // issue 3495
                                                 if ($cell->getDataType() === DataType::TYPE_FORMULA) {
                                                     $cell->getStyle()->setQuotePrefix(false);
                                                 }
+                                                $docSheet->setSelectedCells($holdSelected);
                                             }
                                         }
                                         ++$rowIndex;

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -1436,13 +1436,16 @@ public function createNewCell($coordinate): Cell
         $rowDimension = $this->rowDimensions[$row] ?? null;
         $columnDimension = $this->columnDimensions[$columnString] ?? null;
 
+        $xfSet = false;
         if ($rowDimension !== null) {
             $rowXf = (int) $rowDimension->getXfIndex();
             if ($rowXf > 0) {
                 // then there is a row dimension with explicit style, assign it to the cell
                 $cell->setXfIndex($rowXf);
+                $xfSet = true;
             }
-        } elseif ($columnDimension !== null) {
+        }
+        if (!$xfSet && $columnDimension !== null) {
             $colXf = (int) $columnDimension->getXfIndex();
             if ($colXf > 0) {
                 // then there is a column dimension, assign it to the cell

tests/PhpSpreadsheetTests/Reader/Xlsx/Issue3534Test.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\Reader\Xlsx as XlsxReader;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+
+class Issue3534Test extends \PHPUnit\Framework\TestCase
+{
+    /**
+     * @var string
+     */
+    private static $testbook = 'tests/data/Reader/XLSX/issue.3534.xlsx';
+
+    public function testReadColumnStyles(): void
+    {
+        $reader = new XlsxReader();
+        $spreadsheet = $reader->load(self::$testbook);
+        $sheet = $spreadsheet->getActiveSheet();
+
+        self::assertSame(['B4', 'C4'], $sheet->getCellCollection()->getCoordinates(), 'explicitly defined despite no value because differ from row style');
+        self::assertSame(1, $sheet->getColumnDimension('A')->getXfIndex());
+        self::assertNull($sheet->getRowDimension(1)->getXfIndex());
+
+        $sheet->getCell('A1')->setValue('a1');
+        self::assertSame(['B4', 'C4', 'A1'], $sheet->getCellCollection()->getCoordinates());
+        self::assertSame(1, $sheet->getCell('A1')->getXfIndex(), 'no row style so apply column style');
+
+        $sheet->getCell('A4')->setValue('a4');
+        $sheet->getCell('C1')->setValue('c1');
+        self::assertSame('ED7D31', $sheet->getStyle('A1')->getFill()->getStartColor()->getRgb(), 'no row style so apply column style');
+        self::assertSame('FFC000', $sheet->getStyle('A4')->getFill()->getStartColor()->getRgb(), 'style for row is applied');
+        self::assertSame('9DC3E6', $sheet->getStyle('C1')->getFill()->getStartColor()->getRgb(), 'no row style so apply column style');
+        self::assertSame('9DC3E6', $sheet->getStyle('C4')->getFill()->getStartColor()->getRgb(), 'style was already set in xml');
+        self::assertSame(Fill::FILL_NONE, $sheet->getStyle('B4')->getFill()->getFillType(), 'style implicitly default in xml');
+        $spreadsheet->disconnectWorksheets();
+    }
+}