Merge pull request #3220 from PHPOffice/Issue-3214_Xlsx-Reader-Adjust…

…s-Selected-Cell-when-Loading-CF-Ranges Store the currently selected cell when loading Conditional Format Ranges, then reset afterwards
PHPOffice · Nov 30, 2022 · dcb10e2 · dcb10e2
2 parents 58c6e51 + c257122
commit dcb10e2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php b/src/PhpSpreadsheet/Reader/Xlsx/ConditionalStyles.php
@@ -37,19 +37,27 @@ public function __construct(Worksheet $workSheet, SimpleXMLElement $worksheetXml
 
     public function load(): void
     {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
         $this->setConditionalStyles(
             $this->worksheet,
             $this->readConditionalStyles($this->worksheetXml),
             $this->worksheetXml->extLst
         );
+
+        $this->worksheet->setSelectedCells($selectedCells);
     }
 
     public function loadFromExt(StyleReader $styleReader): void
     {
+        $selectedCells = $this->worksheet->getSelectedCells();
+
         $this->ns = $this->worksheetXml->getNamespaces(true);
         $this->setConditionalsFromExt(
             $this->readConditionalsFromExt($this->worksheetXml->extLst, $styleReader)
         );
+
+        $this->worksheet->setSelectedCells($selectedCells);
     }
 
     private function setConditionalsFromExt(array $conditionals): void

diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/ConditionalTest.php
@@ -8,6 +8,17 @@
 
 class ConditionalTest extends AbstractFunctional
 {
+    public function testLoadingConditionalDoesntLoseSelectedCell(): void
+    {
+        $filename = 'tests/data/Reader/XLSX/ConditionalFormat_Ranges.xlsx';
+        $reader = IOFactory::createReader('Xlsx');
+        $spreadsheet = $reader->load($filename);
+        $worksheet = $spreadsheet->getActiveSheet();
+
+        self::assertSame('A1', $worksheet->getActiveCell());
+        self::assertSame('A1', $worksheet->getSelectedCells());
+    }
+
     /**
      * Test check if conditional style with type 'notContainsText' works on xlsx.
      */

diff --git a/tests/data/Reader/XLSX/ConditionalFormat_Ranges.xlsx b/tests/data/Reader/XLSX/ConditionalFormat_Ranges.xlsx