Skip to content

Commit 23cb107

Browse files
committed
Retain activeCell
1 parent 6153b30 commit 23cb107

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/PhpSpreadsheet/Worksheet/Worksheet.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,6 +685,7 @@ public function calculateColumnWidths(): static
685685
{
686686
$activeSheet = $this->getParent()?->getActiveSheetIndex();
687687
$selectedCells = $this->selectedCells;
688+
$activeCell = $this->activeCell;
688689
// initialize $autoSizes array
689690
$autoSizes = [];
690691
foreach ($this->getColumnDimensions() as $colDimension) {
@@ -786,6 +787,7 @@ public function calculateColumnWidths(): static
786787
$this->getParent()?->setActiveSheetIndex($activeSheet);
787788
}
788789
$this->selectedCells = $selectedCells;
790+
$this->activeCell = $activeCell;
789791

790792
return $this;
791793
}

tests/PhpSpreadsheetTests/Writer/RetainSelectedCellsTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ public function testRetainAutoSize(string $type): void
115115
$sheet2->setSelectedCells('C3');
116116
$sheet3->setSelectedCells('D4');
117117
$spreadsheet->setActiveSheetIndex(1);
118+
$activeCellSheet1 = $sheet1->getActiveCell();
119+
$activeCellSheet2 = $sheet2->getActiveCell();
120+
$activeCellSheet3 = $sheet3->getActiveCell();
118121

119122
$this->fileName = File::temporaryFilename();
120123
$writer = IOFactory::createWriter($spreadsheet, $type);
@@ -124,6 +127,9 @@ public function testRetainAutoSize(string $type): void
124127
self::assertSame('B2', $spreadsheet->getSheet(0)->getSelectedCells());
125128
self::assertSame('C3', $spreadsheet->getSheet(1)->getSelectedCells());
126129
self::assertSame('D4', $spreadsheet->getSheet(2)->getSelectedCells());
130+
self::assertSame($activeCellSheet1, $spreadsheet->getSheet(0)->getActiveCell());
131+
self::assertSame($activeCellSheet2, $spreadsheet->getSheet(1)->getActiveCell());
132+
self::assertSame($activeCellSheet3, $spreadsheet->getSheet(2)->getActiveCell());
127133

128134
$spreadsheet->disconnectWorksheets();
129135
}

0 commit comments

Comments
 (0)