More Robust Test

Author: oleibman

src/PhpSpreadsheet/Worksheet/Worksheet.php

@@ -683,6 +683,8 @@ public function calculateWorksheetDataDimension(): string
      */
     public function calculateColumnWidths(): static
     {
+        $activeSheet = $this->getParent()?->getActiveSheetIndex();
+        $selectedCells = $this->selectedCells;
         // initialize $autoSizes array
         $autoSizes = [];
         foreach ($this->getColumnDimensions() as $colDimension) {
@@ -780,6 +782,10 @@ public function calculateColumnWidths(): static
             }
             $this->activePane = $holdActivePane;
         }
+        if ($activeSheet !== null && $activeSheet >= 0) {
+            $this->getParent()?->setActiveSheetIndex($activeSheet);
+        }
+        $this->selectedCells = $selectedCells;
 
         return $this;
     }

src/PhpSpreadsheet/Writer/Xlsx/Worksheet.php

@@ -456,8 +456,6 @@ private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksh
     {
         // cols
         if (count($worksheet->getColumnDimensions()) > 0) {
-            $activeSheet = $worksheet->getParent()?->getActiveSheetIndex();
-            $selectedCells = $worksheet->getSelectedCells();
             $objWriter->startElement('cols');
 
             $worksheet->calculateColumnWidths();
@@ -509,10 +507,6 @@ private function writeCols(XMLWriter $objWriter, PhpspreadsheetWorksheet $worksh
             }
 
             $objWriter->endElement();
-            if ($activeSheet !== null && $activeSheet >= 0) {
-                $worksheet->getParent()?->setActiveSheetIndex($activeSheet);
-            }
-            $worksheet->setSelectedCells($selectedCells);
         }
     }
 

tests/PhpSpreadsheetTests/Writer/RetainSelectedCellsTest.php

@@ -4,11 +4,23 @@
 
 namespace PhpOffice\PhpSpreadsheetTests\Writer;
 
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Shared\File;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
 
 class RetainSelectedCellsTest extends AbstractFunctional
 {
+    private string $fileName = '';
+
+    protected function tearDown(): void
+    {
+        if ($this->fileName !== '') {
+            unlink($this->fileName);
+            $this->fileName = '';
+        }
+    }
+
     public static function providerFormats(): array
     {
         return [
@@ -76,4 +88,43 @@ public function testRetainSelectedCells(string $format): void
             self::assertEquals(1, $reloaded->getActiveSheetIndex());
         }
     }
+
+    /** @dataProvider providerFormats */
+    public function testRetainAutoSize(string $type): void
+    {
+        $spreadsheet = new Spreadsheet();
+        $sheet1 = $spreadsheet->getActiveSheet();
+        $array = [
+            [1, 2, 3, 4, 5],
+            [11, 12, 13, 14, 15],
+            [21, 22, 23, 24, 25],
+            [31, 32, 33, 34, 35],
+        ];
+        $sheet1->fromArray($array);
+        $sheet2 = $spreadsheet->createSheet();
+        $sheet2->fromArray($array);
+        $sheet3 = $spreadsheet->createSheet();
+        $sheet3->fromArray($array);
+        $sheet1->getStyle('A1')->getFont()->setName('Arial');
+        $sheet2->getStyle('A1')->getFont()->setName('Arial');
+        $sheet3->getStyle('A1')->getFont()->setName('Arial');
+        $sheet1->getColumnDimension('A')->setAutoSize(true);
+        $sheet2->getColumnDimension('A')->setAutoSize(true);
+        $sheet3->getColumnDimension('A')->setAutoSize(true);
+        $sheet1->setSelectedCells('B2');
+        $sheet2->setSelectedCells('C3');
+        $sheet3->setSelectedCells('D4');
+        $spreadsheet->setActiveSheetIndex(1);
+
+        $this->fileName = File::temporaryFilename();
+        $writer = IOFactory::createWriter($spreadsheet, $type);
+        $writer->save($this->fileName);
+
+        self::assertSame(1, $spreadsheet->getActiveSheetIndex());
+        self::assertSame('B2', $spreadsheet->getSheet(0)->getSelectedCells());
+        self::assertSame('C3', $spreadsheet->getSheet(1)->getSelectedCells());
+        self::assertSame('D4', $spreadsheet->getSheet(2)->getSelectedCells());
+
+        $spreadsheet->disconnectWorksheets();
+    }
 }