Retain activeCell

oleibman · Aug 7, 2024 · 23cb107 · 23cb107
1 parent 6153b30
commit 23cb107
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/PhpSpreadsheet/Worksheet/Worksheet.php b/src/PhpSpreadsheet/Worksheet/Worksheet.php
@@ -685,6 +685,7 @@ public function calculateColumnWidths(): static
     {
         $activeSheet = $this->getParent()?->getActiveSheetIndex();
         $selectedCells = $this->selectedCells;
+        $activeCell = $this->activeCell;
         // initialize $autoSizes array
         $autoSizes = [];
         foreach ($this->getColumnDimensions() as $colDimension) {
@@ -786,6 +787,7 @@ public function calculateColumnWidths(): static
             $this->getParent()?->setActiveSheetIndex($activeSheet);
         }
         $this->selectedCells = $selectedCells;
+        $this->activeCell = $activeCell;
 
         return $this;
     }

diff --git a/tests/PhpSpreadsheetTests/Writer/RetainSelectedCellsTest.php b/tests/PhpSpreadsheetTests/Writer/RetainSelectedCellsTest.php
@@ -115,6 +115,9 @@ public function testRetainAutoSize(string $type): void
         $sheet2->setSelectedCells('C3');
         $sheet3->setSelectedCells('D4');
         $spreadsheet->setActiveSheetIndex(1);
+        $activeCellSheet1 = $sheet1->getActiveCell();
+        $activeCellSheet2 = $sheet2->getActiveCell();
+        $activeCellSheet3 = $sheet3->getActiveCell();
 
         $this->fileName = File::temporaryFilename();
         $writer = IOFactory::createWriter($spreadsheet, $type);
@@ -124,6 +127,9 @@ public function testRetainAutoSize(string $type): void
         self::assertSame('B2', $spreadsheet->getSheet(0)->getSelectedCells());
         self::assertSame('C3', $spreadsheet->getSheet(1)->getSelectedCells());
         self::assertSame('D4', $spreadsheet->getSheet(2)->getSelectedCells());
+        self::assertSame($activeCellSheet1, $spreadsheet->getSheet(0)->getActiveCell());
+        self::assertSame($activeCellSheet2, $spreadsheet->getSheet(1)->getActiveCell());
+        self::assertSame($activeCellSheet3, $spreadsheet->getSheet(2)->getActiveCell());
 
         $spreadsheet->disconnectWorksheets();
     }